Compare commits

...

3 Commits

4 changed files with 25 additions and 3 deletions
+19
View File
@@ -1,6 +1,25 @@
<application> <application>
<component name="DiffSettings"> <component name="DiffSettings">
<option name="PLACES_MAP"> <option name="PLACES_MAP">
<entry key="ChangesView">
<PlaceSettings>
<option name="DIFF_TOOLS_ORDER">
<list>
<option value="com.intellij.diff.tools.simple.SimpleDiffTool" />
<option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool" />
<option value="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool" />
<option value="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool" />
<option value="org.jetbrains.idea.svn.difftool.properties.SvnPropertiesDiffTool" />
<option value="org.jetbrains.idea.svn.difftool.SvnPhantomChangeDiffRequestProvider.SvnPhantomDiffTool" />
<option value="org.jetbrains.idea.svn.difftool.SvnTreeConflictDiffRequestProvider.SvnTreeConflictDiffTool" />
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
<option value="com.intellij.diff.tools.dir.DirDiffTool" />
</list>
</option>
</PlaceSettings>
</entry>
<entry key="CommitDialog"> <entry key="CommitDialog">
<PlaceSettings> <PlaceSettings>
<option name="DIFF_TOOLS_ORDER"> <option name="DIFF_TOOLS_ORDER">
-1
View File
@@ -5,7 +5,6 @@
<mapping pattern=",yarnrc" type="AUTO_DETECTED" /> <mapping pattern=",yarnrc" type="AUTO_DETECTED" />
<mapping ext="wxss" type="CSS" /> <mapping ext="wxss" type="CSS" />
<mapping ext="wxml" type="HTML" /> <mapping ext="wxml" type="HTML" />
<mapping pattern=".prettierrc" type="JSON" />
<mapping pattern="CNAME" type="PLAIN_TEXT" /> <mapping pattern="CNAME" type="PLAIN_TEXT" />
<mapping pattern=".gitkeep" type="PLAIN_TEXT" /> <mapping pattern=".gitkeep" type="PLAIN_TEXT" />
<mapping pattern="gbk" type="PLAIN_TEXT" /> <mapping pattern="gbk" type="PLAIN_TEXT" />
+4
View File
@@ -98,6 +98,10 @@
<option name="url" value="http://shixin.tech:8022/gary/vue-admin.git" /> <option name="url" value="http://shixin.tech:8022/gary/vue-admin.git" />
<option name="userName" value="" /> <option name="userName" value="" />
</UrlAndUserName> </UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://shixin.tech:8022/Spike/jiantuo_vue_admin.git" />
<option name="userName" value="" />
</UrlAndUserName>
</list> </list>
</option> </option>
<option name="cloneParentDir" value="$USER_HOME$/WebstormProjects" /> <option name="cloneParentDir" value="$USER_HOME$/WebstormProjects" />
+2 -2
View File
@@ -6,6 +6,7 @@
<option name="newTranslationDialogY" value="750" /> <option name="newTranslationDialogY" value="750" />
<option name="pinNewTranslationDialog" value="true" /> <option name="pinNewTranslationDialog" value="true" />
<histories> <histories>
<item value="昨日" />
<item value="docker-tips-and-tricks" /> <item value="docker-tips-and-tricks" />
<item value="fix: color code with opacity will cause some strange issue in echarts." /> <item value="fix: color code with opacity will cause some strange issue in echarts." />
<item value="refactor: remove useless code before switch scope." /> <item value="refactor: remove useless code before switch scope." />
@@ -55,11 +56,10 @@
<item value="category" /> <item value="category" />
<item value="implement" /> <item value="implement" />
<item value="实现" /> <item value="实现" />
<item value="问卷" />
</histories> </histories>
<option name="languageScores"> <option name="languageScores">
<map> <map>
<entry key="CHINESE" value="194" /> <entry key="CHINESE" value="195" />
<entry key="ENGLISH" value="195" /> <entry key="ENGLISH" value="195" />
<entry key="FRENCH" value="1" /> <entry key="FRENCH" value="1" />
<entry key="DUTCH" value="1" /> <entry key="DUTCH" value="1" />