diff options
author | Simon Rettberg | 2019-04-10 11:31:20 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-04-10 11:31:20 +0200 |
commit | 74ceae9594bb22928755998c4e55ccaadab6ea37 (patch) | |
tree | 405d3b0bb586836f8d9e8abd70886eccb0380a6e /.idea | |
parent | [syslog] Set UUID = null if seemingly invalid (diff) | |
download | slx-admin-74ceae9594bb22928755998c4e55ccaadab6ea37.tar.gz slx-admin-74ceae9594bb22928755998c4e55ccaadab6ea37.tar.xz slx-admin-74ceae9594bb22928755998c4e55ccaadab6ea37.zip |
Include .idea in VCS (with proper excludes, hopefully)
Diffstat (limited to '.idea')
-rw-r--r-- | .idea/codeStyleSettings.xml | 65 | ||||
-rw-r--r-- | .idea/codeStyles/Project.xml | 59 | ||||
-rw-r--r-- | .idea/codeStyles/codeStyleConfig.xml | 5 | ||||
-rw-r--r-- | .idea/copyright/profiles_settings.xml | 3 | ||||
-rw-r--r-- | .idea/modules.xml | 8 | ||||
-rw-r--r-- | .idea/slxadmin.iml | 15 | ||||
-rw-r--r-- | .idea/webResources.xml | 14 |
7 files changed, 104 insertions, 65 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 851e676d..00000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectCodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS"> - <value> - <option name="LINE_SEPARATOR" value=" " /> - <PHPCodeStyleSettings> - <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" /> - <option name="PHPDOC_WRAP_LONG_LINES" value="true" /> - <option name="LOWER_CASE_BOOLEAN_CONST" value="true" /> - <option name="LOWER_CASE_NULL_CONST" value="true" /> - </PHPCodeStyleSettings> - <XML> - <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> - </XML> - <codeStyleSettings language="HTML"> - <indentOptions> - <option name="INDENT_SIZE" value="3" /> - <option name="CONTINUATION_INDENT_SIZE" value="6" /> - <option name="TAB_SIZE" value="3" /> - <option name="USE_TAB_CHARACTER" value="true" /> - </indentOptions> - </codeStyleSettings> - <codeStyleSettings language="JSON"> - <indentOptions> - <option name="INDENT_SIZE" value="3" /> - <option name="CONTINUATION_INDENT_SIZE" value="6" /> - <option name="TAB_SIZE" value="3" /> - <option name="USE_TAB_CHARACTER" value="true" /> - </indentOptions> - </codeStyleSettings> - <codeStyleSettings language="JavaScript"> - <indentOptions> - <option name="INDENT_SIZE" value="3" /> - <option name="CONTINUATION_INDENT_SIZE" value="3" /> - <option name="TAB_SIZE" value="3" /> - <option name="USE_TAB_CHARACTER" value="true" /> - </indentOptions> - </codeStyleSettings> - <codeStyleSettings language="PHP"> - <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" /> - <option name="LINE_COMMENT_ADD_SPACE" value="true" /> - <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" /> - <option name="INDENT_CASE_FROM_SWITCH" value="false" /> - <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" /> - <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" /> - <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> - <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> - <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" /> - <option name="ARRAY_INITIALIZER_WRAP" value="5" /> - <option name="DOWHILE_BRACE_FORCE" value="3" /> - <option name="WHILE_BRACE_FORCE" value="3" /> - <option name="FOR_BRACE_FORCE" value="3" /> - <indentOptions> - <option name="INDENT_SIZE" value="3" /> - <option name="CONTINUATION_INDENT_SIZE" value="3" /> - <option name="TAB_SIZE" value="3" /> - <option name="USE_TAB_CHARACTER" value="true" /> - </indentOptions> - </codeStyleSettings> - </value> - </option> - <option name="USE_PER_PROJECT_SETTINGS" value="true" /> - </component> -</project>
\ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..9c263399 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,59 @@ +<component name="ProjectCodeStyleConfiguration"> + <code_scheme name="Project" version="173"> + <option name="LINE_SEPARATOR" value=" " /> + <PHPCodeStyleSettings> + <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" /> + <option name="PHPDOC_WRAP_LONG_LINES" value="true" /> + <option name="LOWER_CASE_BOOLEAN_CONST" value="true" /> + <option name="LOWER_CASE_NULL_CONST" value="true" /> + </PHPCodeStyleSettings> + <XML> + <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> + </XML> + <codeStyleSettings language="HTML"> + <indentOptions> + <option name="INDENT_SIZE" value="3" /> + <option name="CONTINUATION_INDENT_SIZE" value="6" /> + <option name="TAB_SIZE" value="3" /> + <option name="USE_TAB_CHARACTER" value="true" /> + </indentOptions> + </codeStyleSettings> + <codeStyleSettings language="JSON"> + <indentOptions> + <option name="INDENT_SIZE" value="3" /> + <option name="CONTINUATION_INDENT_SIZE" value="6" /> + <option name="TAB_SIZE" value="3" /> + <option name="USE_TAB_CHARACTER" value="true" /> + </indentOptions> + </codeStyleSettings> + <codeStyleSettings language="JavaScript"> + <indentOptions> + <option name="INDENT_SIZE" value="3" /> + <option name="CONTINUATION_INDENT_SIZE" value="3" /> + <option name="TAB_SIZE" value="3" /> + <option name="USE_TAB_CHARACTER" value="true" /> + </indentOptions> + </codeStyleSettings> + <codeStyleSettings language="PHP"> + <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" /> + <option name="LINE_COMMENT_ADD_SPACE" value="true" /> + <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" /> + <option name="INDENT_CASE_FROM_SWITCH" value="false" /> + <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" /> + <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" /> + <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> + <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> + <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" /> + <option name="ARRAY_INITIALIZER_WRAP" value="5" /> + <option name="DOWHILE_BRACE_FORCE" value="3" /> + <option name="WHILE_BRACE_FORCE" value="3" /> + <option name="FOR_BRACE_FORCE" value="3" /> + <indentOptions> + <option name="INDENT_SIZE" value="3" /> + <option name="CONTINUATION_INDENT_SIZE" value="3" /> + <option name="TAB_SIZE" value="3" /> + <option name="USE_TAB_CHARACTER" value="true" /> + </indentOptions> + </codeStyleSettings> + </code_scheme> +</component> diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ +<component name="ProjectCodeStyleConfiguration"> + <state> + <option name="USE_PER_PROJECT_SETTINGS" value="true" /> + </state> +</component>
\ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ +<component name="CopyrightManager"> + <settings default="" /> +</component>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..ea3b9f24 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/slxadmin.iml" filepath="$PROJECT_DIR$/.idea/slxadmin.iml" /> + </modules> + </component> +</project>
\ No newline at end of file diff --git a/.idea/slxadmin.iml b/.idea/slxadmin.iml new file mode 100644 index 00000000..d595bdcf --- /dev/null +++ b/.idea/slxadmin.iml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="WEB_MODULE" version="4"> + <component name="NewModuleRootManager"> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/apis" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/inc" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/modules-available" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/Mustache" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/modules" /> + <excludePattern pattern="modules" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/webResources.xml b/.idea/webResources.xml new file mode 100644 index 00000000..717d9d66 --- /dev/null +++ b/.idea/webResources.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="WebResourcesPaths"> + <contentEntries> + <entry url="file://$PROJECT_DIR$"> + <entryData> + <resourceRoots> + <path value="file://$PROJECT_DIR$" /> + </resourceRoots> + </entryData> + </entry> + </contentEntries> + </component> +</project>
\ No newline at end of file |