summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-10-276-3/+111
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
|\ | | | | Added additional methods for removal of sensitive info
| * Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
| | | | | | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* | [tx-robot] updated from transifexNextcloud bot2017-10-272-0/+20
| |
* | Merge pull request #6949 from nextcloud/cachingrouter_localRoeland Jago Douma2017-10-261-2/+2
|\ \ | | | | | | Use local cache for the CachingRouter
| * | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
| |/ | | | | | | | | | | | | | | There is no need to cache routes distributed. It even has the downside that the router might return different routes then the ones in the local routes.php files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / [tx-robot] updated from transifexNextcloud bot2017-10-262-0/+18
|/
* [tx-robot] updated from transifexNextcloud bot2017-10-254-0/+16
|
* Merge pull request #6918 from nextcloud/rotate_job_by_defaultRoeland Jago Douma2017-10-246-14/+55
|\ | | | | Add logrote as a default background job
| * Update autoloaderRoeland Jago Douma2017-10-242-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add logrote as a default background jobRoeland Jago Douma2017-10-244-14/+53
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6921 from nextcloud/appmanager-securitymiddlewareRoeland Jago Douma2017-10-242-3/+10
|\ \ | | | | | | Use proper DI for security middleware for app enabled check
| * | Use proper DI for security middleware for app enabled checkMorris Jobke2017-10-242-3/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6928 from nextcloud/remove-unneeded-methodMorris Jobke2017-10-241-15/+0
|\ \ \ | | | | | | | | Remove unused method of OC_App
| * | | Remove unused method of OC_AppMorris Jobke2017-10-241-15/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Deprecate OC_App:isEnabledMorris Jobke2017-10-241-0/+1
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6920 from nextcloud/appmanager-usageMorris Jobke2017-10-244-4/+5
|\ \ \ | |_|/ |/| | Use appmanager instead of OC_App for check for enabled app
| * | Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-234-4/+5
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-10-246-0/+558
| |
* | Revert copyright changesJulius Härtl2017-10-234-2/+5
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Doc: Fix phpDoc issuesJulius Härtl2017-10-2314-15/+12
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2017-10-222-0/+38
|
* [tx-robot] updated from transifexNextcloud bot2017-10-214-0/+36
|
* [tx-robot] updated from transifexNextcloud bot2017-10-202-0/+2
|
* Merge pull request #6825 from nextcloud/no-filecache-updateLukas Reschke2017-10-192-0/+2
|\ | | | | No automatic filecache update
| * Update autoloadingJoas Schilling2017-10-162-0/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6853 from nextcloud/apps_autoloaderLukas Reschke2017-10-191-4/+12
|\ \ | | | | | | Allow apps to have their own autoloader
| * | Allow apps to have their own autoloaderRoeland Jago Douma2017-10-171-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow apps to also have a proper classmap and authorative autoloader. Currently if a file: <appdir>/composer/autoload.php exists we will use it. Else we keep the current behavior. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-10-194-0/+18
| | |
* | | Fix autoloadingJoas Schilling2017-10-182-0/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Set the data from the templateJoas Schilling2017-10-181-3/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Introduce a public interface for MessageJoas Schilling2017-10-184-9/+106
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Set the subject with the email template to allow themingJoas Schilling2017-10-181-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow templating of email subjectsJoas Schilling2017-10-182-0/+38
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-10-1814-0/+118
|/ /
* | propagate multipart upload exception when aborting uploadRobin Appelman2017-10-171-0/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-10-172-0/+2
| |
* | Merge pull request #6837 from nextcloud/timespan-check-3blizzz2017-10-161-12/+49
|\ \ | | | | | | Fix future time spans
| * | Fix future time spansdartcafe2017-10-151-12/+49
| | | | | | | | | | | | Signed-off-by: dartcafe <github@dartcafe.de>
* | | Merge pull request #6812 from nextcloud/upload-cache-pathRoeland Jago Douma2017-10-151-1/+3
|\ \ \ | |/ / |/| | also use configured 'cache_path' for new chunking
| * | also use configured 'cache_path' for new chunkingRobin Appelman2017-10-111-1/+3
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-10-144-2/+144
| |/ |/|
* | Merge pull request #6602 from nextcloud/s3-multipart-uploadRobin Appelman2017-10-111-1/+44
|\ \ | |/ |/| Add multipart upload for s3
| * set s3 part size to 500mbRobin Appelman2017-10-111-1/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Add tests for multipart uploadRobin Appelman2017-09-211-2/+2
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * only do multipart upload for large filesRobin Appelman2017-09-211-0/+24
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * multipart upload for s3 object storageRobin Appelman2017-09-201-5/+22
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Do not return app names multiple timesJulius Härtl2017-10-101-0/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2017-10-072-0/+2
| |
* | Merge pull request #6759 from ↵Joas Schilling2017-10-062-16/+59
|\ \ | | | | | | | | | | | | nextcloud/allow-multiple-settings-and-sections-per-app Allow multiple settings and sections per app