summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2Roeland Jago Douma2017-08-01145-317/+402
|\ | | | | Phan fixes
| * Fix testsRoeland Jago Douma2017-08-013-4/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix sabre testRoeland Jago Douma2017-08-011-3/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix OCS ExceptionRoeland Jago Douma2017-08-011-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix L10N::tRoeland Jago Douma2017-08-019-20/+20
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [files_external] Fix phpdocRoeland Jago Douma2017-08-013-3/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [DAV] Fix URLUtil::splitPath usageRoeland Jago Douma2017-08-0114-23/+23
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [DAV][CalDAV] FixesRoeland Jago Douma2017-08-015-14/+15
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix CommentsRoeland Jago Douma2017-08-015-13/+12
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [files_external] fix commandsRoeland Jago Douma2017-08-016-13/+13
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [files_external] Fix phpdocRoeland Jago Douma2017-08-012-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Some more invalid PHPDocs in legacy classesLukas Reschke2017-08-018-11/+21
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Function also accepts intsLukas Reschke2017-08-012-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Properly name variableLukas Reschke2017-08-011-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * null is a valid parameterLukas Reschke2017-08-011-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Replace wrong PHPDocsLukas Reschke2017-08-0142-113/+136
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Properly suppressLukas Reschke2017-08-011-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix MigrationSchemaChecker and CryptoWrapperLukas Reschke2017-08-012-3/+11
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix template functionsLukas Reschke2017-08-012-3/+22
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix lib/public/User.phpLukas Reschke2017-08-011-2/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix settings/Controller/Lukas Reschke2017-08-014-20/+25
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * AppData is no longer internalRoeland Jago Douma2017-08-014-4/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix OCSControllerRoeland Jago Douma2017-08-011-3/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix ContactsMenuControllerRoeland Jago Douma2017-08-011-4/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix AvatarControllerRoeland Jago Douma2017-08-011-2/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add |null to PHPDocLukas Reschke2017-08-0111-11/+11
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix \OCP\UtilLukas Reschke2017-08-012-4/+6
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Suppress deprecated function in \OCP\JSONLukas Reschke2017-08-013-5/+16
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Add proper PHPDocLukas Reschke2017-08-013-4/+6
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Take IUser instead of UserLukas Reschke2017-08-014-12/+13
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Return '0' instead of nullLukas Reschke2017-08-011-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Stricter phan config fixesLukas Reschke2017-08-019-22/+22
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-08-0134-42/+62
|
* Merge pull request #5890 from nextcloud/fix-403-and-404-redirectRoeland Jago Douma2017-07-314-30/+10
|\ | | | | Fix 403 and 404 redirect
| * Fix 403 and 404 redirectMorris Jobke2017-07-264-30/+10
| | | | | | | | | | | | | | | | * Nextcloud is not properly loaded in the standalone version (especially the theming) * it is already not listed anymore in the Nginx config (see nextcloud/documentation#392) * the index.php-free version doesn't support this Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5910 from benediktg/test-php-7.1Roeland Jago Douma2017-07-311-0/+12
|\ \ | | | | | | Also test PHP 7.0 with PostgreSQL
| * | Drop PHP 7.1 testBenedikt Geissler2017-07-311-12/+0
| | | | | | | | | | | | Signed-off-by: Benedikt Geissler <benedikt@g5r.eu>
| * | Also test PHP 7.0 and 7.1 with PostgreSQLBenedikt Geissler2017-07-311-0/+24
|/ / | | | | | | Signed-off-by: Benedikt Geissler <benedikt@g5r.eu>
* | Merge pull request #5905 from nextcloud/ocp-configMorris Jobke2017-07-317-10/+12
|\ \ | | | | | | Use IConfig instead of static OCP\Config
| * | Use IConfig instead of static OCP\ConfigMorris Jobke2017-07-277-10/+12
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #5908 from nextcloud/add-css-iconRoeland Jago Douma2017-07-311-0/+4
|\ \ \ | | | | | | | | Add css class for toogle preview icon
| * | | Add css class for toogle preview iconMorris Jobke2017-07-271-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5913 from nextcloud/fix-anchor-nameRoeland Jago Douma2017-07-311-1/+1
|\ \ \ \ | | | | | | | | | | Fix anchor name for federated sharing settings
| * | | | Fix anchor name for federated sharing settingsMorris Jobke2017-07-281-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5922 from nextcloud/master-add-brackets-on-concat-methodRoeland Jago Douma2017-07-312-2/+2
|\ \ \ \ | | | | | | | | | | [master]Add brackets around concat statements so comparing the result works as intended
| * | | | Add brackets around concat statements so comparing the result works as intendedJoas Schilling2017-07-282-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-316-0/+38
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-3030-32/+402
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-2932-24/+268
|/ / / /
* | | | Merge pull request #5915 from nextcloud/update-droneMorris Jobke2017-07-281-34/+34
|\ \ \ \ | | | | | | | | | | Update drone