Safak/DBWT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a28e0707c921fa9b0e5b8cc26c877b61cacd4084
DBWT/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch
Robert b6100b2ab6 M4
2023-12-20 14:01:25 +01:00

58 lines
9.1 KiB
Diff
Raw Blame History

Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21\" name=\"Changes\" comment=\"\">\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/controllers/MainController.php\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/models/gerichte_main.php\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/public/css/style.css\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/public/img/fh-logo.jpg\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/public/img/mensa21.jpg\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/views/layouts/main_layout.blade.php\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/M4/emensa/views/main/index.blade.php\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.idea/workspace.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/workspace.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/M4/emensa/models/gerichte_self.php\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/M4/emensa/models/gerichte_self.php\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/M4/emensa/routes/web.php\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/M4/emensa/routes/web.php\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/M4/emensa/storage/cache/.layouts.m4_7d_layout_ecc36cbad49aa38782cc08cc5e9ca6c7ae3590d0.bladec\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/M4/emensa/storage/cache/.layouts.m4_7d_layout_ecc36cbad49aa38782cc08cc5e9ca6c7ae3590d0.bladec\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/M4/emensa/views/layouts/m4_7d_layout.blade.php\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/M4/emensa/views/layouts/m4_7d_layout.blade.php\" afterDir=\"false\" />\r\n </list>\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"ComposerSettings\">\r\n <execution />\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"dev/m3_safak\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"PhpWorkspaceProjectConfiguration\" interpreter_name=\"Xampp\" />\r\n <component name=\"ProjectColorInfo\">{\r\n &quot;customColor&quot;: &quot;&quot;,\r\n &quot;associatedIndex&quot;: 0\r\n}</component>\r\n <component name=\"ProjectId\" id=\"2YZcMNXBUidjAecPVKM66b1DdlE\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n \"WebServerToolWindowFactoryState\": \"false\",\r\n \"database.data.extractors.current.export.id\": \"Comma-separated (CSV)_id\",\r\n \"git-widget-placeholder\": \"dev/m4__robert\",\r\n \"last_opened_file_path\": \"C:/Users/rober/Documents/GitHub/DBWT-Praktika/M4/emensa/public/img\",\r\n \"node.js.detected.package.eslint\": \"true\",\r\n \"node.js.detected.package.tslint\": \"true\",\r\n \"node.js.selected.package.eslint\": \"(autodetect)\",\r\n \"node.js.selected.package.tslint\": \"(autodetect)\",\r\n \"nodejs_package_manager_path\": \"npm\",\r\n \"settings.editor.selected.configurable\": \"preferences.pluginManager\",\r\n \"vue.rearranger.settings.migration\": \"true\"\r\n },\r\n \"keyToStringList\": {\r\n \"DatabaseDriversLRU\": [\r\n \"mariadb\"\r\n ]\r\n }\r\n}]]></component>\r\n <component name=\"RecentsManager\">\r\n <key name=\"CopyFile.RECENT_KEYS\">\r\n <recent name=\"C:\\Users\\rober\\Documents\\GitHub\\DBWT-Praktika\\M4\\emensa\\public\\img\" />\r\n <recent name=\"C:\\Users\\rober\\Documents\\GitHub\\DBWT-Praktika\\M4\\emensa\\public\\css\" />\r\n </key>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21\" name=\"Changes\" comment=\"\" />\r\n <created>1700736495450</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1700736495450</updated>\r\n <workItem from=\"1700736497007\" duration=\"15223000\" />\r\n <workItem from=\"1702027267170\" duration=\"12429000\" />\r\n </task>\r\n <servers />\r\n </component>\r\n <component name=\"TypeScriptGeneratedFilesManager\">\r\n <option name=\"version\" value=\"3\" />\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 67a26f66842e3e565044948e26ffeddb1c0a8a07)
+++ b/.idea/workspace.xml (date 1702921613335)
@@ -5,18 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="">
- <change afterPath="$PROJECT_DIR$/M4/emensa/controllers/MainController.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/M4/emensa/models/gerichte_main.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/M4/emensa/public/css/style.css" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/M4/emensa/public/img/fh-logo.jpg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/M4/emensa/public/img/mensa21.jpg" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/M4/emensa/views/layouts/main_layout.blade.php" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/M4/emensa/views/main/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/M4/emensa/models/gerichte_self.php" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/models/gerichte_self.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/M4/emensa/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/routes/web.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/M4/emensa/storage/cache/.layouts.m4_7d_layout_ecc36cbad49aa38782cc08cc5e9ca6c7ae3590d0.bladec" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/storage/cache/.layouts.m4_7d_layout_ecc36cbad49aa38782cc08cc5e9ca6c7ae3590d0.bladec" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/M4/emensa/views/layouts/m4_7d_layout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/views/layouts/m4_7d_layout.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,7 +18,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
- <entry key="$PROJECT_DIR$" value="dev/m3_safak" />
+ <entry key="$PROJECT_DIR$" value="dev/m4_robert" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -53,7 +42,7 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"database.data.extractors.current.export.id": "Comma-separated (CSV)_id",
- "git-widget-placeholder": "dev/m4__robert",
+ "git-widget-placeholder": "dev/m5__robert",
"last_opened_file_path": "C:/Users/rober/Documents/GitHub/DBWT-Praktika/M4/emensa/public/img",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
@@ -84,7 +73,8 @@
<option name="presentableId" value="Default" />
<updated>1700736495450</updated>
<workItem from="1700736497007" duration="15223000" />
- <workItem from="1702027267170" duration="12429000" />
+ <workItem from="1702027267170" duration="12813000" />
+ <workItem from="1702913236003" duration="621000" />
</task>
<servers />
</component>
Reference in New Issue View Git Blame Copy Permalink