summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Move all DB tests to top, because they are long runningMorris Jobke2017-07-281-27/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Update all drone images to latest versionMorris Jobke2017-07-281-7/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-2820-4/+22
| | | |
* | | | Merge pull request #5852 from nextcloud/preview_trash_cleanupMorris Jobke2017-07-271-6/+23
|\ \ \ \ | |/ / / |/| | | Preview trash cleanup
| * | | Delete trash using node API to trigger preview deletionRoeland Jago Douma2017-07-241-6/+23
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5644 from nextcloud/add-occ-app-installMorris Jobke2017-07-274-1/+81
|\ \ \ \ | | | | | | | | | | add occ app:install command
| * | | | update autoloadersualko2017-07-262-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: sualko <klaus@jsxc.org>
| * | | | add namespacesualko2017-07-261-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: sualko <klaus@jsxc.org>
| * | | | add occ app:install commandsualko2017-07-262-1/+77
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Klaus Herberth <klaus@jsxc.org>
* | | | | Merge pull request #5895 from nextcloud/fix-password-changeMorris Jobke2017-07-271-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix show password button for password change
| * | | | Fix show password button for password changeMorris Jobke2017-07-261-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * fix the show password button on the personal page * before: if the password change failed the show password icon was not shown again * after: show password icon is visible Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-2716-132/+332
| | | |
* | | | Merge pull request #5614 from nextcloud/fix-enabling-external-storage-via-webMorris Jobke2017-07-261-15/+1
|\ \ \ \ | | | | | | | | | | Allow to enable the external storage app via the web ui
| * | | | Allow to enable the external storage app via the web uiJoas Schilling2017-07-261-15/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5888 from nextcloud/overlay-on-show-passwordLukas Reschke2017-07-261-1/+1
|\ \ \ \ | | | | | | | | | | This fix the overlay of the complexity bar
| * | | | This fix the overlay of the complexity barMaxence Lange2017-07-261-1/+1
| |/ / / | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | Merge pull request #5874 from nextcloud/edu-editionMorris Jobke2017-07-266-0/+99
|\ \ \ \ | |/ / / |/| | | Add new bundle
| * | | Add new bundleLukas Reschke2017-07-266-0/+99
| |/ / | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #5871 from nextcloud/drone-postgresMorris Jobke2017-07-261-4/+4
|\ \ \ | |/ / |/| | Drone postgres
| * | Enable postgres on drone againMorris Jobke2017-07-251-4/+4
| | | | | | | | | | | | | | | | | | * use proper password Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-2626-84/+210
| | |
* | | Merge pull request #5864 from nextcloud/legacy_userLukas Reschke2017-07-2511-101/+10
|\ \ \ | | | | | | | | Remove legacy OC_User_Backend and OC_User_Interface
| * | | Fix commentsMorris Jobke2017-07-255-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Remove legacy OC_User_Backend and OC_User_InterfaceRoeland Jago Douma2017-07-246-96/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5836 from nextcloud/preview_updateLukas Reschke2017-07-251-1/+7
|\ \ \ \ | | |_|/ | |/| | Empty search no longer works
| * | | Empty search no longer worksRoeland Jago Douma2017-07-241-1/+7
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #5772 from nextcloud/migrations-installLukas Reschke2017-07-2519-2379/+1193
|\ \ \ \ | | | | | | | | | | Install nextcloud via migrations instead of the db_structure.xml
| * | | | Trigger update to run the migrationJoas Schilling2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>