summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove wrong entry in admin_settings that causes 500Morris Jobke2017-11-201-0/+5
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-11-202-2/+2
|
* If there is no internet connection don't try to contact appstoreRoeland Jago Douma2017-11-171-1/+2
| | | | | | Fixes #7119 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* only create the file cache entry after the empty file was created ↵Bjoern Schiessle2017-11-171-14/+13
| | | | | | successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #6840 from nextcloud/feature/5282/calendar_apiMorris Jobke2017-11-167-0/+357
|\ | | | | Calendar API for apps
| * update autoloader to included added classes and interfaceGeorg Ehrke2017-11-092-0/+6
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * implement CalendarManagerGeorg Ehrke2017-11-093-0/+159
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * Public interfaces for calendar APIGeorg Ehrke2017-11-092-0/+192
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2017-11-162-2/+2
| |
* | Merge pull request #7169 from nextcloud/fix-user-searchMorris Jobke2017-11-141-0/+2
|\ \ | | | | | | Fix search in user managent when no group is selected
| * | Fix search in user managent when no group is selectedMorris Jobke2017-11-141-0/+2
| | | | | | | | | | | | | | | | | | * also allows to search by displayname Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7172 from ↵Morris Jobke2017-11-141-1/+12
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/improve-error-handling-on-preview-cleanup check if the user still exists before we try to cleanup the previews
| * | | check if the user still exists before we try to cleanup the previewsBjoern Schiessle2017-11-141-1/+12
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #7113 from nextcloud/s3-download-stream-fixBjörn Schießle2017-11-142-3/+9
|\ \ \ \ | |/ / / |/| | | Fix s3 download and touch
| * | | Use non empty files for object store touchRobin Appelman2017-11-081-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Fix contructing headers for s3 downloadRobin Appelman2017-11-081-1/+7
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #7166 from nextcloud/enhancement/crash-report-contextMorris Jobke2017-11-144-5/+9
|\ \ \ \ | |_|/ / |/| | | Pass the exception context to the crash reporter
| * | | add proper type hintingMorris Jobke2017-11-141-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Pass the exception context to the crash reporterChristoph Wurst2017-11-144-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow better reports as often the app id is passed as context. While this is not used right now, I'd like to have this for NC13 as adding it later will break the interface for existing apps Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpathMorris Jobke2017-11-142-0/+12
|\ \ \ \ | |/ / / |/| | | {J,CS}SResourceLocator: account for symlinks in app path
| * | | JSResourceLocator: re-use $app_pathKyle Fazzari2017-11-121-7/+9
| | | | | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | JSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-071-3/+8
| | | | | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | CSSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if the app path includes a symlink, the calculated webDir will be incorrect when generating CSS and URLs will be pointing to the wrong place, breaking CSS. Use realpath when retrieving app path, and these issues go away. Fix #6028 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | | | Add a mechanism to register crach reportersChristoph Wurst2017-11-147-5/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a crash reporter registry, which is meant for third party apps to hook into the error logging/reporting chain. This way, external tools like Sentry can be used to track and aggregate system crashes. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-122-8/+8
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-1112-36/+2606
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-1012-0/+2588
| |_|/ |/| |
* | | Merge pull request #7117 from nextcloud/fix-welcome-stringMorris Jobke2017-11-091-1/+1
|\ \ \ | | | | | | | | Fix welcome text for better grammar in themed instances
| * | | Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7014 from nextcloud/rename-locksMorris Jobke2017-11-091-83/+86
|\ \ \ \ | | | | | | | | | | Unlock files even if an exception occurs while renaming
| * | | | Unlock files even if an exception occurskorelstar2017-11-031-83/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
* | | | | Merge pull request #7027 from nextcloud/Rello-patch-1Morris Jobke2017-11-091-5/+22
|\ \ \ \ \ | |_|/ / / |/| | | | Rello patch 1
| * | | | Add the return which is being usedJoas Schilling2017-10-311-6/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Mapping of m3u, m3u8, pls to audio streamsRello2017-10-311-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-Off-By: Rello <Rello@users.noreply.github.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0948-46/+524
| | | | |
* | | | | Merge pull request #6220 from nextcloud/cached-mount-info-filepathLukas Reschke2017-11-096-3/+111
|\ \ \ \ \ | | | | | | | | | | | | Allow getting the filepath when getting cached mounts by fileid
| * | | | | 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 #7109 from nextcloud/fix_6898Morris Jobke2017-11-081-0/+4
|\ \ \ \ \ | | | | | | | | | | | | If for some reason the json can't be decoded it is not cached
| * | | | | If for some reason the json can't be decoded it is not cachedRoeland Jago Douma2017-11-081-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Should fix #6898 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #6788 from staabm/masterLukas Reschke2017-11-082-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Prevent XSS in links which open a new browser window
| * | | | | Prevent XSS in links which open a new browser windowMarkus Staab2017-10-192-2/+2
| | | | | |
* | | | | | Revert "Only allow colons in db host for IPv6 addresses"Morris Jobke2017-11-081-16/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1287d6ddb303fc9b088b8a6837490042a1540dc6. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6552 from nextcloud/notifications-add-highlight-definitionMorris Jobke2017-11-071-0/+25
|\ \ \ \ \ | | | | | | | | | | | | Notifications: Add highlight type definition
| * | | | | Notifications: Add highlight type definitionJulius Härtl2017-10-031-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #6988 from starypatyk/stable12-mount-cache-performanceMorris Jobke2017-11-071-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve performance of UserMountCache with external storage folders
| * | | | | | Improve performance of UserMountCache with external storage foldersDariusz Olszewski2017-11-011-1/+5
| | | | | | |
* | | | | | | Merge pull request #7075 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-11-072-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused variables
| * | | | | | | Remove unused variablesMorris Jobke2017-11-062-2/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Run updated license header updaterMorris Jobke2017-11-077-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #7020 from Fiech/masterMorris Jobke2017-11-071-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extended list of sensitive configuration values (2)