From 74ceae9594bb22928755998c4e55ccaadab6ea37 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 10 Apr 2019 11:31:20 +0200
Subject: Include .idea in VCS (with proper excludes, hopefully)
---
.gitignore | 24 +++++++++++++
.idea/codeStyleSettings.xml | 65 -----------------------------------
.idea/codeStyles/Project.xml | 59 +++++++++++++++++++++++++++++++
.idea/codeStyles/codeStyleConfig.xml | 5 +++
.idea/copyright/profiles_settings.xml | 3 ++
.idea/modules.xml | 8 +++++
.idea/slxadmin.iml | 15 ++++++++
.idea/webResources.xml | 14 ++++++++
8 files changed, 128 insertions(+), 65 deletions(-)
delete mode 100644 .idea/codeStyleSettings.xml
create mode 100644 .idea/codeStyles/Project.xml
create mode 100644 .idea/codeStyles/codeStyleConfig.xml
create mode 100644 .idea/copyright/profiles_settings.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/slxadmin.iml
create mode 100644 .idea/webResources.xml
diff --git a/.gitignore b/.gitignore
index 5fe38bee..f05cb489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,27 @@ nbproject/
/client_config_additional.php
apis/tmpUploads/*
/modules/
+# Not sure about these...
+.idea/php.xml
+.idea/vcs.xml
+# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+# Generated files
+.idea/**/contentModel.xml
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+# File-based project format
+*.iws
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
\ 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 @@
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--
cgit v1.2.3-55-g7522