aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* reuse the known rootinfo in the shared cache when possibleRobin Appelman2016-11-171-1/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #2170 from nextcloud/ocs_person_to_controllerJoas Schilling2016-11-171-48/+0
|\ | | | | OCS person to controller
| * Move OC\OCS\Person to OCSControllerRoeland Jago Douma2016-11-161-48/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2164 from nextcloud/token-login-wanringLukas Reschke2016-11-171-1/+1
|\ \ | | | | | | fix warning with token login
| * | fix warning with token loginRobin Appelman2016-11-161-1/+1
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-11-174-0/+94
| |
* | Merge pull request #2122 from nextcloud/downstream-26520Morris Jobke2016-11-171-2/+5
|\ \ | | | | | | Hack to prevent warning for read-only wrapper in public links
| * | only use one kind of hack for the storage wrappers of the sharing codeMorris Jobke2016-11-161-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Hack to prevent warning for read-only wrapper in public linksVincent Petry2016-11-161-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | Storage wrappers should normally always be registered inside a presetup hook. However in the public link scenario this is not possible and there is currently no good alternative with the current architecture. Instead of logging a warning every time, this fix prevents the warning to be shown but also adds a FIXME in the code for the future. This is ok because this app is already using private/internal APIs at the moment and should be reworked properly in the future.
* | Use getvalue to fetch the valueRoeland Jago Douma2016-11-161-5/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Don't update value if it is already set to the same valueMorris Jobke2016-11-161-1/+4
|/ | | | | | | | * this PR makes sure to warm up the cache for that user * then the logic within the "if is in cache" code can be used to reduce needed queries * inspired by @andreas-p - https://github.com/nextcloud/server/pull/2128 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #719 from nextcloud/lockdownRoeland Jago Douma2016-11-1614-22/+550
|\ | | | | Allow restricting of app password permissions
| * Add test for setting up fake fsRobin Appelman2016-11-161-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Adds TokenProvider and Mapper testsRoeland Jago Douma2016-11-161-7/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * update autoloaderRobin Appelman2016-11-162-0/+8
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * explicit typesRobin Appelman2016-11-161-5/+11
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * cast to intRobin Appelman2016-11-161-2/+2
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * phpdocRobin Appelman2016-11-165-22/+22
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * fix setscopeRobin Appelman2016-11-161-2/+2
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * allow configuring filesystem accessRobin Appelman2016-11-166-8/+72
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * app password scope wipRobin Appelman2016-11-163-2/+19
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * read lockdown scope from tokenRobin Appelman2016-11-165-10/+38
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * basic lockdown logicRobin Appelman2016-11-169-16/+423
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* | Merge pull request #2150 from nextcloud/move_buttons_to_bottomRoeland Jago Douma2016-11-162-0/+64
|\ \ | | | | | | Move social buttons to bottom on admin page
| * | Move social buttons to bottom on admin pageRoeland Jago Douma2016-11-162-0/+64
| | | | | | | | | | | | | | | | | | For #2134 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Add autoloader path for newly installed apps tooMorris Jobke2016-11-161-0/+2
| |/ |/| | | | | | | | | | | * followup to https://github.com/nextcloud/server/pull/2148 * problem noticed in https://github.com/nextcloud/files_antivirus/pull/11 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #2148 from nextcloud/add_autoloader_before_enablingRoeland Jago Douma2016-11-161-0/+2
|\ \ | | | | | | Add autoloader before enabling apps
| * | Add autoloader before enabling appsRoeland Jago Douma2016-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | Else apps that require already autoloading in the installer (files_antivius) die hard! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Update the since version to 11.0.0Joas Schilling2016-11-1610-86/+86
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Fix integration testsJoas Schilling2016-11-162-11/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Make sure they are always arraysJoas Schilling2016-11-161-6/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Fix activity manager testsJoas Schilling2016-11-163-15/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow combining eventsJoas Schilling2016-11-162-0/+30
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow to register ProvidersJoas Schilling2016-11-166-6/+104
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Add ROS and icon support to the eventsJoas Schilling2016-11-163-24/+278
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Validate the input into Event alreadyJoas Schilling2016-11-162-91/+215
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow to register settings/types via info.xmlJoas Schilling2016-11-166-31/+338
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow to register activity filters via info.xmlJoas Schilling2016-11-167-76/+378
| |/ |/| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2145 from nextcloud/docs_to_comMorris Jobke2016-11-161-1/+1
|\ \ | | | | | | docs are on nc.com
| * | docs are on nc.comRoeland Jago Douma2016-11-151-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2144 from nextcloud/fix_1303Morris Jobke2016-11-152-33/+29
|\ \ \ | |_|/ |/| | Do not cache version info in the session
| * | Fix testsRoeland Jago Douma2016-11-152-16/+9
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not cache version info in the sessionsRoeland Jago Douma2016-11-151-29/+32
| |/ | | | | | | | | | | | | | | | | If the session is cleared and closed for whatever reason the loadVersion will write to the session anyways. This will lead to an exception. This should fix #1303 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-againRoeland Jago Douma2016-11-151-0/+7
|\ \ | | | | | | Add a magic wrapper to allow phpunit4 to run the code again
| * | Add a magic wrapper from hell to allow phpunit4 to run the code againJoas Schilling2016-11-151-0/+7
| |/ | | | | | | | | | | | | Remove this once phpunit 5 is the lowest supported version, by reverting: https://github.com/nextcloud/server/pull/2137 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | @since 9.2.0 to @since 11.0.0Roeland Jago Douma2016-11-1533-91/+91
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Adjust previous fallbacksLukas Reschke2016-11-151-4/+0
|/ | | | | | 11.0 is 11 and not 9.2 anymore Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2117 from ↵Roeland Jago Douma2016-11-141-0/+3
|\ | | | | | | | | nextcloud/master-add-bruteforce-check-to-person-endpoint Add bruteforce checker to Person.php
| * Add bruteforce checker to Person.phpLukas Reschke2016-11-141-0/+3
| | | | | | | | | | | | Also check for attempts on this endpoint Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2114 from nextcloud/downstream-26498Roeland Jago Douma2016-11-141-1/+6
|\ \ | | | | | | make object prefix configurable