summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correctly handle the classification of events in the activity streamJoas Schilling2019-01-082-3/+20
* [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
|\ \ \ \ | |/ / / |/| | |
| * | | Install new instances with bigint filecacheDaniel Kesselberg2019-01-041-4/+4
* | | | Merge pull request #13145 from nextcloud/ie11-apps-menu-fixMorris Jobke2019-01-042-16/+37
|\ \ \ \
| * | | | IE fix for apps menuJohn Molakvoæ (skjnldsv)2018-12-182-16/+37
* | | | | Merge pull request #13134 from nextcloud/bugfix/13088/404-instead-of-exceptionMorris Jobke2019-01-043-5/+10
|\ \ \ \ \
| * | | | | Make setup check also pass with a 501 statusJulius Härtl2018-12-192-4/+8
| * | | | | returns a 501 instead of exception if app is not installed - #13088Maxence Lange2018-12-191-1/+2
* | | | | | Merge pull request #13336 from estheruary/masterRoeland Jago Douma2019-01-041-0/+1
|\ \ \ \ \ \
| * | | | | | Add note for Docker users running consoleEstelle Poulin2019-01-031-0/+1
* | | | | | | Merge pull request #13340 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-01-042-88/+472
|\ \ \ \ \ \ \
| * | | | | | | Bump webpack-cli from 3.1.2 to 3.2.0 in /apps/accessibilitydependabot[bot]2019-01-042-88/+472
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #13341 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-01-042-57/+372
|\ \ \ \ \ \ \
| * | | | | | | Bump webpack-cli from 3.1.2 to 3.2.0 in /settingsdependabot[bot]2019-01-042-57/+372
| |/ / / / / /
* | | | | | | Merge pull request #13343 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-01-042-77/+13
|\ \ \ \ \ \ \
| * | | | | | | Bump babel-loader from 8.0.4 to 8.0.5 in /apps/updatenotificationdependabot[bot]2019-01-042-77/+13
* | | | | | | | Merge pull request #13344 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2019-01-042-188/+478
|\ \ \ \ \ \ \ \