summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Wait for cron to finish before running upgrade commandMorris Jobke2018-06-195-12/+73
| | | | | | * fixes #9562 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Tests fixJohn Molakvoæ (skjnldsv)2018-06-151-5/+5
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Keep userids as keys on group searchJohn Molakvoæ (skjnldsv)2018-06-152-5/+6
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #9883 from nextcloud/return-user-groups-idsMorris Jobke2018-06-152-4/+4
|\ | | | | Return groups IDs and not Names
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-06-151-3/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Return groups IDs and not NamesJohn Molakvoæ (skjnldsv)2018-06-151-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9258 from nextcloud/theming-logo-pngMorris Jobke2018-06-1512-78/+182
|\ \ | |/ |/| Convert theming app logo to PNG to show it properly in emails
| * Add info message if an exception occurs during the svg to png conversionJulius Härtl2018-06-143-3/+19
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Minor fixes and cleanupJulius Härtl2018-06-069-39/+39
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Use svg opt out as parameterJulius Härtl2018-06-054-14/+17
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Adjust ImageManager tests for png generationJulius Härtl2018-06-052-13/+51
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Generate PNG version of the theming app logo for mailsJulius Härtl2018-06-055-22/+69
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #9197 from nextcloud/fix-avatar-centerMorris Jobke2018-06-155-41/+190
|\ \ | | | | | | Fix avatar generator centering
| * | Removed debug stackJohn Molakvoæ (skjnldsv)2018-06-151-1/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix indentJohn Molakvoæ (skjnldsv)2018-06-131-44/+44
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Removed old route, fix tests and fix var typeJohn Molakvoæ (skjnldsv)2018-06-133-3/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Avatar imagick bumpJohn Molakvoæ (skjnldsv)2018-06-135-120/+63
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Embedded fontJohn Molakvoæ (skjnldsv)2018-06-131-2/+11
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed since requirementJohn Molakvoæ (skjnldsv)2018-06-131-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Added new testsJohn Molakvoæ (skjnldsv)2018-06-131-0/+36
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Unify colour algorithm outputJohn Molakvoæ (skjnldsv)2018-06-132-8/+17
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Controller tests fixesJohn Molakvoæ (skjnldsv)2018-06-134-59/+124
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Use base image sizeJohn Molakvoæ (skjnldsv)2018-06-131-15/+13
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Return Svg avatarsJohn Molakvoæ (skjnldsv)2018-06-133-34/+98
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix avatar generator centeringJohn Molakvoæ (skjnldsv)2018-06-131-5/+31
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelayMorris Jobke2018-06-151-1/+1
|\ \ \ | | | | | | | | Fix #9864: Decrease $maxDelay in Throttler.php
| * | | Fix #9864: Decrease $maxDelay in Throttler.phpMark Berezovsky2018-06-151-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
* | | | Merge pull request #9873 from ↵Morris Jobke2018-06-152-6/+133
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/fix-http-client-given-options-being-overriden-by-default-options Fix HTTP client given options being overriden by default options
| * | | Fix HTTP client given options being overriden by default optionsDaniel Calviño Sánchez2018-06-142-6/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the array_merge documentation, "If the input arrays have the same string keys, then the later value for that key will overwrite the previous one." Thus, the default options must be the first parameter passed to array_merge. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-06-1582-72/+556
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-06-14338-3476/+3040
| | |
* | | Merge pull request #9846 from nextcloud/feature/noid/add_stricter_cspsJohn Molakvoæ2018-06-136-2/+198
|\ \ \ | | | | | | | | Add stricter CSPs
| * | | Add stricter CSPsRoeland Jago Douma2018-06-136-2/+198
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Deprecate our default CSP * Add strict CSP that is always our strictest setting * Add strict eval CSP (disable unsafe-eval) * Add strict inline CSP (disables inline styles) This is just to move forward and have a incremental improvement of our CSP Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9859 from nextcloud/fix/noid/iconcontroller_timing_fixMorris Jobke2018-06-132-8/+4
|\ \ \ | | | | | | | | Fix possible test timing issues in IconController
| * | | Fix possible test timing issues in IconControllerRoeland Jago Douma2018-06-132-8/+4
| |/ / | | | | | | | | | | | | | | | | | | Since the response now handles the caching. We need to provide a default ITimeFactory mock. Else you might have failing tests. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9855 from ↵Roeland Jago Douma2018-06-135-0/+144
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/cleanup-old-updater-backup-dirs Background job to clean up old backups of the updater
| * | | Background job to clean up old backups of the updaterMorris Jobke2018-06-135-0/+144
| |/ / | | | | | | | | | | | | | | | | | | * a one-time job gets scheduled after each update via a repair job * the job remove all directories inside data/updater-INSTANCEID/backups except the 3 most recent ones (determined by mtime of the folder) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #9852 from ↵Morris Jobke2018-06-138-240/+374
|\ \ \ | |/ / |/| | | | | | | | nextcloud/feature/noid/merge-setup-checks-into-one-controller Merge all setup checks into one controller
| * | Merge all setup checks into one controllerMorris Jobke2018-06-138-240/+374
|/ / | | | | | | | | | | * renamed hasMissingIndexes to missingIndexes Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9836 from ↵Morris Jobke2018-06-1315-246/+69
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks Merge tips & tricks section into setup checks
| * | Merge tips & tricks section into setup checksMorris Jobke2018-06-1315-246/+69
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #9850 from nextcloud/fix/noid/setup-check-empty-indexMorris Jobke2018-06-134-19/+25
|\ \ \ | |/ / |/| | Fix wrong hint about missing indexes
| * | Fix wrong hint about missing indexesMorris Jobke2018-06-134-19/+25
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #9833 from ↵John Molakvoæ2018-06-1312-71/+82
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/phpunit/phpunit-approx-6.5 Update phpunit/phpunit requirement to ~6.5 in /build/integration
| * | | Fixed phpunit Test classJohn Molakvoæ (skjnldsv)2018-06-1311-70/+81
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Update phpunit/phpunit requirement to ~6.5 in /build/integrationdependabot[bot]2018-06-131-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-6.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/commits/6.5.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
* / / [tx-robot] updated from transifexNextcloud bot2018-06-13196-1634/+1856
|/ /
* | Merge pull request #9834 from nextcloud/copy-fixJohn Molakvoæ2018-06-1230-48/+460
|\ \ | | | | | | Copyright fix, changed vue settings output name and fixes template name
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-06-123-4/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Indent fix and copy2John Molakvoæ (skjnldsv)2018-06-122-10/+17
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>