summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-237-9/+12
* [tx-robot] updated from transifexNextcloud bot2017-10-2310-6/+112
* Merge pull request #6758 from nextcloud/allow-0-quota-againblizzz2017-10-221-1/+1
|\
| * Allow quota of 0 againJoas Schilling2017-10-191-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-10-2212-6/+178
* | [tx-robot] updated from transifexNextcloud bot2017-10-2126-12/+118
* | [tx-robot] updated from transifexNextcloud bot2017-10-2020-4/+260
* | 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 #6825 from nextcloud/no-filecache-updateLukas Reschke2017-10-196-17/+128
|\ \ \ \
| * | | | Update autoloadingJoas Schilling2017-10-162-0/+2
| * | | | Also update the activity table with thisJoas Schilling2017-10-131-0/+6
| * | | | Add a command to manually migrate to big intsJoas Schilling2017-10-132-0/+102
| * | | | Install new instances with bigint filecacheJoas Schilling2017-10-131-14/+15
| * | | | Don't change the filecache schema on updateJoas Schilling2017-10-131-3/+3
* | | | | 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-1912-9/+721
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Ignore composer stuff in phanRoeland Jago Douma2017-10-171-0/+1
| * | | | | Update autoload checkerRoeland Jago Douma2017-10-171-5/+14
| * | | | | Move files_sharing to a proper classmapRoeland Jago Douma2017-10-179-0/+694
| * | | | | Allow apps to have their own autoloaderRoeland Jago Douma2017-10-171-4/+12
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-19206-442/+556
* | | | | | Merge pull request #6515 from nextcloud/templating-of-email-subjectsJoas Schilling2017-10-1817-127/+204
|\ \ \ \ \ \
| * | | | | | Fix autoloadingJoas Schilling2017-10-182-0/+2
| * | | | | | Set the data from the templateJoas Schilling2017-10-189-113/+46
| * | | | | | Introduce a public interface for MessageJoas Schilling2017-10-184-9/+106
| * | | | | | Set the subject with the email template to allow themingJoas Schilling2017-10-186-14/+21
| * | | | | | Allow templating of email subjectsJoas Schilling2017-10-182-0/+38
|/ / / / / /
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-10-1828-8/+224
|/ / / / /
* | | | | Merge pull request #6854 from nextcloud/s3-multipart-propagate-exceptionRoeland Jago Douma2017-10-171-0/+1
|\ \ \ \ \
| * | | | | propagate multipart upload exception when aborting uploadRobin Appelman2017-10-171-0/+1
|/ / / / /
* | | | | fix urlBjoern Schiessle2017-10-172-4/+4
* | | | | Merge pull request #5673 from tbille/gui-bug-authenticationJulius Härtl2017-10-171-1/+3
|\ \ \ \ \
| * | | | | Destroy modal when closedThomas Bille2017-10-171-1/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1722-32/+198
* | | | | Merge pull request #6844 from nextcloud/phan-repoRoeland Jago Douma2017-10-162-3/+3
|\ \ \ \ \
| * | | | | Phan is moved to a new repoRoeland Jago Douma2017-10-162-3/+3
| |/ / / /
* | | | | Merge pull request #6837 from nextcloud/timespan-check-3blizzz2017-10-161-12/+49
|\ \ \ \ \
| * | | | | Fix future time spansdartcafe2017-10-151-12/+49
| |/ / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-10-162-30/+42