summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibilitydependabot[bot]2018-07-092-119/+116
* Merge pull request #10148 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2018-07-092-119/+116
|\
| * Bump webpack from 4.14.0 to 4.15.1 in /settingsdependabot[bot]2018-07-092-119/+116
* | Merge pull request #10149 from nextcloud/dependabot/npm_and_yarn/settings/bab...Roeland Jago Douma2018-07-092-4/+4
|\ \
| * | Bump babel-loader from 7.1.4 to 7.1.5 in /settingsdependabot[bot]2018-07-092-4/+4
* | | Merge pull request #10135 from nextcloud/feature/noid/add-visio-mimetypesMorris Jobke2018-07-094-1/+30
|\ \ \ | |_|/ |/| |
| * | Add visio mimetypesJoas Schilling2018-07-064-1/+30
* | | Merge pull request #10144 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-092-959/+23
|\ \ \
| * | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2dependabot[bot]2018-07-092-959/+23
| | |/ | |/|
* | | Merge pull request #10145 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-092-119/+116
|\ \ \ | |/ / |/| |
| * | Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2dependabot[bot]2018-07-082-119/+116
| |/
* | Merge pull request #10147 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-07-092-993/+32
|\ \
| * | Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibilitydependabot[bot]2018-07-082-993/+32
| |/
* | Merge pull request #10146 from nextcloud/dependabot/npm_and_yarn/settings/css...Roeland Jago Douma2018-07-092-1002/+35
|\ \ | |/ |/|
| * Bump css-loader from 0.28.11 to 1.0.0 in /settingsdependabot[bot]2018-07-082-1002/+35
|/
* Merge pull request #10116 from nextcloud/lock-negativeMorris Jobke2018-07-062-2/+20
|\
| * prevent lock values from going negative with memcache backendRobin Appelman2018-07-052-2/+20
* | Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12Roeland Jago Douma2018-07-061-0/+0
|\ \
| * | [3rdparty] Bump symfony depts to 3.4.12Roeland Jago Douma2018-07-061-0/+0
|/ /
* | Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailerJoas Schilling2018-07-0610-66/+85
|\ \
| * | Add warning to setup checks if the default mailer is still phpRoeland Jago Douma2018-07-043-1/+44
| * | Fix settings testsRoeland Jago Douma2018-07-041-2/+2
| * | Swift to \Swift_Mailer as abstractionRoeland Jago Douma2018-07-042-33/+21
| * | Make swift 6 compatibleRoeland Jago Douma2018-07-041-26/+16
| * | Kill php mail from settingsRoeland Jago Douma2018-07-043-9/+7
| * | [3rdparty] Bump swiftmailer 6.0.2Roeland Jago Douma2018-07-041-0/+0
* | | Merge pull request #10128 from nextcloud/fix/noid/add_locale_to_templatesMorris Jobke2018-07-063-3/+3
|\ \ \
| * | | Add locale to templatesRoeland Jago Douma2018-07-063-3/+3
|/ / /
* | | Merge pull request #10119 from nextcloud/bugfix/noid/fix-remnants-of-refactoringRoeland Jago Douma2018-07-051-2/+2
|\ \ \
| * | | Fix remnants of refactoringMorris Jobke2018-07-051-2/+2
|/ / /
* | | Merge pull request #9909 from nextcloud/feature/2192/allow_group_share_undele...Morris Jobke2018-07-0518-18/+443
|\ \ \
| * | | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-07-051-2/+2
| * | | Fix exceptionRoeland Jago Douma2018-07-051-0/+1
| * | | Fix testsRoeland Jago Douma2018-07-051-0/+15
| * | | Fix PHPDocMorris Jobke2018-07-051-1/+1
| * | | Always show menuJohn Molakvoæ (skjnldsv)2018-07-051-13/+11
| * | | Disable sidebar on deleted shareJohn Molakvoæ (skjnldsv)2018-07-054-9/+23
| * | | Js magic for deleted sharesJohn Molakvoæ (skjnldsv)2018-07-057-19/+175
| * | | getDeletedSharedWith methodJohn Molakvoæ (skjnldsv)2018-07-053-11/+34
| * | | Add API to undelete delete group sharesRoeland Jago Douma2018-07-0510-0/+218
|/ / /
* | | Merge pull request #10103 from nextcloud/bugfix/9767/apps-management-issuesMorris Jobke2018-07-0510-29/+56
|\ \ \ | |_|/ |/| |
| * | Update settings jsJulius Härtl2018-07-042-3/+3
| * | Fix displaying errorsJulius Härtl2018-07-042-8/+16
| * | Hide uninstalled apps when removing themJulius Härtl2018-07-042-1/+2
| * | Add transition when enabling/disabling appsJulius Härtl2018-07-042-14/+24
| * | Fix invalid limit parameter when fetching groupsJulius Härtl2018-07-044-3/+11
|/ /
* | Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-formatblizzz2018-07-044-1039/+674
|\ \
| * | let user set avatar in nextcloud von LDAP provides invalid image dataArthur Schiwon2018-07-034-13/+152
| * | Iron User_LDAP testsArthur Schiwon2018-07-032-1029/+525
* | | Merge pull request #10102 from nextcloud/bugfix/noid/fix-integration-tests-fe...Morris Jobke2018-07-041-0/+1
|\ \ \