summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | | | | | | Merge pull request #2715 from nextcloud/fix_dav_toto_testsRoeland Jago Douma2016-12-161-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix TodoTest
| * | | | | | | Fix TodoTestRoeland Jago Douma2016-12-161-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #2625 from nextcloud/fix-todo-filterRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix the Todos filter
| * | | | | | | Fix the Todos filterJoas Schilling2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #2681 from nextcloud/changes-to-changelogRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | let's add a date :D
| * | | | | | | let's add a date :DJos Poortvliet2016-12-151-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #2698 from ↵Lukas Reschke2016-12-152-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dont-disable-apps-on-update-if-at-least-php7 Don't disable apps on update if PHP >= 7.0.0
| * | | | | | | Don't disable apps on update if PHP >= 7.0.0Lukas Reschke2016-12-152-1/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates. This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #2673 from nextcloud/shared-scanner-unmaskedLukas Reschke2016-12-154-3/+57
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | use unmasked permissions in shared scanner
| * | | | | | Add integration tests for uploading files to a permission limited shareRobin Appelman2016-12-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | use unmasked permissions in shared scannerRobin Appelman2016-12-143-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #2670 from ↵Roeland Jago Douma2016-12-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-2646-dont-connet-to-database-before-creating-it Do not connect to database before creating it
| * | | | | | | Do not connect to database before creating itJoas Schilling2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #2674 from nextcloud/lookup-server-connector-12Morris Jobke2016-12-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | mark nc12 as supported for the lookup_server_connector
| * | | | | | | | mark nc12 as supporterRobin Appelman2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #2665 from nextcloud/remove-db-class-and-interfaceRoeland Jago Douma2016-12-1410-417/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove IDb interface which was deprecated for 3 years already
| * | | | | | | | | Remove IDb interface which was deprecated for 3 years alreadyJoas Schilling2016-12-1410-417/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | Merge pull request #2671 from ↵Roeland Jago Douma2016-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-2661-reduce-log-level-on-database-user-creation Only log as info when we can not create a new DB user
| * | | | | | | | | | Only log as info when we can not create a new DB userJoas Schilling2016-12-141-1/+1
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | Merge pull request #2677 from nextcloud/fix-avatars-in-mailRoeland Jago Douma2016-12-144-2/+196
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Don't set Content-Disposition header if one already exists
| * | | | | | | | | Don't set Content-Disposition header if one already existsLukas Reschke2016-12-144-2/+196
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients. Fixes https://github.com/nextcloud/server/issues/1992 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | | Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressionsJoas Schilling2016-12-141-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Safari CSPv3 support is sub-par
| * | | | | | | | Safari CSPv3 support is sub-parLukas Reschke2016-12-141-2/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 10.0.1 CSPv3 is broken in Safari if it doesn't run from a local IP. Awesome. => Let's remove this for Safari and keep chrome and Firefox in the whitelist. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | Merge pull request #2654 from nextcloud/increase-master-versionRoeland Jago Douma2016-12-1423-49/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update app versions and requirements
| * | | | | | | | Use the mocked config versionJoas Schilling2016-12-142-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | Increase server versionJoas Schilling2016-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>