summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [3rdparty] Bump symfony/console to 4.2.2Roeland Jago Douma2019-01-071-0/+0
* Merge pull request #13365 from nextcloud/3rdparty/phpseclib/2.0.12Roeland Jago Douma2019-01-071-0/+0
|\
| * [3rdparty] Bump phpseclib to 2.0.13Roeland Jago Douma2019-01-071-0/+0
* | Merge pull request #13402 from nextcloud/fix/13285/inject_the_real_loggerRoeland Jago Douma2019-01-072-5/+5
|\ \
| * | Use the real logger in the settingsRoeland Jago Douma2019-01-072-5/+5
| |/
* | Merge pull request #13381 from nextcloud/menu-apps-fixesRoeland Jago Douma2019-01-071-0/+1
|\ \ | |/ |/|
| * Fix apps menu overlappingJohn Molakvoæ (skjnldsv)2019-01-051-0/+1
* | Merge pull request #13383 from nextcloud/3rdparty/broker-add-timezone-cancel-...Morris Jobke2019-01-071-0/+0
|\ \
| * | [3rdparty] Broker: add timezone to CANCEL messagesDaniel Kesselberg2019-01-051-0/+0
* | | Merge pull request #12227 from nextcloud/bugfix/cleanu_upload_foldersMorris Jobke2019-01-0710-23/+293
|\ \ \
| * | | Add live repair step to cleanup old chunksRoeland Jago Douma2019-01-044-1/+101
| * | | Background job to cleanup leftover chunked uploadsRoeland Jago Douma2019-01-048-22/+192
* | | | Merge pull request #13398 from nextcloud/improve-nav-bullet-collapse-hoverRoeland Jago Douma2019-01-071-1/+1
|\ \ \ \
| * | | | Make the nav bullet transparent selector more specificMichael Weimann2019-01-061-1/+1
* | | | | Merge pull request #12621 from nextcloud/td/12224/cleanup_middleware_registeringRoeland Jago Douma2019-01-072-111/+87
|\ \ \ \ \
| * | | | | Cleanup middleware registeringRoeland Jago Douma2019-01-032-111/+87
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-01-072-2/+2
| |/ / / / |/| | | |
* | | | | Merge pull request #13391 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \
| * | | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/oauth2dependabot[bot]2019-01-062-4/+4
* | | | | | Merge pull request #13392 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \ \
| * | | | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/updatenotificationdependabot[bot]2019-01-062-4/+4
| |/ / / / /
* | | | | | Merge pull request #13393 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \ \
| * | | | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/accessibilitydependabot[bot]2019-01-062-4/+4
| |/ / / / /
* | | | | | Merge pull request #13394 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-01-062-83/+39
|\ \ \ \ \ \
| * | | | | | Bump vue-loader from 15.4.2 to 15.5.0 in /apps/updatenotificationdependabot[bot]2019-01-062-83/+39
* | | | | | | Merge pull request #13390 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /settingsdependabot[bot]2019-01-062-4/+4
| |/ / / / /
* | | | | | Merge pull request #13389 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-01-062-69/+41
|\ \ \ \ \ \
| * | | | | | Bump vue-loader from 15.4.2 to 15.5.0 in /apps/accessibilitydependabot[bot]2019-01-062-69/+41
| |/ / / / /
* | | | | | Merge pull request #13388 from nextcloud/dependabot/npm_and_yarn/settings/vue...Roeland Jago Douma2019-01-062-43/+44
|\ \ \ \ \ \
| * | | | | | Bump vue-loader from 15.4.2 to 15.5.0 in /settingsdependabot[bot]2019-01-062-43/+44
| |/ / / / /
* | | | | | Merge pull request #13387 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2019-01-062-69/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump vue-loader from 15.4.2 to 15.5.0 in /apps/oauth2dependabot[bot]2019-01-062-69/+41
|/ / / / /
* | | / / [tx-robot] updated from transifexNextcloud bot2019-01-066-2/+42
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2019-01-0598-180/+244
* | | | Merge pull request #13138 from nextcloud/enhancement/noid/ldap-remnants-detec...Morris Jobke2019-01-044-32/+184
|\ \ \ \
| * | | | ensure db is pristine before starting the testsArthur Schiwon2019-01-041-0/+3
| * | | | LDAP: extend remnants output with "detected on" fieldArthur Schiwon2018-12-213-26/+57
| * | | | add tests for the DUIArthur Schiwon2018-12-212-6/+124
* | | | | Merge pull request #13363 from nextcloud/fix/loginflow_apptoken_iosMorris Jobke2019-01-044-11/+17
|\ \ \ \ \
| * | | | | Fix loginflow with apptoken enter on iOSRoeland Jago Douma2019-01-044-11/+17
* | | | | | Merge pull request #13367 from nextcloud/fix/13202/throttle_with_correct_meta...Roeland Jago Douma2019-01-041-1/+1
|\ \ \ \ \ \
| * | | | | | Throttle with correct metadataRoeland Jago Douma2019-01-041-1/+1
* | | | | | | Merge pull request #13117 from nextcloud/vcard-avatar-fixesRoeland Jago Douma2019-01-044-17/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update apps/dav/lib/CardDAV/PhotoCache.php Morris Jobke2019-01-041-1/+1
| * | | | | | Log failure on parsingJohn Molakvoæ (skjnldsv)2019-01-045-15/+28
| * | | | | | Allow URI as data for vcard PHOTOJohn Molakvoæ (skjnldsv)2019-01-042-4/+10
* | | | | | | Merge pull request #13362 from nextcloud/backport/13354/masterRoeland Jago Douma2019-01-042-1/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | check anonymous OPTIONS requests file in root (not in subdir)Bastien Durel2019-01-042-1/+14
* | | | | | | Merge pull request #13358 from nextcloud/bugfix/12927-bigint-mtime-storagetimeRoeland Jago Douma2019-01-041-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |