Compare commits
3 commits
a546c4705c
...
c951e6143f
Author | SHA1 | Date | |
---|---|---|---|
Daniel Siepmann | c951e6143f | ||
Daniel Siepmann | 5b7d998df1 | ||
Daniel Siepmann | 1033fec278 |
|
@ -7,9 +7,13 @@
|
||||||
"indexer.exclude_patterns":
|
"indexer.exclude_patterns":
|
||||||
- "**\/var\/**\/*"
|
- "**\/var\/**\/*"
|
||||||
- "**\/typo3temp\/**\/*"
|
- "**\/typo3temp\/**\/*"
|
||||||
|
- "**\/typo3export\/**\/*"
|
||||||
|
- "**\/imgserver\/**\/*"
|
||||||
- "**\/fileadmin\/**\/*"
|
- "**\/fileadmin\/**\/*"
|
||||||
- "**\/uploads\/**\/*"
|
- "**\/uploads\/**\/*"
|
||||||
- "**\/Resources\/Public\/**\/*"
|
- "**\/Resources\/Public\/**\/*"
|
||||||
|
- "**\/*Assert.php"
|
||||||
|
- "**\/*Database.php"
|
||||||
- "**\/node_modules\/**\/*"
|
- "**\/node_modules\/**\/*"
|
||||||
- "**\/stubs-rector\/**\/*"
|
- "**\/stubs-rector\/**\/*"
|
||||||
- "**\/.ddev\/**\/*"
|
- "**\/.ddev\/**\/*"
|
||||||
|
|
|
@ -287,6 +287,7 @@ in {
|
||||||
"pref.privacy.disable_button.view_passwords" = false;
|
"pref.privacy.disable_button.view_passwords" = false;
|
||||||
"app.shield.optoutstudies.enabled" = false;
|
"app.shield.optoutstudies.enabled" = false;
|
||||||
|
|
||||||
|
"cookiebanners.service.mode" = 1;
|
||||||
"cookiebanners.service.mode.privateBrowsing" = 1;
|
"cookiebanners.service.mode.privateBrowsing" = 1;
|
||||||
"cookiebanners.ui.desktop.enabled" = true;
|
"cookiebanners.ui.desktop.enabled" = true;
|
||||||
|
|
||||||
|
|
|
@ -94,10 +94,11 @@
|
||||||
whitespace = "-blank-at-eol,-space-before-tab,-indent-with-non-tab,-tab-in-indent,-blank-at-eof,-trailing-space-,cr-at-eol";
|
whitespace = "-blank-at-eol,-space-before-tab,-indent-with-non-tab,-tab-in-indent,-blank-at-eof,-trailing-space-,cr-at-eol";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Not possible right now, due to: https://github.com/gitonomy/gitlib/issues/114 for onw customer project
|
diff = {
|
||||||
# diff = {
|
# Not possible right now, due to: https://github.com/gitonomy/gitlib/issues/114 for own customer project
|
||||||
# noprefix = true;
|
# noprefix = true;
|
||||||
# };
|
algorithm = "histogram";
|
||||||
|
};
|
||||||
|
|
||||||
pager = {
|
pager = {
|
||||||
branch = false;
|
branch = false;
|
||||||
|
@ -133,6 +134,7 @@
|
||||||
|
|
||||||
merge = {
|
merge = {
|
||||||
ff = true;
|
ff = true;
|
||||||
|
conflictstyle = "zdiff3";
|
||||||
tool = "nvimdiff4";
|
tool = "nvimdiff4";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Binary file not shown.
BIN
projects/.ignore
BIN
projects/.ignore
Binary file not shown.
Binary file not shown.
BIN
projects/werkraum-media/schmal.nix
Normal file
BIN
projects/werkraum-media/schmal.nix
Normal file
Binary file not shown.
Loading…
Reference in a new issue