summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disable vendor detection when upgrading from 11.0.xMorris Jobke2018-01-201-10/+2
| | | | | | Upgrade from 11 to 14 is not supported anyways. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7955 from nextcloud/remove-app-disable-upgradeJulius Härtl2018-01-205-57/+1
|\ | | | | Remove not needed 3rdparty app disabling during upgrade for PHP 5.x
| * Remove not needed 3rdparty app disabling during upgrade for PHP 5.xMorris Jobke2018-01-195-57/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-01-202-0/+4
| |
* | Merge pull request #7961 from nextcloud/smb-2.0.4Roeland Jago Douma2018-01-1911-77/+98
|\ \ | | | | | | update icewind/smb to 2.0.4
| * | update icewind/smb to 2.0.4Robin Appelman2018-01-1911-77/+98
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #7953 from nextcloud/theming-background-highresMorris Jobke2018-01-191-6/+4
|\ \ \ | |_|/ |/| | Theming: adjust background image resizing
| * | Theming: adjust background image resizingJulius Härtl2018-01-191-6/+4
|/ / | | | | | | | | | | | | | | Support high resolution login images by resizing only images that are wider than 4096px fixes #7459 Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-01-19108-106/+108
| |
* | Merge pull request #7941 from nextcloud/fix-7934Roeland Jago Douma2018-01-181-3/+0
|\ \ | | | | | | remove hardcoded sharepoint icon path
| * | remove hardcoded sharepoint icon pathArthur Schiwon2018-01-181-3/+0
| | | | | | | | | | | | | | | | | | it does not exist and if it would, it was not themable Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7939 from ↵Morris Jobke2018-01-181-1/+1
|\ \ \ | |/ / |/| | | | | | | | nextcloud/do-not-show-non-installed-warning-on-install Do not show "Not installed warning" during occ install
| * | Do not show "Not installed warning" during occ installMorris Jobke2018-01-181-1/+1
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7911 from nextcloud/improve-oc_imageJulius Härtl2018-01-187-90/+133
|\ \ | | | | | | Improve OC_Image code to not guess the type of input
| * | Improve OC_Image code to not guess the type of input, but actually request ↵Morris Jobke2018-01-187-90/+133
| | | | | | | | | | | | | | | | | | | | | | | | the specific methods to be called Followup to #7836 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7923 from nextcloud/files_external_ocscontrollerMorris Jobke2018-01-182-31/+50
|\ \ \ | | | | | | | | [files_external] OCS endpoint to proper OCSController
| * | | [files_external] OCS endpoint to proper OCSControllerRoeland Jago Douma2018-01-182-31/+50
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #7924 from nextcloud/dep_iappconfigMorris Jobke2018-01-1815-116/+51
|\ \ \ | | | | | | | | Remove deprecated function from IAppConfig
| * | | Remove IAppConfig::setValueRoeland Jago Douma2018-01-177-32/+18
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Remove IAppConfig::getValueRoeland Jago Douma2018-01-1713-46/+31
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Simple IAppConfig deprecationsRoeland Jago Douma2018-01-173-39/+3
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #7930 from nextcloud/update-notification-strictMorris Jobke2018-01-1814-76/+95
|\ \ \ | | | | | | | | Make Update notficiations strict and fix all inspections
| * | | Make Update notficiations strict and fix all inspectionsJoas Schilling2018-01-1814-76/+95
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #7863 from nextcloud/update-notifications-plusplusMorris Jobke2018-01-1812-341/+356
|\ \ \ | | | | | | | | Update notifications ++
| * | | Split controller and settingsJoas Schilling2018-01-167-209/+249
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Refactor all the logic from app.php to Application classJoas Schilling2018-01-153-43/+63
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Automatic DI for Controllers also worksJoas Schilling2018-01-154-78/+48
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Improve ResetTokenBackgroundJob and unit testJoas Schilling2018-01-152-30/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Automatic DI is implemented since 11 * Correctly type hint parameters * Optimise the tests Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-1814-0/+16
| |/ / |/| |
* | | Merge pull request #7914 from nextcloud/fix-7254Roeland Jago Douma2018-01-175-6/+74
|\ \ \ | | | | | | | | format self-mentions, but don't offer them
| * | | add types to php docArthur Schiwon2018-01-171-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | do not offer the handle of the current user for auto completionArthur Schiwon2018-01-173-0/+67
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | comments should compile mentions also if done by authorArthur Schiwon2018-01-172-6/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | it is used by clients for formatting reasons, there is no reason not format the author if her handle is included in the comment body. It is unrelated to sending out notifications. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7909 from nextcloud/fix-migration-type-hintsMorris Jobke2018-01-1724-98/+176
|\ \ \ | | | | | | | | Fix the type hints of migrations and correctly inject the wrapped sch…
| * | | Fix the type hints of migrations and correctly inject the wrapped schema ↵Joas Schilling2018-01-1724-98/+176
| | | | | | | | | | | | | | | | | | | | | | | | into migrations Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #7847 from nextcloud/avatarmanager_strictRoeland Jago Douma2018-01-176-25/+27
|\ \ \ \ | | | | | | | | | | Fixes for avatarmanager
| * | | | Fix avatarHomeRoeland Jago Douma2018-01-162-11/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Use \OC\User\Manager internally in the avatarmanagerRoeland Jago Douma2018-01-143-9/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Made AvatarManager string and add return typesRoeland Jago Douma2018-01-142-5/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #7912 from ↵Roeland Jago Douma2018-01-171-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/bugfix/noid/correctly-drop-owncloud-migrations-table Correctly drop the ownCloud migrations table
| * | | | Correctly drop the ownCloud migrations tableJoas Schilling2018-01-171-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #7813 from nextcloud/getHeader-should-only-return-stringMorris Jobke2018-01-1710-16/+38
|\ \ \ \ | | | | | | | | | | Request->getHeader() should always return a string
| * | | | Request->getHeader() should always return a stringMorris Jobke2018-01-1710-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPDoc (of the public API) says that this method returns string but it also returns null, which is not allowed in some method calls. This fixes that behaviour and returns an empty string and fixes all code paths that explicitly checked for null to be still compliant. Found while enabling the strict_typing for lib/private for the PHP7+ migration. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7836 from nextcloud/image-type-hintingMorris Jobke2018-01-174-10/+22
|\ \ \ \ \ | |_|/ / / |/| | | | Fix float/integer handling in image API
| * | | | Fix float/integer handling in image APIMorris Jobke2018-01-174-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * IImage::crop/preciseResize now have type hinting for integers * found while testing strict typing for PHP 7+ Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7899 from nextcloud/strict_discserviceRoeland Jago Douma2018-01-172-11/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Strict DiscoveryService
| * | | | Add extra check so we don't error out on typeRoeland Jago Douma2018-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | json_decode can return false if we have invalid data. In that case just assume there was nothing cached Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Strict DiscoveryServiceRoeland Jago Douma2018-01-162-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Made strict * Type hints * Return types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #7897 from nextcloud/strict_lockingprovidersMorris Jobke2018-01-177-39/+45
|\ \ \ \ \ | | | | | | | | | | | | Made locking providers strict
| * | | | | Made locking providers strictRoeland Jago Douma2018-01-167-39/+45
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added typehints * Added return types * Made strict Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>