summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adjust integration test to Nextcloud brandingLukas Reschke2016-12-191-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix error when $view is null when being passed into some pluginsThomas Müller2016-12-192-24/+27
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix "Call to a member function getUID() on null"Thomas Müller2016-12-191-0/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* No challenge within federated authThomas Müller2016-12-191-0/+8
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Allow registration of federated authThomas Müller2016-12-191-4/+3
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Register only one dav auth backendThomas Citharel2016-12-191-4/+4
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add test for duplicate 401 headers on DAVVincent Petry2016-12-192-0/+40
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2752 from ↵Lukas Reschke2016-12-191-3/+3
|\ | | | | | | | | nextcloud/issue-2675-dont-allow-firefox-to-store-the-space Use a form so firefox doesn't try to save the space as a password
| * Use a form so firefox doesn't try to save the space as a passwordJoas Schilling2016-12-191-3/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2754 from nextcloud/activities-manager-publish-exceptionRobin Appelman2016-12-191-0/+1
|\ \ | | | | | | Activities IManager throws an BadMethodCallException
| * | Activities IManager throws an BadMethodCallExceptionChristoph Wurst2016-12-191-0/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #2689 from andreas-p/fix-remote-conflictLukas Reschke2016-12-191-1/+12
|\ \ \ | |/ / |/| | Fix showConflict
| * | Fix showConflictpflug2016-12-191-1/+12
| | | | | | | | | | | | | | | | | | | | | use getFullFileName to show conflicting file add original.directory to make fileExists happy Signed-off-by: Andreas Pflug <dev@admin4.org>
* | | Merge pull request #2727 from nextcloud/fix-colon-issueRoeland Jago Douma2016-12-193-0/+25
|\ \ \ | |_|/ |/| | [downstream] Fix colon issue
| * | Update third-party ref for new sabre/uri versionLukas Reschke2016-12-171-0/+0
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add integration test for creating folder with colonVincent Petry2016-12-162-0/+25
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2721 from nextcloud/ocs-die-on-exceptionRoeland Jago Douma2016-12-191-1/+3
|\ \ \ | | | | | | | | [downstream] Die in OCS v1.php on exception
| * | | Die in OCS v1.php on exceptionVincent Petry2016-12-161-1/+3
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2723 from nextcloud/integrity-exit-codeRoeland Jago Douma2016-12-192-0/+6
|\ \ \ | | | | | | | | [downstream] Return 1 if integrity check is failed. Fixes #22806
| * | | Return 1 if integrity check is failed. Fixes #22806Victor Dubiniuk2016-12-162-0/+6
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2726 from nextcloud/check-all-channelsChristoph Wurst2016-12-181-7/+3
|\ \ \ | | | | | | | | [downstream] Consider all channel except blank and git to be signed
| * | | Consider all channel except blank and git to be signedVictor Dubiniuk2016-12-161-7/+3
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2735 from nextcloud/fix-settingsmenuChristoph Wurst2016-12-181-4/+3
|\ \ \ | | | | | | | | Adjust shadows and fix positioning in header menus
| * | | Adjust shadows and fix positioningJulius Haertl2016-12-171-4/+3
| |/ / | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2725 from nextcloud/memcached-connect-onceRoeland Jago Douma2016-12-171-10/+11
|\ \ \ | | | | | | | | [downstream] Set options, then add servers
| * | | Set options, then add serversVictor Dubiniuk2016-12-161-10/+11
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2722 from nextcloud/failed-to-create-share-fixRoeland Jago Douma2016-12-171-1/+1
|\ \ \ | | | | | | | | [downstream] commit transaction after select query
| * | | commit transaction after select queryphisch2016-12-161-1/+1
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2720 from nextcloud/fix-25692Roeland Jago Douma2016-12-171-1/+3
|\ \ \ | |/ / |/| | [downstream] Do not validate return code is set is successful
| * | Do not validate return code is set is successfulVictor Dubiniuk2016-12-161-1/+3
|/ / | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgradeLukas Reschke2016-12-168-25/+159
|\ \ | | | | | | Clear appstore cache on version upgrade
| * | Clear appstore cache on version upgradeRoeland Jago Douma2016-12-158-25/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add version to cached json * Compare version * Updated calls * Updated tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2504 from nextcloud/downstream-ldap-15Roeland Jago Douma2016-12-161-22/+122
|\ \ \ | | | | | | | | Downstream LDAP Range Support
| * | | adjust: sanitizeDN resides in HelperArthur Schiwon2016-12-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Extract lowercase conversion out of the loopJuan Pablo Villafáñez2016-12-051-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | range support for LDAP read operationsArthur Schiwon2016-12-051-22/+121
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #2550 from nextcloud/smb-notify-renameLukas Reschke2016-12-161-3/+5
|\ \ \ \ | | | | | | | | | | Fix order of parameters when getting notified of smb renames
| * | | | Fix order of parameters when getting notified of smb renamesRobin Appelman2016-12-071-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #2714 from amittel/patch-1Lukas Reschke2016-12-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Changed anchor
| * | | | | Changed anchoramittel2016-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from `avatar` to `personal-settings` fixes #2711
* | | | | | Merge pull request #1678 from nextcloud/smb-stat-rootLukas Reschke2016-12-161-2/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix mtimes for share root
| * | | | | | Fix mtimes for share rootRobin Appelman2016-10-111-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #2398 from nextcloud/fix-2368Lukas Reschke2016-12-162-65/+157
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | flicker-free permission change in share dialog
| * | | | | | | fix rendering for mail sharesArthur Schiwon2016-12-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | disable checkboxes during save op to avoid race conditionsArthur Schiwon2016-12-082-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | fix some coding style and stricter comparisons, makes scrutinizer happierArthur Schiwon2016-12-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | also handle can-edit changeArthur Schiwon2016-12-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | flicker-free permission change in share dialogArthur Schiwon2016-12-082-63/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activityLukas Reschke2016-12-169-11/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove leading slash from sharing activity
| * | | | | | | | Remove leading slash from sharing activityJoas Schilling2016-12-159-11/+13
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>