aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Format control structures, classes, methods and functionChristoph Wurst2020-04-101757-5891/+3872
| | | | | | | | | | | | | | | To continue this formatting madness, here's a tiny patch that adds unified formatting for control structures like if and loops as well as classes, their methods and anonymous functions. This basically forces the constructs to start on the same line. This is not exactly what PSR2 wants, but I think we can have a few exceptions with "our" style. The starting of braces on the same line is pracrically standard for our code. This also removes and empty lines from method/function bodies at the beginning and end. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #20403 from nextcloud/techdebt/utf8-encodingChristoph Wurst2020-04-100-0/+0
|\ | | | | Use utf8 encoding everywhere
| * Use utf8 encoding everywhereChristoph Wurst2020-04-101-1/+1
| | | | | | | | | | | | PSR2 likes that and so do I Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20402 from nextcloud/techdebt/elseifJohn Molakvoæ2020-04-10218-595/+595
|\ \ | |/ |/| Use elseif instead of else if
| * Use elseif instead of else ifChristoph Wurst2020-04-10218-595/+595
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #20256 from ↵Roeland Jago Douma2020-04-101-0/+0
|\ | | | | | | | | nextcloud/dependabot/composer/nikic/php-parser-4.3.0 Bump nikic/php-parser from 4.2.1 to 4.3.0
| * Bump nikic/php-parser from 4.2.1 to 4.3.0Christoph Wurst2020-04-081-0/+0
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20281 from nextcloud/bugfix/noid/use-primary-element-colorRoeland Jago Douma2020-04-105-7/+7
|\ \ | | | | | | Use the primary element color in case it primary color is too bright
| * | Use the primary element color in case it primary color is too brightJoas Schilling2020-04-105-7/+7
|/ / | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #20313 from ↵Roeland Jago Douma2020-04-1012-108/+108
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/underscore-1.10.2 Bump underscore from 1.9.2 to 1.10.2
| * | Bump underscore from 1.9.2 to 1.10.2dependabot-preview[bot]2020-04-0812-108/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [underscore](https://github.com/jashkenas/underscore) from 1.9.2 to 1.10.2. - [Release notes](https://github.com/jashkenas/underscore/releases) - [Commits](https://github.com/jashkenas/underscore/compare/1.9.2...1.10.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #20385 from nextcloud/skeeable-http-hardenRoeland Jago Douma2020-04-101-3/+13
|\ \ \ | | | | | | | | harden seekable http stream a bit against failures
| * | | harden seekable http stream a bit against failuresRobin Appelman2020-04-091-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #20390 from nextcloud/refactor/no-closing-tagRoeland Jago Douma2020-04-101-2/+1
|\ \ \ \ | | | | | | | | | | Do not use closing tags
| * | | | Do not use closing tagsChristoph Wurst2020-04-091-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-04-1016-14/+52
| | | | |
* | | | | Merge pull request #20391 from nextcloud/refactor/spaces-cleanupChristoph Wurst2020-04-09169-426/+411
|\ \ \ \ \ | | | | | | | | | | | | Remove all extra whitespace PSR2 does not like
| * | | | | Remove space between switch case and colonChristoph Wurst2020-04-098-51/+53
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Make sure there is exactly one newline after importsChristoph Wurst2020-04-094-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Make sure every file ends with an empty newlineChristoph Wurst2020-04-0915-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Remove trailing whitespaces from commentsChristoph Wurst2020-04-0923-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Remove trailing and in between spacesChristoph Wurst2020-04-09115-296/+296
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Remove spaces after method or function callChristoph Wurst2020-04-0915-25/+25
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #20384 from nextcloud/techdebt/lowercase-keywordsChristoph Wurst2020-04-0914-19/+19
|\ \ \ \ \ | |/ / / / |/| | | | Use php keywords in lowercase
| * | | | Use php keywords in lowercaseChristoph Wurst2020-04-0914-19/+19
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #20383 from nextcloud/techdebt/function-spacingChristoph Wurst2020-04-09384-1134/+1130
|\ \ \ \ | | | | | | | | | | Unify function spacing to PSR2 recommendation
| * | | | Unify function spacing to PSR2 recommendationChristoph Wurst2020-04-09384-1134/+1130
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #20376 from nextcloud/fix/tags-ellipsisJohn Molakvoæ2020-04-093-3/+8
|\ \ \ \ \ | |_|/ / / |/| | | | Fix systemtags overflow
| * | | | Fix systemtags overflowJohn Molakvoæ (skjnldsv)2020-04-093-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | Merge pull request #20355 from nextcloud/fix/comments/clear-input/19585John Molakvoæ2020-04-093-21/+24
|\ \ \ \ \ | |_|/ / / |/| | | | Clear comment on successful post
| * | | | Clear comment on successful postJohn Molakvoæ (skjnldsv)2020-04-083-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | Merge pull request #20379 from nextcloud/techdebt/blank-linesChristoph Wurst2020-04-09473-365/+152
|\ \ \ \ \ | | | | | | | | | | | | Use one blank line after the opening tag and namespace declaration
| * | | | | Use a blank line after the opening tagChristoph Wurst2020-04-0969-12/+93
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Use exactly one empty line after the namespace declarationChristoph Wurst2020-04-09408-353/+59
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | For PSR2 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #20375 from nextcloud/techdebt/fix-array-indent-styleChristoph Wurst2020-04-09145-2632/+2632
|\ \ \ \ \ | | | | | | | | | | | | Fix (array) indent style to always use one tab
| * | | | | Fix (array) indent style to always use one tabChristoph Wurst2020-04-09145-2632/+2632
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #20303 from nextcloud/version/19/beta2v19.0.0beta2Roeland Jago Douma2020-04-091-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | 19 beta 2
| * | | | 19 beta 2Roeland Jago Douma2020-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #20368 from nextcloud/refactor/psr1Christoph Wurst2020-04-090-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Migrate to PSR1 coding style
| * | | | | Migrate to PSR1 coding styleChristoph Wurst2020-04-088-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #20363 from nextcloud/smb-3.2.3John Molakvoæ2020-04-0912-27/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | update icewind/smb to 3.2.3
| * | | | | | update icewind/smb to 3.2.3Robin Appelman2020-04-0812-27/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-04-0918-6/+78
| | | | | | |
* | | | | | | Merge pull request #16035 from nextcloud/share-search-hide-on-matchblizzz2020-04-093-70/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont show remote and email options if we have an exact match for local user email
| * | | | | | | dont show remote and email options if we have an exact match for local user ↵Robin Appelman2020-04-083-70/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | email Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #20370 from nextcloud/techdebt/fix-multiline-commentsblizzz2020-04-0969-750/+741
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix multiline comments
| * | | | | | | Fix multiline commentsChristoph Wurst2020-04-0869-750/+741
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #20321 from ↵Joas Schilling2020-04-082-0/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enh/noid/check-translation-for-triple-dot Check for triple dots in translations in CI
| * | | | | | | Check for triple dots in translations in CIGary Kim2020-04-072-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | | | | Merge pull request #20360 from ↵Roeland Jago Douma2020-04-083-26/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/20182/try-to-use-the-displayname-for-file-transfers Try to use the display name of file transfers
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 19:23:33 +0000