aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-06-1622-30/+100
* Merge pull request #9883 from nextcloud/return-user-groups-idsMorris Jobke2018-06-152-4/+4
|\
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-06-151-3/+3
| * Return groups IDs and not NamesJohn Molakvoæ (skjnldsv)2018-06-151-1/+1
* | Merge pull request #9258 from nextcloud/theming-logo-pngMorris Jobke2018-06-1512-78/+182
|\ \ | |/ |/|
| * Add info message if an exception occurs during the svg to png conversionJulius Härtl2018-06-143-3/+19
| * Minor fixes and cleanupJulius Härtl2018-06-069-39/+39
| * Use svg opt out as parameterJulius Härtl2018-06-054-14/+17
| * Adjust ImageManager tests for png generationJulius Härtl2018-06-052-13/+51
| * Generate PNG version of the theming app logo for mailsJulius Härtl2018-06-055-22/+69
* | Merge pull request #9197 from nextcloud/fix-avatar-centerMorris Jobke2018-06-155-41/+190
|\ \
| * | Removed debug stackJohn Molakvoæ (skjnldsv)2018-06-151-1/+0
| * | Fix indentJohn Molakvoæ (skjnldsv)2018-06-131-44/+44
| * | Removed old route, fix tests and fix var typeJohn Molakvoæ (skjnldsv)2018-06-133-3/+2
| * | Avatar imagick bumpJohn Molakvoæ (skjnldsv)2018-06-135-120/+63
| * | Embedded fontJohn Molakvoæ (skjnldsv)2018-06-131-2/+11
| * | Fixed since requirementJohn Molakvoæ (skjnldsv)2018-06-131-0/+1
| * | Added new testsJohn Molakvoæ (skjnldsv)2018-06-131-0/+36
| * | Unify colour algorithm outputJohn Molakvoæ (skjnldsv)2018-06-132-8/+17
| * | Controller tests fixesJohn Molakvoæ (skjnldsv)2018-06-134-59/+124
| * | Use base image sizeJohn Molakvoæ (skjnldsv)2018-06-131-15/+13
| * | Return Svg avatarsJohn Molakvoæ (skjnldsv)2018-06-133-34/+98
| * | Fix avatar generator centeringJohn Molakvoæ (skjnldsv)2018-06-131-5/+31
* | | Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelayMorris Jobke2018-06-151-1/+1
|\ \ \
| * | | Fix #9864: Decrease $maxDelay in Throttler.phpMark Berezovsky2018-06-151-1/+1
* | | | Merge pull request #9873 from nextcloud/fix-http-client-given-options-being-o...Morris Jobke2018-06-152-6/+133
|\ \ \ \ | |/ / / |/| | |
| * | | Fix HTTP client given options being overriden by default optionsDaniel Calviño Sánchez2018-06-142-6/+133
* | | | [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 CSPsRoeland Jago Douma2018-06-136-2/+198
| |/ /
* | | Merge pull request #9859 from nextcloud/fix/noid/iconcontroller_timing_fixMorris Jobke2018-06-132-8/+4
|\ \ \
| * | | Fix possible test timing issues in IconControllerRoeland Jago Douma2018-06-132-8/+4
| |/ /
* | | Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-back...Roeland Jago Douma2018-06-135-0/+144
|\ \ \
| * | | Background job to clean up old backups of the updaterMorris Jobke2018-06-135-0/+144
| |/ /
* | | Merge pull request #9852 from nextcloud/feature/noid/merge-setup-checks-into-...Morris Jobke2018-06-138-240/+374
|\ \ \ | |/ / |/| |
| * | Merge all setup checks into one controllerMorris Jobke2018-06-138-240/+374
|/ /
* | Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-in...Morris Jobke2018-06-1315-246/+69
|\ \
| * | Merge tips & tricks section into setup checksMorris Jobke2018-06-1315-246/+69
* | | Merge pull request #9850 from nextcloud/fix/noid/setup-check-empty-indexMorris Jobke2018-06-134-19/+25
|\ \ \ | |/ / |/| |
| * | Fix wrong hint about missing indexesMorris Jobke2018-06-134-19/+25
* | | Merge pull request #9833 from nextcloud/dependabot/composer/build/integration...John Molakvoæ2018-06-1312-71/+82
|\ \ \
| * | | Fixed phpunit Test classJohn Molakvoæ (skjnldsv)2018-06-1311-70/+81
| * | | Update phpunit/phpunit requirement to ~6.5 in /build/integrationdependabot[bot]2018-06-131-1/+1
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2018-06-13196-1634/+1856
|/ /
* | Merge pull request #9834 from nextcloud/copy-fixJohn Molakvoæ2018-06-1230-48/+460
|\ \
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-06-123-4/+3
| * | Indent fix and copy2John Molakvoæ (skjnldsv)2018-06-122-10/+17
| * | Copyright fix, changed vue settings output name and fixes template nameJohn Molakvoæ (skjnldsv)2018-06-1227-23/+429
* | | Merge pull request #9828 from nextcloud/gc-s3-listMorris Jobke2018-06-121-0/+5
|\ \ \