torsten/motorradig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://bitbucket.org/Terminon/motorradig

Browse source
This commit is contained in:
TorstenS 2020-09-08 11:00:38 +02:00
commit 42ff3b51b8
2 changed files with 26 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

85
motorradig/.idea/workspace.xml generated
View file

@ -2,11 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="eed7de89-f054-487c-bf59-36356758942b" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/public/upload/images/DemoOrdner/bild1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/upload/images/DemoOrdner/thumbnail/bild1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/auth/Register.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/auth/Register.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../motorradig2/motorradig/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../motorradig2/motorradig/composer.lock" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -15,9 +12,7 @@
</component>
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
<execution>
<executable />
</execution>
<execution />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@ -137,7 +132,6 @@
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
@ -181,18 +175,7 @@
</list>
</recent_temporary>
</component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
@ -246,71 +229,45 @@
<workItem from="1582013508305" duration="204000" />
<workItem from="1582103369899" duration="6548000" />
<workItem from="1584173868448" duration="6708000" />
<workItem from="1596879810952" duration="15000" />
<workItem from="1596890789628" duration="632000" />
<workItem from="1596891586170" duration="80000" />
<workItem from="1596891870030" duration="273000" />
<workItem from="1596892170882" duration="333000" />
<workItem from="1596899787311" duration="124000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
</component>
<component name="WindowStateProjectService">
<state x="419" y="219" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1580891589354">
<screen x="0" y="23" width="1280" height="777" />
<state x="449" y="172" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1596891593367">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="629" y="273" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1580564280549" />
<state x="419" y="219" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.23.1280.777@0.23.1280.777" timestamp="1580891589354" />
<state x="1978" y="315" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1580917019448">
<screen x="1280" y="23" width="1920" height="1057" />
<state x="449" y="172" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1536.864@0.0.1536.864" timestamp="1596891593367" />
<state x="549" y="173" key="FileChooserDialogImpl" timestamp="1596899905581">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="1978" y="315" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1580917019448" />
<state x="510" y="217" width="881" height="578" key="FileChooserDialogImpl" timestamp="1581069660293">
<screen x="0" y="0" width="1920" height="1080" />
<state x="549" y="173" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1596899905581" />
<state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1596891587490">
<screen x="0" y="0" width="1536" height="864" />
</state>
<state x="510" y="217" width="881" height="578" key="FileChooserDialogImpl/0.0.1920.1080@0.0.1920.1080" timestamp="1581069660293" />
<state x="1730" y="198" key="SettingsEditor" timestamp="1580917895369">
<screen x="1280" y="23" width="1920" height="1057" />
</state>
<state x="450" y="179" key="SettingsEditor/0.0.1920.1080@0.0.1920.1080" timestamp="1580731664075" />
<state x="1730" y="198" key="SettingsEditor/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1580917895369" />
<state x="1280" y="23" width="1720" height="857" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1581075547973">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state x="1280" y="23" width="1720" height="857" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1580282545601" />
<state x="1935" y="380" key="com.intellij.ide.util.TipDialog" timestamp="1582103371520">
<screen x="1280" y="23" width="1920" height="1057" />
</state>
<state x="524" y="292" key="com.intellij.ide.util.TipDialog/0.0.1536.864@0.0.1536.864" timestamp="1581857707207" />
<state x="655" y="365" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1581761353338" />
<state x="1935" y="380" key="com.intellij.ide.util.TipDialog/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1582103371520" />
<state x="623" y="178" width="673" height="724" key="find.popup" timestamp="1580465329892">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state x="623" y="178" width="673" height="724" key="find.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1580465329892" />
<state x="1903" y="197" width="673" height="708" key="find.popup/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1579597123793" />
<state x="616" y="250" key="run.anything.popup" timestamp="1583479825710">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state x="616" y="250" key="run.anything.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1583479825710" />
<state x="417" y="196" width="670" height="498" key="search.everywhere.popup" timestamp="1581148318017">
<screen x="0" y="23" width="1280" height="777" />
</state>
<state x="625" y="240" width="672" height="691" key="search.everywhere.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1581075314755" />
<state x="1905" y="258" width="670" height="676" key="search.everywhere.popup/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1580196905378" />
<state x="417" y="196" width="670" height="498" key="search.everywhere.popup/0.23.1280.777@0.23.1280.777" timestamp="1581148318017" />
<state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1536.864@0.0.1536.864" timestamp="1596891587490" />
</component>
</project>

10
motorradig2/motorradig/composer.lock generated
View file

@ -741,16 +741,16 @@
},
{
"name": "laravel/framework",
"version": "v7.23.0",
"version": "v7.24.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "17cbce101f2fc78e61a6135861823563c7cfb50b"
"reference": "71bfb1f2f89e4e31fba539d43fe287143e635e68"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/17cbce101f2fc78e61a6135861823563c7cfb50b",
"reference": "17cbce101f2fc78e61a6135861823563c7cfb50b",
"url": "https://api.github.com/repos/laravel/framework/zipball/71bfb1f2f89e4e31fba539d43fe287143e635e68",
"reference": "71bfb1f2f89e4e31fba539d43fe287143e635e68",
"shasum": ""
},
"require": {
@ -894,7 +894,7 @@
"framework",
"laravel"
],
"time": "2020-08-04T14:36:37+00:00"
"time": "2020-08-07T15:13:57+00:00"
},
{
"name": "laravel/tinker",