diff --git a/.codecov.yml b/.codecov.yml
index ec27f44fea..7b6eecb66e 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,7 +1,7 @@
codecov:
branch: develop
ci:
- - drone.friendi.ca
+ - ci.friendi.ca
coverage:
precision: 2
diff --git a/.editorconfig b/.editorconfig
index af67d04a3b..610409143b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,9 +6,27 @@ root = true
[*]
charset = utf-8
end_of_line = lf
-trim_trailing_whitespaces = true
indent_style = tab
+trim_trailing_whitespace = true
+insert_final_newline = true
quote_type = single
+max_line_length = off
[*.js]
-quote_type = double
\ No newline at end of file
+quote_type = double
+ij_javascript_use_double_quotes = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.xml]
+indent_style = space
+indent_size = 2
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[composer.json]
+indent_style = tab
diff --git a/composer.json b/composer.json
index c6746c1231..e4e6aa6f03 100644
--- a/composer.json
+++ b/composer.json
@@ -132,7 +132,13 @@
"test": "phpunit",
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l",
"cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer",
- "cs:check": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"],
- "cs:fix": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"]
+ "cs:check": [
+ "@cs:install",
+ "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"
+ ],
+ "cs:fix": [
+ "@cs:install",
+ "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"
+ ]
}
}
diff --git a/docblox.dist.xml b/docblox.dist.xml
index a2ea8e2cb7..d702bc8886 100644
--- a/docblox.dist.xml
+++ b/docblox.dist.xml
@@ -10,4 +10,3 @@
.
-
diff --git a/mods/README.md b/mods/README.md
index fe7a7fed57..43389eb2c2 100644
--- a/mods/README.md
+++ b/mods/README.md
@@ -4,12 +4,12 @@ Friendica mods files
## `bookmarklet-share2friendica`
Browser bookmarklet to share any page with your Friendica account.
-Please see `bookmarklet-share2friendica/README.md` for detailed instruction.
+Please see `bookmarklet-share2friendica/README.md` for detailed instruction.
## `fpostit`
Node-agnostic Friendica bookmarklet by Devlon Duthie.
-Unmaintained and unsupported.
+Unmaintained and unsupported.
## `home.css` and `home.html`
@@ -30,7 +30,11 @@ Please check software documentation to know how modify these examples to make th
## `sample-systemd.timer` and `sample-systemd.service`
Sample systemd unit files to start worker.php periodically.
-
+
Please place them in the correct location for your system, typically this is `/etc/systemd/system/friendicaworker.timer` and `/etc/systemd/system/friendicaworker.service`.
Please report problems and improvements to `!helpers@forum.friendi.ca` and `@utzer@social.yl.ms` or open an issue in [the Github Friendica page](https://github.com/friendica/friendica/issues).
This is for usage of systemd instead of cron to start the worker periodically, the solution is a work-in-progress and can surely be improved.
+
+## `phpstorm-code-style.xml`
+
+PHP Storm Code Style settings, used for this codebase
diff --git a/mods/phpstorm-code-style.xml b/mods/phpstorm-code-style.xml
new file mode 100644
index 0000000000..0fb86cfb01
--- /dev/null
+++ b/mods/phpstorm-code-style.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruleset.xml b/ruleset.xml
index a71b7062fc..037b0e7b35 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -1,15 +1,15 @@
- Friendica Coding Standards: PSR2 with tabs instead of spaces
-
-
-
-
-
-
-
-
-
-
-
+ Friendica Coding Standards: PSR2 with tabs instead of spaces
+
+
+
+
+
+
+
+
+
+
+