diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .idea/BEAM-Messenger.iml | 12 | ||||
| -rw-r--r-- | .idea/deployment.xml | 15 | ||||
| -rw-r--r-- | .idea/misc.xml | 6 | ||||
| -rw-r--r-- | .idea/modules.xml | 8 | ||||
| -rw-r--r-- | .idea/vcs.xml | 6 | ||||
| -rw-r--r-- | .idea/webServers.xml | 15 | ||||
| -rw-r--r-- | .idea/workspace.xml | 369 |
8 files changed, 2 insertions, 432 deletions
@@ -1,3 +1,4 @@ +.idea main/app/sprinkles/core/assets/SiteAssets/php/DataBaseConf.php main/app/.env main/composer.lock @@ -18,4 +19,4 @@ main/build/bundle.result.json main/build/temp main/build/npm-debug.log main/app/config-userfrosting.php -main/app/database/userfrosting.db
\ No newline at end of file +main/app/database/userfrosting.db diff --git a/.idea/BEAM-Messenger.iml b/.idea/BEAM-Messenger.iml deleted file mode 100644 index e9f46a7..0000000 --- a/.idea/BEAM-Messenger.iml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/main/app/system" isTestSource="false" packagePrefix="UserFrosting\System\" /> - <sourceFolder url="file://$MODULE_DIR$/main/app/tests" isTestSource="true" packagePrefix="UserFrosting\Tests\" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module>
\ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index 81c1c22..0000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="PublishConfigData" autoUpload="Always" serverName="Strato"> - <serverData> - <paths name="Strato"> - <serverdata> - <mappings> - <mapping deploy="/" local="$PROJECT_DIR$" web="/" /> - </mappings> - </serverdata> - </paths> - </serverData> - <option name="myAutoUpload" value="ALWAYS" /> - </component> -</project>
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 28a804d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="JavaScriptSettings"> - <option name="languageLevel" value="ES6" /> - </component> -</project>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 8274900..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/BEAM-Messenger.iml" filepath="$PROJECT_DIR$/.idea/BEAM-Messenger.iml" /> - </modules> - </component> -</project>
\ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> - </component> -</project>
\ No newline at end of file diff --git a/.idea/webServers.xml b/.idea/webServers.xml deleted file mode 100644 index 2829d8f..0000000 --- a/.idea/webServers.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="WebServers"> - <option name="servers"> - <webServer id="92a2deab-a67a-4a15-bffd-9bc9638c5c27" name="Strato" url="http://beam-messenger.de"> - <fileTransfer host="ssh.strato.de" port="22" rootFolder="/beam/social" accessType="SFTP"> - <advancedOptions> - <advancedOptions dataProtectionLevel="Private" /> - </advancedOptions> - <option name="port" value="22" /> - </fileTransfer> - </webServer> - </option> - </component> -</project>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index ac7818d..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,369 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ChangeListManager"> - <list default="true" id="f802a534-c52e-48bb-b2b9-c2bb978b5f5c" name="Default" comment=""> - <change beforePath="$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/main.js" afterDir="false" /> - </list> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> - <option name="TRACKING_ENABLED" value="true" /> - <option name="SHOW_DIALOG" value="false" /> - <option name="HIGHLIGHT_CONFLICTS" value="true" /> - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> - <option name="LAST_RESOLUTION" value="IGNORE" /> - </component> - <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE"> - <pharConfigPath>$PROJECT_DIR$/main/composer.json</pharConfigPath> - </component> - <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="index.html.twig" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/templates/pages/index.html.twig"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1564"> - <caret line="55" column="40" selection-start-line="55" selection-start-column="40" selection-end-line="55" selection-end-column="40" /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="main.js" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/main.js"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="145"> - <caret line="191" selection-start-line="191" selection-end-line="191" selection-end-column="31" /> - <folding> - <element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="chat.js" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/chat.js"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="300" column="39" lean-forward="true" selection-start-line="300" selection-start-column="39" selection-end-line="300" selection-end-column="39" /> - </state> - </provider> - </entry> - </file> - </leaf> - </component> - <component name="FindInProjectRecents"> - <findStrings> - <find>GetProfilePageHTML</find> - </findStrings> - </component> - <component name="Git.Settings"> - <option name="ROOT_SYNC" value="DONT_SYNC" /> - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> - </component> - <component name="IdeDocumentHistory"> - <option name="CHANGED_PATHS"> - <list> - <option value="$PROJECT_DIR$/main/app/sprinkles/core/templates/pages/index.html.twig" /> - <option value="$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/main.js" /> - <option value="$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/chat.js" /> - </list> - </option> - </component> - <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> - <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> - <component name="JsGulpfileManager"> - <detection-done>true</detection-done> - <sorting>DEFINITION_ORDER</sorting> - </component> - <component name="NodePackageJsonFileManager"> - <packageJsonPaths> - <path value="$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/package.json" /> - <path value="$PROJECT_DIR$/main/build/package.json" /> - </packageJsonPaths> - </component> - <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="1946" /> - <option name="y" value="220" /> - <option name="width" value="1400" /> - <option name="height" value="1000" /> - </component> - <component name="ProjectView"> - <navigator proportions="" version="1"> - <foldersAlwaysOnTop value="true" /> - </navigator> - <panes> - <pane id="AndroidView" /> - <pane id="Scope" /> - <pane id="ProjectPane"> - <subPane> - <expand> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - <item name="assets" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - <item name="assets" type="462c0819:PsiDirectoryNode" /> - <item name="SiteAssets" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - <item name="assets" type="462c0819:PsiDirectoryNode" /> - <item name="SiteAssets" type="462c0819:PsiDirectoryNode" /> - <item name="js" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - <item name="templates" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="BEAM-Messenger" type="b2602c69:ProjectViewProjectNode" /> - <item name="BEAM-Messenger" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="app" type="462c0819:PsiDirectoryNode" /> - <item name="sprinkles" type="462c0819:PsiDirectoryNode" /> - <item name="core" type="462c0819:PsiDirectoryNode" /> - <item name="templates" type="462c0819:PsiDirectoryNode" /> - <item name="pages" type="462c0819:PsiDirectoryNode" /> - </path> - </expand> - <select /> - </subPane> - </pane> - <pane id="PackagesPane" /> - </panes> - </component> - <component name="PropertiesComponent"> - <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="aspect.path.notification.shown" value="true" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> - <property name="settings.editor.selected.configurable" value="web.server" /> - </component> - <component name="RunDashboard"> - <option name="ruleStates"> - <list> - <RuleState> - <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> - </RuleState> - <RuleState> - <option name="name" value="StatusDashboardGroupingRule" /> - </RuleState> - </list> - </option> - </component> - <component name="RunManager"> - <configuration default="true" type="Application" factoryName="Application"> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <patterns /> - </configuration> - <configuration default="true" type="TestNG" factoryName="TestNG"> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="SUITE_NAME" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="GROUP_NAME" /> - <option name="TEST_OBJECT" value="CLASS" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> - <option name="OUTPUT_DIRECTORY" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <option name="USE_DEFAULT_REPORTERS" value="false" /> - <option name="PROPERTIES_FILE" /> - <properties /> - <listeners /> - </configuration> - </component> - <component name="SvnConfiguration"> - <configuration /> - </component> - <component name="TaskManager"> - <task active="true" id="Default" summary="Default task"> - <changelist id="f802a534-c52e-48bb-b2b9-c2bb978b5f5c" name="Default" comment="" /> - <created>1528985326943</created> - <option name="number" value="Default" /> - <option name="presentableId" value="Default" /> - <updated>1528985326943</updated> - <workItem from="1528985330948" duration="36000" /> - <workItem from="1528985386538" duration="266000" /> - <workItem from="1528985673556" duration="567000" /> - <workItem from="1528986269311" duration="911000" /> - </task> - <servers /> - </component> - <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="1780000" /> - </component> - <component name="ToolWindowManager"> - <frame x="1366" y="0" width="2560" height="1440" extended-state="6" /> - <editor active="true" /> - <layout> - <window_info anchor="right" id="Palette" order="3" /> - <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32953683" /> - <window_info anchor="right" id="Maven Projects" order="3" /> - <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> - <window_info anchor="right" id="Material Palette" order="4" /> - <window_info id="Capture Tool" order="2" /> - <window_info id="Designer" order="2" /> - <window_info anchor="right" id="Database" order="3" /> - <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info id="UI Designer" order="2" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> - <window_info anchor="bottom" id="TODO" order="6" /> - <window_info anchor="right" id="Palette	" order="3" /> - <window_info id="Image Layers" order="2" /> - <window_info anchor="right" id="Capture Analysis" order="3" /> - <window_info anchor="bottom" id="File Transfer" weight="0.32953683" /> - <window_info anchor="bottom" id="Run" order="2" /> - <window_info anchor="bottom" id="Version Control" order="7" /> - <window_info anchor="bottom" id="Terminal" order="7" /> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13671875" /> - <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="right" id="SciView" order="4" /> - <window_info anchor="right" id="Theme Preview" order="3" /> - <window_info id="Favorites" order="2" side_tool="true" /> - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> - <window_info anchor="bottom" id="Message" order="0" /> - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> - </layout> - </component> - <component name="TypeScriptGeneratedFilesManager"> - <option name="version" value="1" /> - </component> - <component name="VcsContentAnnotationSettings"> - <option name="myLimit" value="2678400000" /> - </component> - <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/templates/pages/index.html.twig"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="690"> - <caret line="30" column="50" lean-forward="true" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="50" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/src/Alert/AlertStream.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1948" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/src/Controller/CoreController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="920"> - <caret line="47" column="54" lean-forward="true" selection-start-line="47" selection-start-column="54" selection-end-line="47" selection-end-column="54" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/jquery.js"> - <provider selected="true" editor-type-id="text-editor"> - <state> - <folding> - <element signature="n#!!doc" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/templates/pages/index.html.twig"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1564"> - <caret line="55" column="40" selection-start-line="55" selection-start-column="40" selection-end-line="55" selection-end-column="40" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/main.js"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="145"> - <caret line="191" selection-start-line="191" selection-end-line="191" selection-end-column="31" /> - <folding> - <element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/main/app/sprinkles/core/assets/SiteAssets/js/chat.js"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="345"> - <caret line="300" column="39" lean-forward="true" selection-start-line="300" selection-start-column="39" selection-end-line="300" selection-end-column="39" /> - </state> - </provider> - </entry> - </component> -</project>
\ No newline at end of file |