summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Fix check if theming defaults instance is availableMorris Jobke2018-02-271-1/+5
| | | | | | | | The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error. Fixes #8420 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8359 from nextcloud/swift-v3Morris Jobke2018-02-261-7/+27
|\ | | | | Support swift v3 authentication
| * User proper username + passRoeland Jago Douma2018-02-261-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * add support for v3 swift authRobin Appelman2018-02-261-7/+27
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #8541 from nextcloud/translate-permission-error-pageMorris Jobke2018-02-263-4/+12
|\ \ | |/ |/| Provide translated error message for permission error
| * Provide translated error message for permission errorMorris Jobke2018-02-263-4/+12
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8504 from nextcloud/bugfix/noid/well-its-not-an-arrayRoeland Jago Douma2018-02-261-1/+1
|\ \ | | | | | | Dont use $info as array when its not an array
| * | Dont use $info as array when its not an arrayJoas Schilling2018-02-221-1/+1
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8026 from ↵Joas Schilling2018-02-262-12/+18
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/allow-custom-html-in-html-emails Allow custom HTML in HTML Emails
| * | Fix existing usagesJoas Schilling2018-02-151-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow custom HTML in HTML EmailsJoas Schilling2018-02-151-11/+17
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8491 from nextcloud/strict_requestJoas Schilling2018-02-262-56/+70
|\ \ \ | | | | | | | | Make Request strict
| * | | Fix commentsRoeland Jago Douma2018-02-221-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix proper typesRoeland Jago Douma2018-02-222-3/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make Request strictRoeland Jago Douma2018-02-221-53/+59
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / | Relax what t accepts so we don't break it allRoeland Jago Douma2018-02-221-2/+6
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8476 from nextcloud/strict_l10nRoeland Jago Douma2018-02-222-25/+26
|\ \ | | | | | | Make OCP\IL10N strict
| * | Fix other testsRoeland Jago Douma2018-02-212-5/+6
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Proper closure for functionRoeland Jago Douma2018-02-211-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Make OCP\IL10N strictRoeland Jago Douma2018-02-211-19/+19
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8472 from nextcloud/strict_integritycheckRoeland Jago Douma2018-02-226-34/+44
|\ \ \ | | | | | | | | Make OC\IntegrityCheck strict
| * | | Handle strict typing in Checker and fix testsRoeland Jago Douma2018-02-211-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make OC\IntegrityCheck strictRoeland Jago Douma2018-02-216-33/+38
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8490 from nextcloud/strict_systemtagsRoeland Jago Douma2018-02-224-57/+53
|\ \ \ \ | | | | | | | | | | Make SystemTag strict
| * | | | Make SystemTag strictRoeland Jago Douma2018-02-214-57/+53
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8473 from nextcloud/strict_cmrRoeland Jago Douma2018-02-211-26/+28
|\ \ \ \ \ | |/ / / / |/| | | | Strict OCP\AppFramework\Utility\IControllerMethodReflector
| * | | | Don't try to match on falseRoeland Jago Douma2018-02-211-17/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Strict OCP\AppFramework\Utility\IControllerMethodReflectorRoeland Jago Douma2018-02-211-10/+10
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | / / Log exceptions that happen when writing the app store reply to storageJoas Schilling2018-02-211-0/+1
| |/ / |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8466 from nextcloud/strict_middlewaredipatcherRoeland Jago Douma2018-02-212-13/+11
|\ \ \ | | | | | | | | Make the middlewareDispatcher strict
| * | | Fix testsRoeland Jago Douma2018-02-212-4/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make the middlewareDispatcher strictRoeland Jago Douma2018-02-211-9/+10
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8471 from nextcloud/fix_upgradeRoeland Jago Douma2018-02-211-1/+1
|\ \ \ \ | |_|/ / |/| | | getIncompatibleApps needs a string not an array
| * | | getIncompatibleApps needs a string not an arrayRoeland Jago Douma2018-02-211-1/+1
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8468 from nextcloud/fix-unicode-avatarsRoeland Jago Douma2018-02-211-1/+1
|\ \ \ | |/ / |/| | Use mb_* string methods to extract first character for generated avatars
| * | Use mb_* string methods to extract first character for generated avatarsMorris Jobke2018-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server. See also http://php.net/manual/en/function.mb-strtoupper.php Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Make AppFramework/Http/Dispatcher strictRoeland Jago Douma2018-02-211-8/+16
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8206 from ↵blizzz2018-02-202-0/+4
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/fix-collaboration-result-size Better result handling of email search
| * | Better result handling of email searchJoas Schilling2018-02-202-0/+4
| | | | | | | | | | | | | | | | | | | | | 1. Local users should not be returned when searching for empty string 2. The limit of the response should be respected Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8336 from nextcloud/cleanup-unused-parameterRoeland Jago Douma2018-02-201-4/+0
|\ \ \ | | | | | | | | Cleanup unused parameter
| * | | Remove fromMailAddress from MailSettingsControllerMorris Jobke2018-02-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8314 from nextcloud/openstackRoeland Jago Douma2018-02-192-214/+203
|\ \ \ \ | | | | | | | | | | update openstack sdk
| * | | | adjust swift external storage to new openstack sdkRobin Appelman2018-02-192-34/+51
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | adjust swift object storage to new openstack sdkRobin Appelman2018-02-192-212/+184
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #8428 from nextcloud/fix_8189Roeland Jago Douma2018-02-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Use TTF fonts for avatar generation
| * | | | Avatar generation use ttf (for ancient compatibility)Roeland Jago Douma2018-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8424 from nextcloud/fix/update-appRoeland Jago Douma2018-02-192-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix updating an app
| * | | | Fix updating an upChristoph Wurst2018-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OC_App has been made strict recently and the updater code was not compatible to this. This adds the array to string conversion of the Nextcloud version and fixes a typo in OC_App (sstring -> string) Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Use normal header() calls instead of private method callsMorris Jobke2018-02-193-10/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8411 from nextcloud/add-strict-types-to-oc_appMorris Jobke2018-02-174-81/+77
|\ \ \ \ | | | | | | | | | | Add strict types to OC_App