summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Properly provide local memcache check to ICacheFactoryMorris Jobke2018-03-133-4/+12
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8800 from nextcloud/getstoragestats_to_controllerMorris Jobke2018-03-135-60/+82
|\ | | | | Move storagestats endpoint to proper controller
| * Move storagestats endpoint to proper controllerRoeland Jago Douma2018-03-135-60/+82
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #8781 from nextcloud/cleanup-old-federation-codeMorris Jobke2018-03-131-114/+2
|\ | | | | Remove old code to be compatible with Nextcloud 9 and before
| * Remove old code to be compatible with Nextcloud 9 and beforeMorris Jobke2018-03-121-114/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8794 from nextcloud/swift-v3-cache-tokenMorris Jobke2018-03-131-1/+6
|\ \ | | | | | | Properly cache swift v3 token
| * | Properly cache swift v3 tokenRoeland Jago Douma2018-03-121-1/+6
| | | | | | | | | | | | | | | | | | | | | The V3 token has an export function. Without this the token is effectively never cached. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8797 from ↵Morris Jobke2018-03-132-8/+12
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/inject-public-igroupmanager-instead-of-private-groupmanager Inject public IGroupManager instead of private GroupManager
| * | | Inject public IGroupManager instead of private GroupManagerDaniel Calviño Sánchez2018-03-132-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The public "IGroupManager" service returned by the dependency injection system is automatically initialized with an "OC\Group\Database" backend. However, no backend is automatically set in private "GroupManager" instances. Therefore, a private "GroupManager" instance does not work as expected when initialized through the dependency injection system. Due to that this commit reverts a previous change in which the public "IGroupManager" was replaced by a private "GroupManager" instance. That change was needed when strict types were set, as "getSubAdmin()" is not part of "IGroupManager" API, so the type had to be changed to "GroupManager". Until a better solution is found strict types are disabled again to be able to inject "IGroupManager" and also use "getSubAdmin()". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #8792 from nextcloud/cleanup-oc_responseMorris Jobke2018-03-133-194/+13
|\ \ \ \ | | | | | | | | | | Remove unused methods of OC_Response
| * | | | Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0Morris Jobke2018-03-132-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Remove unused methods of OC_ResponseMorris Jobke2018-03-123-189/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #8788 from nextcloud/cleanup-oc_apiMorris Jobke2018-03-132-392/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Remove unused methods and constants from legacy OC_API
| * | | | Remove unused methods and constants from legacy OC_APIMorris Jobke2018-03-122-392/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-1376-2/+130
| | | |
* | | | Merge pull request #8789 from nextcloud/proper-exception-loggingRoeland Jago Douma2018-03-124-17/+17
|\ \ \ \ | |_|/ / |/| | | Use proper method to log exceptions
| * | | Use proper method to log exceptionsMorris Jobke2018-03-124-17/+17
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8786 from nextcloud/remove-insert-if-not-existsMorris Jobke2018-03-126-154/+143
|\ \ \ | |/ / |/| | Use insertIfNotExist of the new interface
| * | Use insertIfNotExist of the new interfaceMorris Jobke2018-03-126-154/+143
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8787 from ↵Morris Jobke2018-03-123-44/+7
|\ \ | | | | | | | | | | | | nextcloud/remove-deprecated-and-unused-methods-of-db Remove deprecated and unsused methods of OCP\DB
| * | Remove deprecated and unsused methods of OCP\DBMorris Jobke2018-03-123-44/+7
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelperMorris Jobke2018-03-128-123/+0
|\ \ | | | | | | Remove unused and deprecated class and interface AppHelper
| * | Remove unused and deprecated class and interface AppHelperMorris Jobke2018-03-128-123/+0
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8783 from nextcloud/remove-unused-deprecated-methodsMorris Jobke2018-03-122-102/+1
|\ \ | | | | | | Remove unused and deprecated methods from OCP\Util
| * | Remove unused and deprecated methods from OCP\UtilMorris Jobke2018-03-122-102/+1
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8782 from nextcloud/properly-use-new-method-to-format-dateMorris Jobke2018-03-123-88/+3
|\ \ | |/ |/| Use proper method to format absolute timestamp
| * Use proper method to format absolute timestampMorris Jobke2018-03-123-88/+3
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8743 from nextcloud/strict_settingsRoeland Jago Douma2018-03-123-114/+56
|\ | | | | Strict settings
| * Obsolete testRoeland Jago Douma2018-03-091-23/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Make UserController strictRoeland Jago Douma2018-03-091-72/+48
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Make ChangePasswordController strictRoeland Jago Douma2018-03-091-19/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8769 from nextcloud/admin_audit_strictMorris Jobke2018-03-1212-10/+22
|\ \ | | | | | | Make admin_audit strict
| * | Make admin_audit strictRoeland Jago Douma2018-03-1012-10/+22
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-03-12288-444/+514
| | |
* | | Merge pull request #8633 from nextcloud/rakekniven-i18n-fixMorris Jobke2018-03-114-4/+11
|\ \ \ | | | | | | | | Improved translation strings
| * | | Use variable for proper translationsRoeland Jago Douma2018-03-101-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Update ThemingControllerTest.phprakekniven2018-03-101-1/+1
| | | | | | | | | | | | Fixed tests for https://github.com/nextcloud/server/pull/8633
| * | | Update wizardTabElementary.jsrakekniven2018-03-101-1/+1
| | | | | | | | | | | | | | | | Fixed grammar. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/91002422?issue=yes
| * | | Update settings.jsrakekniven2018-03-101-1/+1
| | | | | | | | | | | | | | | | Added question mark. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/120539223?issue=yes
| * | | Update ThemingController.phprakekniven2018-03-101-1/+1
| |/ / | | | | | | | | | Improved translation string. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491256?issue=yes
* / / [tx-robot] updated from transifexNextcloud bot2018-03-1118-0/+50
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-03-1028-64/+154
| |
* | Merge pull request #8731 from nextcloud/acceptance-header-testsMorris Jobke2018-03-097-10/+248
|\ \ | | | | | | Header acceptance features
| * | Header acceptance featuresJohn Molakvoæ (skjnldsv)2018-03-097-10/+248
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #8757 from nextcloud/search_controllerMorris Jobke2018-03-095-65/+56
|\ \ \ | | | | | | | | Move search to proper Controller
| * | | Update autoloaderRoeland Jago Douma2018-03-092-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Move search to proper ControllerRoeland Jago Douma2018-03-093-65/+54
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-09148-474/+276
| |/ / |/| |
* | | Merge pull request #8747 from nextcloud/bugfix/noid/apps-are-updatedRoeland Jago Douma2018-03-091-4/+4
|\ \ \ | | | | | | | | Revert wording back to updates
| * | | Revert wording back to updatesJoas Schilling2018-03-091-4/+4
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>