|
@@ -25,8 +25,10 @@
|
25
|
25
|
<select />
|
26
|
26
|
</component>
|
27
|
27
|
<component name="ChangeListManager">
|
28
|
|
- <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12932] HP更新依頼(カローリング) 一部修正" />
|
29
|
|
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
28
|
+ <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[WIP] 12931 上下水道の見た目を変更">
|
|
29
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
30
|
+ <change beforePath="$PROJECT_DIR$/third/mayor/biography.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/mayor/biography.html" afterDir="false" />
|
|
31
|
+ </list>
|
30
|
32
|
<option name="SHOW_DIALOG" value="false" />
|
31
|
33
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
32
|
34
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -59,6 +61,7 @@
|
59
|
61
|
<component name="ProjectId" id="1X9HtB7maXhDrOKCQit8CESnaDm" />
|
60
|
62
|
<component name="ProjectLevelVcsManager">
|
61
|
63
|
<OptionsSetting value="false" id="Update" />
|
|
64
|
+ <ConfirmationsSetting value="2" id="追加" />
|
62
|
65
|
</component>
|
63
|
66
|
<component name="ProjectViewState">
|
64
|
67
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
@@ -96,18 +99,6 @@
|
96
|
99
|
<recent name="$PROJECT_DIR$/fourth/lifeguide/welfare/pdf" />
|
97
|
100
|
</key>
|
98
|
101
|
</component>
|
99
|
|
- <component name="RunDashboard">
|
100
|
|
- <option name="ruleStates">
|
101
|
|
- <list>
|
102
|
|
- <RuleState>
|
103
|
|
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
104
|
|
- </RuleState>
|
105
|
|
- <RuleState>
|
106
|
|
- <option name="name" value="StatusDashboardGroupingRule" />
|
107
|
|
- </RuleState>
|
108
|
|
- </list>
|
109
|
|
- </option>
|
110
|
|
- </component>
|
111
|
102
|
<component name="RunManager">
|
112
|
103
|
<configuration name="更新用" type="JavascriptDebugType" uri="http://localhost:63342/kitagata/index.html" useBuiltInWebServerPort="true">
|
113
|
104
|
<method v="2" />
|
|
@@ -197,6 +188,8 @@
|
197
|
188
|
<workItem from="1625041655727" duration="144000" />
|
198
|
189
|
<workItem from="1625041874843" duration="3992000" />
|
199
|
190
|
<workItem from="1625099388056" duration="6000" />
|
|
191
|
+ <workItem from="1625130991516" duration="1264000" />
|
|
192
|
+ <workItem from="1625189367399" duration="1187000" />
|
200
|
193
|
</task>
|
201
|
194
|
<task id="LOCAL-00048" summary="[kitagata_support-12612] Re- HP更新依頼(トップページ変更)">
|
202
|
195
|
<created>1620735570843</created>
|
|
@@ -564,7 +557,6 @@
|
564
|
557
|
</entry>
|
565
|
558
|
</map>
|
566
|
559
|
</option>
|
567
|
|
- <option name="COLUMN_ORDER" />
|
568
|
560
|
</State>
|
569
|
561
|
</value>
|
570
|
562
|
</entry>
|
|
@@ -585,6 +577,7 @@
|
585
|
577
|
</entry>
|
586
|
578
|
</map>
|
587
|
579
|
</option>
|
|
580
|
+ <option name="oldMeFiltersMigrated" value="true" />
|
588
|
581
|
</component>
|
589
|
582
|
<component name="VcsManagerConfiguration">
|
590
|
583
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|