summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1678 from nextcloud/smb-stat-rootLukas Reschke2016-12-161-2/+44
|\
| * Fix mtimes for share rootRobin Appelman2016-10-111-2/+44
* | Merge pull request #2398 from nextcloud/fix-2368Lukas Reschke2016-12-162-65/+157
|\ \
| * | fix rendering for mail sharesArthur Schiwon2016-12-081-2/+5
| * | disable checkboxes during save op to avoid race conditionsArthur Schiwon2016-12-082-2/+17
| * | fix some coding style and stricter comparisons, makes scrutinizer happierArthur Schiwon2016-12-082-4/+4
| * | also handle can-edit changeArthur Schiwon2016-12-081-0/+5
| * | flicker-free permission change in share dialogArthur Schiwon2016-12-082-63/+132
* | | Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activityLukas Reschke2016-12-169-11/+13
|\ \ \
| * | | Remove leading slash from sharing activityJoas Schilling2016-12-159-11/+13
* | | | Merge pull request #2715 from nextcloud/fix_dav_toto_testsRoeland Jago Douma2016-12-161-3/+3
|\ \ \ \
| * | | | Fix TodoTestRoeland Jago Douma2016-12-161-3/+3
|/ / / /
* | | | Merge pull request #2625 from nextcloud/fix-todo-filterRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \
| * | | | Fix the Todos filterJoas Schilling2016-12-121-1/+1
* | | | | Merge pull request #2681 from nextcloud/changes-to-changelogRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \ \
| * | | | | let's add a date :DJos Poortvliet2016-12-151-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-lea...Lukas Reschke2016-12-152-1/+7
|\ \ \ \ \
| * | | | | Don't disable apps on update if PHP >= 7.0.0Lukas Reschke2016-12-152-1/+7
| |/ / / /
* | | | | Merge pull request #2673 from nextcloud/shared-scanner-unmaskedLukas Reschke2016-12-154-3/+57
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add integration tests for uploading files to a permission limited shareRobin Appelman2016-12-151-0/+20
| * | | | use unmasked permissions in shared scannerRobin Appelman2016-12-143-3/+37
* | | | | Merge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-be...Roeland Jago Douma2016-12-141-1/+1
|\ \ \ \ \
| * | | | | Do not connect to database before creating itJoas Schilling2016-12-141-1/+1
* | | | | | Merge pull request #2674 from nextcloud/lookup-server-connector-12Morris Jobke2016-12-141-1/+1
|\ \ \ \ \ \
| * | | | | | mark nc12 as supporterRobin Appelman2016-12-141-1/+1
* | | | | | | 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 alreadyJoas Schilling2016-12-1410-417/+3
* | | | | | | | Merge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-databa...Roeland Jago Douma2016-12-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Only log as info when we can not create a new DB userJoas Schilling2016-12-141-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 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 existsLukas Reschke2016-12-144-2/+196
|/ / / / / / /
* | | | | | | Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressionsJoas Schilling2016-12-141-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Safari CSPv3 support is sub-parLukas Reschke2016-12-141-2/+0
|/ / / / / /
* | | | | | Merge pull request #2654 from nextcloud/increase-master-versionRoeland Jago Douma2016-12-1423-49/+50
|\ \ \ \ \ \
| * | | | | | Use the mocked config versionJoas Schilling2016-12-142-6/+7
| * | | | | | Increase server versionJoas Schilling2016-12-131-3/+3
| * | | | | | Update app versions and requirementsJoas Schilling2016-12-1320-40/+40
| |/ / / / /
* | | | | | Merge pull request #2659 from nextcloud/fix_2641Roeland Jago Douma2016-12-141-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix overwriting parameterRoeland Jago Douma2016-12-131-3/+3
|/ / / / /
* | | | | Merge pull request #2643 from nextcloud/apps-buttons-wordingJoas Schilling2016-12-132-2/+2
|\ \ \ \ \
| * | | | | fix wording for apps mgmt buttonsJan-Christoph Borchardt2016-12-132-2/+2
* | | | | | Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mountsv11.0.0Lukas Reschke2016-12-135-0/+214
|\ \ \ \ \ \
| * | | | | | Update autoloadingJoas Schilling2016-12-132-0/+2
| * | | | | | Add a unit testJoas Schilling2016-12-131-0/+132
| * | | | | | Add a repair step to fix broken mountsJoas Schilling2016-12-132-0/+80
* | | | | | | Merge pull request #2637 from nextcloud/mount-cache-storageidLukas Reschke2016-12-134-21/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | always use numeric storage id in cacheentryRobin Appelman2016-12-133-6/+3
| * | | | | | fix cacheentry return wrong storage idRobin Appelman2016-12-132-1/+2
| * | | | | | reuse cacheentryRobin Appelman2016-12-131-15/+19
| * | | | | | also compare storage ids when checking for changed mountsRobin Appelman2016-12-131-1/+6