Safak/DBWT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge hoffentlich

Browse Source
This commit is contained in:
Robert
2023-12-22 19:23:38 +01:00
parent 05258cfb22
commit 5ca6283aa3
14 changed files with 171 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.idea/workspace.xml generated
View File

@@ -5,18 +5,16 @@
</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" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.bkp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.dtmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/Aufgabe1.drawio" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/ERD M4-1-1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/Dossier/M4.md" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/M4.pdf" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/controllers/MainController.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/controllers/MainController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/emensa/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M5/gerichte.zip" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,7 +51,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__safak",
"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",