summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6919 from nextcloud/di-appmanager-encryption-migrationMorris Jobke2017-10-242-9/+15
|\ | | | | Use DI for IAppManager to encryption migration
| * Use DI for IAppManager to encryption migrationMorris Jobke2017-10-242-9/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6922 from nextcloud/unneeded-isEnabled-checkBjörn Schießle2017-10-243-65/+34
|\ \ | | | | | | Remove unneeded check if app is enabled
| * | Remove unneeded check if app is enabledMorris Jobke2017-10-233-65/+34
| |/ | | | | | | | | | | App code will not be executable if the app is not enabled, because the autoloader refuses to load that class. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6920 from nextcloud/appmanager-usageMorris Jobke2017-10-241-1/+1
|\ \ | | | | | | Use appmanager instead of OC_App for check for enabled app
| * | Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-231-1/+1
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-10-24130-100/+2332
| |
* | Merge pull request #6916 from nextcloud/css-box-sizingJohn Molakvoæ2017-10-231-4/+0
|\ \ | | | | | | Box-sizing does not need vendor prefix anymore
| * | Box-sizing does not need vendor prefix anymoreMorris Jobke2017-10-231-4/+0
| |/ | | | | | | | | | | http://caniuse.com/#search=box-sizing Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6917 from nextcloud/css-box-shadowJohn Molakvoæ2017-10-232-4/+0
|\ \ | | | | | | Box-shadow does not need vendor prefix anymore
| * | Box-shadow does not need vendor prefix anymoreMorris Jobke2017-10-232-4/+0
| |/ | | | | | | | | | | | | https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow http://caniuse.com/#search=box-shadow Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6780 from nextcloud/rakekniven-patch-1Morris Jobke2017-10-231-2/+2
|\ \ | | | | | | Update file-upload.js
| * | Update file-upload.jsrakekniven2017-10-071-2/+2
| | | | | | | | | Fixed tiny translation issues. Removed space before ellipsis.
* | | Merge pull request #6892 from nextcloud/rakekniven-patch-2Lukas Reschke2017-10-231-1/+1
|\ \ \ | |_|/ |/| | Update settings-admin-caldav.php
| * | 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
|\ \ | | | | | | Ldap proxy Redis fix
| * | Little bit of code cleanupRoeland Jago Douma2017-10-191-5/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not check existance before fetchRoeland Jago Douma2017-10-191-14/+7
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitationsJoas Schilling2017-10-197-3/+209
|\ \ \ | | | | | | | | Opt out of IMip CalDAV Plugin
| * | | Make it possible to opt out of IMip Plugin for CalDAVGeorg Ehrke2017-10-162-2/+10
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | add admin settings panel for dav appGeorg Ehrke2017-10-165-1/+199
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #6677 from nextcloud/downstream-dont-reset-quotaLukas Reschke2017-10-193-18/+12
|\ \ \ \ | | | | | | | | | | don't reset quota
| * | | | and add missing whitespaces to log outoutArthur Schiwon2017-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Adjust unittestJuan Pablo Villafáñez2017-09-281-15/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Keep the current quota if no suitable quota is foundJuan Pablo Villafáñez2017-09-281-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #6835 from nextcloud/dav-plugins-from-apps-onlyLukas Reschke2017-10-195-4/+291
|\ \ \ \ \ | | | | | | | | | | | | Let apps register Sabre plugins or collections (v2)
| * | | | | Dav: codestyle fixes in PluginManagerJulius Härtl2017-10-141-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Let apps register Sabre plugins or collectionsVincent Petry2017-10-145-4/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upstream #26761 Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #6853 from nextcloud/apps_autoloaderLukas Reschke2017-10-199-0/+694
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Allow apps to have their own autoloader
| * | | | | Move files_sharing to a proper classmapRoeland Jago Douma2017-10-179-0/+694
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1954-102/+136
| | | | | |
* | | | | | Set the data from the templateJoas Schilling2017-10-182-41/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Set the subject with the email template to allow themingJoas Schilling2017-10-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [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: Handle errors on uploaded files properly
| * | | | | Theming: Add tests for mimetype and upload error checksJulius Härtl2017-10-032-15/+170
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Theming: Fix message/loading display on errorsJulius Härtl2017-10-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Theming: Check valid image format also for logoJulius Härtl2017-10-031-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Theming: Handle errors on uploaded files properlyJulius Härtl2017-10-032-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #6791 from nextcloud/fix-test-warningsRoeland Jago Douma2017-10-152-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix test warnings
| * | | | | Don't use deprecated $this->getMock() methodJoas Schilling2017-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix tests with group managerJoas Schilling2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-1416-20/+290
| | | | | |
* | | | | | Use ::class to avoid errorsJoas Schilling2017-10-131-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 21:05:27 +0000