aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6916 from nextcloud/css-box-sizingJohn Molakvoæ2017-10-231-4/+0
|\
| * Box-sizing does not need vendor prefix anymoreMorris Jobke2017-10-231-4/+0
* | Merge pull request #6917 from nextcloud/css-box-shadowJohn Molakvoæ2017-10-232-4/+0
|\ \
| * | Box-shadow does not need vendor prefix anymoreMorris Jobke2017-10-232-4/+0
| |/
* | Merge pull request #6780 from nextcloud/rakekniven-patch-1Morris Jobke2017-10-231-2/+2
|\ \
| * | Update file-upload.jsrakekniven2017-10-071-2/+2
* | | Merge pull request #6892 from nextcloud/rakekniven-patch-2Lukas Reschke2017-10-231-1/+1
|\ \ \ | |_|/ |/| |
| * | Update settings-admin-caldav.phprakekniven2017-10-211-1/+1
* | | [tx-robot] updated from transifexNextcloud bot2017-10-238-4/+110
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2210-6/+140
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-10-2118-12/+76
* | [tx-robot] updated from transifexNextcloud bot2017-10-2012-0/+42
* | Merge pull request #6873 from nextcloud/ldap_proxy_redix_fixLukas Reschke2017-10-191-19/+12
|\ \
| * | Little bit of code cleanupRoeland Jago Douma2017-10-191-5/+5
| * | Do not check existance before fetchRoeland Jago Douma2017-10-191-14/+7
* | | Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitationsJoas Schilling2017-10-197-3/+209
|\ \ \
| * | | Make it possible to opt out of IMip Plugin for CalDAVGeorg Ehrke2017-10-162-2/+10
| * | | add admin settings panel for dav appGeorg Ehrke2017-10-165-1/+199
* | | | Merge pull request #6677 from nextcloud/downstream-dont-reset-quotaLukas Reschke2017-10-193-18/+12
|\ \ \ \
| * | | | and add missing whitespaces to log outoutArthur Schiwon2017-09-281-2/+2
| * | | | Adjust unittestJuan Pablo Villafáñez2017-09-281-15/+10
| * | | | Keep the current quota if no suitable quota is foundJuan Pablo Villafáñez2017-09-281-1/+0
* | | | | Merge pull request #6835 from nextcloud/dav-plugins-from-apps-onlyLukas Reschke2017-10-195-4/+291
|\ \ \ \ \
| * | | | | Dav: codestyle fixes in PluginManagerJulius Härtl2017-10-141-8/+8
| * | | | | Let apps register Sabre plugins or collectionsVincent Petry2017-10-145-4/+291
* | | | | | Merge pull request #6853 from nextcloud/apps_autoloaderLukas Reschke2017-10-199-0/+694
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move files_sharing to a proper classmapRoeland Jago Douma2017-10-179-0/+694
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1954-102/+136
* | | | | | Set the data from the templateJoas Schilling2017-10-182-41/+11
* | | | | | Set the subject with the email template to allow themingJoas Schilling2017-10-181-7/+7
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1810-8/+94
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1718-32/+192
* | | | | [tx-robot] updated from transifexNextcloud bot2017-10-162-30/+42
* | | | | Merge pull request #6585 from nextcloud/theming-fileupload-errorhandlingRoeland Jago Douma2017-10-154-22/+222
|\ \ \ \ \
| * | | | | Theming: Add tests for mimetype and upload error checksJulius Härtl2017-10-032-15/+170
| * | | | | Theming: Fix message/loading display on errorsJulius Härtl2017-10-032-0/+3
| * | | | | Theming: Check valid image format also for logoJulius Härtl2017-10-031-0/+12
| * | | | | Theming: Handle errors on uploaded files properlyJulius Härtl2017-10-032-17/+47
* | | | | | Merge pull request #6791 from nextcloud/fix-test-warningsRoeland Jago Douma2017-10-152-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't use deprecated $this->getMock() methodJoas Schilling2017-10-091-2/+2
| * | | | | Fix tests with group managerJoas Schilling2017-10-091-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1416-20/+290
* | | | | | Use ::class to avoid errorsJoas Schilling2017-10-131-6/+12
* | | | | | Fix class name, regression from 44cf67accdc294f46bf82b3f8661f353dc5e22f0Joas Schilling2017-10-131-1/+1
* | | | | | Merge pull request #6816 from nextcloud/external-storage-confirm-delete-fixJoas Schilling2017-10-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fix confirmation dialog when deleting external storageRobin Appelman2017-10-121-1/+1
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-132-4/+84
* | | | | | | Correct class to quotaJohn Molakvoæ (skjnldsv)2017-10-121-1/+1
|/ / / / / /
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-10-104-12/+12
|/ / / / /
* | | | | Merge pull request #6770 from nextcloud/check-user-group-exists-dav-sharesJoas Schilling2017-10-0911-30/+96
|\ \ \ \ \