summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8473 from nextcloud/strict_cmrRoeland Jago Douma2018-02-212-30/+33
|\ | | | | 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-212-14/+15
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8474 from ↵Morris Jobke2018-02-211-0/+1
|\ \ | | | | | | | | | | | | nextcloud/bugfix/ciu-12/log-exceptions-that-happen-when-writing-to-storage Log exceptions that happen when writing the app store reply to storage
| * | 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 #8456 from ↵Morris Jobke2018-02-211-11/+3
|\ \ \ | |/ / |/| | | | | | | | nextcloud/bugfix/noid/phpunit-can-now-handle-directories-too Use phpunit's directory feature
| * | Use phpunit's directory featureJoas Schilling2018-02-201-11/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8466 from nextcloud/strict_middlewaredipatcherRoeland Jago Douma2018-02-215-27/+31
|\ \ \ | | | | | | | | Make the middlewareDispatcher strict
| * | | Make sure that render always returns a stringRoeland Jago Douma2018-02-211-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix testsRoeland Jago Douma2018-02-214-16/+19
| | | | | | | | | | | | | | | | 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-212-1/+2
|\ \ \ \ | |_|_|/ |/| | | getIncompatibleApps needs a string not an array
| * | | getIncompatibleApps needs a string not an arrayRoeland Jago Douma2018-02-212-1/+2
| |/ / | | | | | | | | | 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>
* | | Merge pull request #8465 from nextcloud/strict_dispatcherMorris Jobke2018-02-211-8/+16
|\ \ \ | |/ / |/| | Make AppFramework/Http/Dispatcher strict
| * | Make AppFramework/Http/Dispatcher strictRoeland Jago Douma2018-02-211-8/+16
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-02-2144-70/+250
| |
* | Merge pull request #8206 from ↵blizzz2018-02-204-3/+7
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/fix-collaboration-result-size Better result handling of email search
| * | Better result handling of email searchJoas Schilling2018-02-204-3/+7
| | | | | | | | | | | | | | | | | | | | | 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-206-49/+3
|\ \ \ | | | | | | | | Cleanup unused parameter
| * | | Remove fromMailAddress from MailSettingsControllerMorris Jobke2018-02-132-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Remove config from AutoCompleteControllerMorris Jobke2018-02-132-13/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Remove crypto and timefactory from UsersControllerMorris Jobke2018-02-132-26/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-2018-14/+158
| | | |
* | | | Merge pull request #8314 from nextcloud/openstackRoeland Jago Douma2018-02-1910-386/+362
|\ \ \ \ | | | | | | | | | | update openstack sdk
| * | | | Use a proper wait for create of the containerRoeland Jago Douma2018-02-192-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also create a test file so we know for sure it all works Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | use more precise method for waiting for swiftRobin Appelman2018-02-191-3/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix controller testRobin Appelman2018-02-193-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | adjust swift external storage to new openstack sdkRobin Appelman2018-02-194-198/+150
| | | | | | | | | | | | | | | | | | | | 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>
| * | | | switch from rackspace/php-opencloud to php-opencloud/openstackRobin Appelman2018-02-191-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #8428 from nextcloud/fix_8189Roeland Jago Douma2018-02-193-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>
| * | | | Add TTF of OpenSand-{Ligh,Semibold}Roeland Jago Douma2018-02-192-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8158 from nextcloud/s3-minioRoeland Jago Douma2018-02-191-7/+4
|\ \ \ \ \ | | | | | | | | | | | | Use a more widely available method to test s3 settings
| * | | | | Use a more widely available method to test s3 settingsRobin Appelman2018-02-081-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.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>
* | | | | | | Merge pull request #8426 from ↵Roeland Jago Douma2018-02-191-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/refactor/notification-showTempoary-unused-var Remove unused var in OC.Notification.showTemporary
| * | | | | | Remove unused var in OC.Notification.showTemporaryChristoph Wurst2018-02-191-1/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #8334 from nextcloud/lib-strict-typingRoeland Jago Douma2018-02-191-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make lib/autoloader.php strictly typed and p…
| * | | | | | Make lib/autoloader.php strictly typed and properly type hintedMorris Jobke2018-02-131-6/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #8366 from nextcloud/remove-disable-caching-headersRoeland Jago Douma2018-02-196-13/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Use normal header() calls instead of private method calls
| * | | | | Use normal header() calls instead of private method callsMorris Jobke2018-02-196-13/+16
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-02-1926-48/+102
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-02-1816-0/+16
| | | | |
* | | | | Merge pull request #8411 from nextcloud/add-strict-types-to-oc_appMorris Jobke2018-02-178-98/+81
|\ \ \ \ \ | | | | | | | | | | | | Add strict types to OC_App
| * | | | | Add remaining type hints, that were already okayMorris Jobke2018-02-171-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Always return a string in OC_App::getCurrentApp and no booleanMorris Jobke2018-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>