|
@@ -25,11 +25,13 @@
|
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-13010] HP更新依頼(プレミアム商品券取扱店募集)">
|
|
28
|
+ <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡">
|
29
|
29
|
<change afterPath="$PROJECT_DIR$/third/notices/296_20210801.html" afterDir="false" />
|
|
30
|
+ <change beforePath="$PROJECT_DIR$/.idea/shelf/2021_07_01_18_15_____Default_Changelist_.xml" beforeDir="false" />
|
|
31
|
+ <change beforePath="$PROJECT_DIR$/.idea/shelf/2021_07_01_18_15_の_チェックアウト_前の未コミットの変更_[Default_Changelist]/shelved.patch" beforeDir="false" />
|
30
|
32
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
31
|
|
- <change beforePath="$PROJECT_DIR$/fourth/living/Overview_of_sewer.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Overview_of_sewer.html" afterDir="false" />
|
32
|
|
- <change beforePath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_sewer.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_sewer.html" afterDir="false" />
|
|
33
|
+ <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
|
|
34
|
+ <change beforePath="$PROJECT_DIR$/second/Notices.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Notices.html" afterDir="false" />
|
33
|
35
|
</list>
|
34
|
36
|
<option name="SHOW_DIALOG" value="false" />
|
35
|
37
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -43,13 +45,10 @@
|
43
|
45
|
</list>
|
44
|
46
|
</option>
|
45
|
47
|
</component>
|
46
|
|
- <component name="Git.Merge.Settings">
|
47
|
|
- <option name="BRANCH" value="master" />
|
48
|
|
- </component>
|
49
|
48
|
<component name="Git.Settings">
|
50
|
49
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
51
|
50
|
<map>
|
52
|
|
- <entry key="$PROJECT_DIR$" value="master" />
|
|
51
|
+ <entry key="$PROJECT_DIR$" value="farture/12931" />
|
53
|
52
|
</map>
|
54
|
53
|
</option>
|
55
|
54
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
@@ -103,10 +102,10 @@
|
103
|
102
|
</key>
|
104
|
103
|
<key name="MoveFile.RECENT_KEYS">
|
105
|
104
|
<recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
|
|
105
|
+ <recent name="$PROJECT_DIR$/css/pdf/childrens_museum" />
|
|
106
|
+ <recent name="$PROJECT_DIR$/css/pdf" />
|
106
|
107
|
<recent name="$PROJECT_DIR$/fourth/notices" />
|
107
|
108
|
<recent name="$PROJECT_DIR$/fourth/lifeguide/health/pdf" />
|
108
|
|
- <recent name="$PROJECT_DIR$/second" />
|
109
|
|
- <recent name="$PROJECT_DIR$/fourth/education/pdf" />
|
110
|
109
|
</key>
|
111
|
110
|
</component>
|
112
|
111
|
<component name="RunManager">
|
|
@@ -205,41 +204,9 @@
|
205
|
204
|
<workItem from="1625209723412" duration="1514000" />
|
206
|
205
|
<workItem from="1625448704268" duration="1341000" />
|
207
|
206
|
<workItem from="1625473511168" duration="862000" />
|
208
|
|
- </task>
|
209
|
|
- <task id="LOCAL-00059" summary="[kitagata_support-12673] 【HP更新依頼】令和3年度予算概要">
|
210
|
|
- <created>1621244186347</created>
|
211
|
|
- <option name="number" value="00059" />
|
212
|
|
- <option name="presentableId" value="LOCAL-00059" />
|
213
|
|
- <option name="project" value="LOCAL" />
|
214
|
|
- <updated>1621244186347</updated>
|
215
|
|
- </task>
|
216
|
|
- <task id="LOCAL-00060" summary="[kitagata_support-12675] HP更新依頼(雇用調整助成金)">
|
217
|
|
- <created>1621245003346</created>
|
218
|
|
- <option name="number" value="00060" />
|
219
|
|
- <option name="presentableId" value="LOCAL-00060" />
|
220
|
|
- <option name="project" value="LOCAL" />
|
221
|
|
- <updated>1621245003346</updated>
|
222
|
|
- </task>
|
223
|
|
- <task id="LOCAL-00061" summary="[kitagata_support-12676] HP更新依頼(図書館削除・追加)">
|
224
|
|
- <created>1621303459968</created>
|
225
|
|
- <option name="number" value="00061" />
|
226
|
|
- <option name="presentableId" value="LOCAL-00061" />
|
227
|
|
- <option name="project" value="LOCAL" />
|
228
|
|
- <updated>1621303459969</updated>
|
229
|
|
- </task>
|
230
|
|
- <task id="LOCAL-00062" summary="[kitagata_support-12698] Re- HP更新依頼(教育委員会求人)">
|
231
|
|
- <created>1621475094291</created>
|
232
|
|
- <option name="number" value="00062" />
|
233
|
|
- <option name="presentableId" value="LOCAL-00062" />
|
234
|
|
- <option name="project" value="LOCAL" />
|
235
|
|
- <updated>1621475094292</updated>
|
236
|
|
- </task>
|
237
|
|
- <task id="LOCAL-00063" summary="[kitagata_support-12701] 北方町HP更新依頼 住民監査請求">
|
238
|
|
- <created>1621737123498</created>
|
239
|
|
- <option name="number" value="00063" />
|
240
|
|
- <option name="presentableId" value="LOCAL-00063" />
|
241
|
|
- <option name="project" value="LOCAL" />
|
242
|
|
- <updated>1621737123498</updated>
|
|
207
|
+ <workItem from="1625717127291" duration="2921000" />
|
|
208
|
+ <workItem from="1625720101409" duration="714000" />
|
|
209
|
+ <workItem from="1625793977584" duration="398000" />
|
243
|
210
|
</task>
|
244
|
211
|
<task id="LOCAL-00064" summary="[kitagata_support-12704] HP更新依頼()">
|
245
|
212
|
<created>1621749675269</created>
|
|
@@ -549,7 +516,42 @@
|
549
|
516
|
<option name="project" value="LOCAL" />
|
550
|
517
|
<updated>1625652418518</updated>
|
551
|
518
|
</task>
|
552
|
|
- <option name="localTasksCounter" value="108" />
|
|
519
|
+ <task id="LOCAL-00108" summary="[WIP] 12931 ファイルを一部追加">
|
|
520
|
+ <created>1625712936991</created>
|
|
521
|
+ <option name="number" value="00108" />
|
|
522
|
+ <option name="presentableId" value="LOCAL-00108" />
|
|
523
|
+ <option name="project" value="LOCAL" />
|
|
524
|
+ <updated>1625712936991</updated>
|
|
525
|
+ </task>
|
|
526
|
+ <task id="LOCAL-00109" summary="[kitagata_support-13014] Re- HP更新依頼【削除依頼】(小規模事業者持続化補助金)">
|
|
527
|
+ <created>1625717753329</created>
|
|
528
|
+ <option name="number" value="00109" />
|
|
529
|
+ <option name="presentableId" value="LOCAL-00109" />
|
|
530
|
+ <option name="project" value="LOCAL" />
|
|
531
|
+ <updated>1625717753329</updated>
|
|
532
|
+ </task>
|
|
533
|
+ <task id="LOCAL-00110" summary="[kitagata_support-13016] HP更新依頼(子ども館お便り)">
|
|
534
|
+ <created>1625718617453</created>
|
|
535
|
+ <option name="number" value="00110" />
|
|
536
|
+ <option name="presentableId" value="LOCAL-00110" />
|
|
537
|
+ <option name="project" value="LOCAL" />
|
|
538
|
+ <updated>1625718617453</updated>
|
|
539
|
+ </task>
|
|
540
|
+ <task id="LOCAL-00111" summary="[kitagata_support-13018] HP更新依頼(上下水指定店)">
|
|
541
|
+ <created>1625719735956</created>
|
|
542
|
+ <option name="number" value="00111" />
|
|
543
|
+ <option name="presentableId" value="LOCAL-00111" />
|
|
544
|
+ <option name="project" value="LOCAL" />
|
|
545
|
+ <updated>1625719735956</updated>
|
|
546
|
+ </task>
|
|
547
|
+ <task id="LOCAL-00112" summary="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡">
|
|
548
|
+ <created>1625719894203</created>
|
|
549
|
+ <option name="number" value="00112" />
|
|
550
|
+ <option name="presentableId" value="LOCAL-00112" />
|
|
551
|
+ <option name="project" value="LOCAL" />
|
|
552
|
+ <updated>1625719894203</updated>
|
|
553
|
+ </task>
|
|
554
|
+ <option name="localTasksCounter" value="113" />
|
553
|
555
|
<servers />
|
554
|
556
|
</component>
|
555
|
557
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -596,11 +598,6 @@
|
596
|
598
|
</component>
|
597
|
599
|
<component name="VcsManagerConfiguration">
|
598
|
600
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
599
|
|
- <MESSAGE value="[kitagata_support-12866] Re- HP更新依頼【都市環境課】耐震に対する支援制度" />
|
600
|
|
- <MESSAGE value="[kitagata_support-12869] 修正依頼 Re- Re- HP更新依頼(北方町議会>請願陳情)" />
|
601
|
|
- <MESSAGE value="[kitagata_support-12893] HP更新依頼(物品調達方針)" />
|
602
|
|
- <MESSAGE value="[kitagata_support-12899] HP更新依頼(アユカ一般)" />
|
603
|
|
- <MESSAGE value="[kitagata_support-12900] HP更新依頼(6月23日ごろまでにお願い致します)" />
|
604
|
601
|
<MESSAGE value="[kitagata_support-12901] 【HP更新依頼】定住奨励金事業" />
|
605
|
602
|
<MESSAGE value="[kitagata_support-12903] HP更新依頼【都市環境課】イベント中止情報" />
|
606
|
603
|
<MESSAGE value="[kitagata_support-12906] HP更新依頼(先端設備等導入計画)" />
|
|
@@ -621,7 +618,12 @@
|
621
|
618
|
<MESSAGE value="[kitagata_support-12994] Re- HP更新依頼(施設整備計画)" />
|
622
|
619
|
<MESSAGE value="[kitagata_support-13009] HP更新依頼(プレミアム商品券販売)" />
|
623
|
620
|
<MESSAGE value="[kitagata_support-13010] HP更新依頼(プレミアム商品券取扱店募集)" />
|
624
|
|
- <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13010] HP更新依頼(プレミアム商品券取扱店募集)" />
|
|
621
|
+ <MESSAGE value="[WIP] 12931 ファイルを一部追加" />
|
|
622
|
+ <MESSAGE value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】(小規模事業者持続化補助金)" />
|
|
623
|
+ <MESSAGE value="[kitagata_support-13016] HP更新依頼(子ども館お便り)" />
|
|
624
|
+ <MESSAGE value="[kitagata_support-13018] HP更新依頼(上下水指定店)" />
|
|
625
|
+ <MESSAGE value="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡" />
|
|
626
|
+ <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡" />
|
625
|
627
|
</component>
|
626
|
628
|
<component name="com.intellij.coverage.CoverageDataManagerImpl">
|
627
|
629
|
<SUITE FILE_PATH="coverage/kitagata$.dat" NAME="更新用 Coverage Results" MODIFIED="1569418362637" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="WipCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
|