iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.editorconfig: Fixed max_line_length

This commit is contained in:
Igor Scheller 2020-06-24 13:01:24 +02:00 committed by msquare
parent d79d2c87bc
commit 3bce7a16d8
12 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig
View File

@ -21,6 +21,7 @@ indent_size = 2
[*.{htm,html,twig}] [*.{htm,html,twig}]
indent_size = 4 indent_size = 4
max_line_length = unset
[*.{js,css,less,sass,scss}] [*.{js,css,less,sass,scss}]
indent_size = 2 indent_size = 2
@ -31,6 +32,7 @@ indent_size = unset
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
indent_size = 2 indent_size = 2
max_line_length = unset
[*.php] [*.php]
indent_size = 4 indent_size = 4
@ -38,6 +40,9 @@ indent_size = 4
[*.sh] [*.sh]
indent_size = 2 indent_size = 2
[{db/*.sql,includes/**}]
max_line_length = unset
[*.{yml,yaml}] [*.{yml,yaml}]
indent_size = 2 indent_size = 2

3
docker/Dockerfile
View File

@ -38,7 +38,8 @@ RUN chown -R www-data:www-data /var/www/storage/ && \
rm -r /var/www/html rm -r /var/www/html
ARG VERSION ARG VERSION
RUN if [[ ! -f /var/www/storage/app/VERSION ]] && [[ ! -z "${VERSION}" ]]; then echo -n "${VERSION}" > /var/www/storage/app/VERSION; fi RUN if [[ ! -f /var/www/storage/app/VERSION ]] && [[ ! -z "${VERSION}" ]]; then \
echo -n "${VERSION}" > /var/www/storage/app/VERSION; fi
ENV TRUSTED_PROXIES 10.0.0.0/8,::ffff:10.0.0.0/8,\ ENV TRUSTED_PROXIES 10.0.0.0/8,::ffff:10.0.0.0/8,\
127.0.0.0/8,::ffff:127.0.0.0/8,\ 127.0.0.0/8,::ffff:127.0.0.0/8,\

6
resources/assets/themes/theme1.less
View File

@ -95,7 +95,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -105,7 +106,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme10.less
View File

@ -95,7 +95,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -105,7 +106,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme11.less
View File

@ -95,7 +95,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -105,7 +106,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme12.less
View File

@ -96,7 +96,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -106,7 +107,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme4.less
View File

@ -95,7 +95,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -105,7 +106,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme6.less
View File

@ -98,7 +98,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -108,7 +109,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme7.less
View File

@ -103,7 +103,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -113,7 +114,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme8.less
View File

@ -95,7 +95,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -105,7 +106,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/assets/themes/theme9.less
View File

@ -95,7 +95,8 @@ THE SOFTWARE.
//== Iconography //== Iconography
// //
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font.
//## Useful for those including Bootstrap via Bower.
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
@ -105,7 +106,8 @@ THE SOFTWARE.
//== Components //== Components
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more.
//## Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px; @padding-base-vertical: 8px;
@padding-base-horizontal: 12px; @padding-base-horizontal: 12px;

6
resources/lang/de_DE/default.po
View File

@ -334,7 +334,8 @@ msgstr "löschen"
msgid "leave" msgid "leave"
msgstr "verlassen" msgstr "verlassen"
# As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation "Engel hinzufügen" for this button. # As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation
# "Engel hinzufügen" for this button.
#: includes/controller/angeltypes_controller.php:317 #: includes/controller/angeltypes_controller.php:317
#: includes/view/AngelTypes_view.php:152 includes/view/AngelTypes_view.php:542 #: includes/view/AngelTypes_view.php:152 includes/view/AngelTypes_view.php:542
msgid "join" msgid "join"
@ -2775,7 +2776,8 @@ msgid "schedule.import.title"
msgstr "Programm importieren" msgstr "Programm importieren"
msgid "schedule.import.text" msgid "schedule.import.text"
msgstr "Dieser Import erstellt Räume und erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes." msgstr ""
"Dieser Import erstellt Räume und erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes."
msgid "schedule.import.load.title" msgid "schedule.import.load.title"
msgstr "Programm importieren: Vorschau" msgstr "Programm importieren: Vorschau"