Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1678 from nextcloud/smb-stat-root | Lukas Reschke | 2016-12-16 | 1 | -2/+44 |
|\ | |||||
| * | Fix mtimes for share root | Robin Appelman | 2016-10-11 | 1 | -2/+44 |
* | | Merge pull request #2398 from nextcloud/fix-2368 | Lukas Reschke | 2016-12-16 | 2 | -65/+157 |
|\ \ | |||||
| * | | fix rendering for mail shares | Arthur Schiwon | 2016-12-08 | 1 | -2/+5 |
| * | | disable checkboxes during save op to avoid race conditions | Arthur Schiwon | 2016-12-08 | 2 | -2/+17 |
| * | | fix some coding style and stricter comparisons, makes scrutinizer happier | Arthur Schiwon | 2016-12-08 | 2 | -4/+4 |
| * | | also handle can-edit change | Arthur Schiwon | 2016-12-08 | 1 | -0/+5 |
| * | | flicker-free permission change in share dialog | Arthur Schiwon | 2016-12-08 | 2 | -63/+132 |
* | | | Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity | Lukas Reschke | 2016-12-16 | 9 | -11/+13 |
|\ \ \ | |||||
| * | | | Remove leading slash from sharing activity | Joas Schilling | 2016-12-15 | 9 | -11/+13 |
* | | | | Merge pull request #2715 from nextcloud/fix_dav_toto_tests | Roeland Jago Douma | 2016-12-16 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Fix TodoTest | Roeland Jago Douma | 2016-12-16 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #2625 from nextcloud/fix-todo-filter | Roeland Jago Douma | 2016-12-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix the Todos filter | Joas Schilling | 2016-12-12 | 1 | -1/+1 |
* | | | | | Merge pull request #2681 from nextcloud/changes-to-changelog | Roeland Jago Douma | 2016-12-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | let's add a date :D | Jos Poortvliet | 2016-12-15 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-lea... | Lukas Reschke | 2016-12-15 | 2 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Don't disable apps on update if PHP >= 7.0.0 | Lukas Reschke | 2016-12-15 | 2 | -1/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #2673 from nextcloud/shared-scanner-unmasked | Lukas Reschke | 2016-12-15 | 4 | -3/+57 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add integration tests for uploading files to a permission limited share | Robin Appelman | 2016-12-15 | 1 | -0/+20 |
| * | | | | use unmasked permissions in shared scanner | Robin Appelman | 2016-12-14 | 3 | -3/+37 |
* | | | | | Merge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-be... | Roeland Jago Douma | 2016-12-14 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Do not connect to database before creating it | Joas Schilling | 2016-12-14 | 1 | -1/+1 |
* | | | | | | Merge pull request #2674 from nextcloud/lookup-server-connector-12 | Morris Jobke | 2016-12-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mark nc12 as supporter | Robin Appelman | 2016-12-14 | 1 | -1/+1 |
* | | | | | | | Merge pull request #2665 from nextcloud/remove-db-class-and-interface | Roeland Jago Douma | 2016-12-14 | 10 | -417/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove IDb interface which was deprecated for 3 years already | Joas Schilling | 2016-12-14 | 10 | -417/+3 |
* | | | | | | | | Merge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-databa... | Roeland Jago Douma | 2016-12-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Only log as info when we can not create a new DB user | Joas Schilling | 2016-12-14 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2677 from nextcloud/fix-avatars-in-mail | Roeland Jago Douma | 2016-12-14 | 4 | -2/+196 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Don't set Content-Disposition header if one already exists | Lukas Reschke | 2016-12-14 | 4 | -2/+196 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressions | Joas Schilling | 2016-12-14 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Safari CSPv3 support is sub-par | Lukas Reschke | 2016-12-14 | 1 | -2/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2654 from nextcloud/increase-master-version | Roeland Jago Douma | 2016-12-14 | 23 | -49/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use the mocked config version | Joas Schilling | 2016-12-14 | 2 | -6/+7 |
| * | | | | | | Increase server version | Joas Schilling | 2016-12-13 | 1 | -3/+3 |
| * | | | | | | Update app versions and requirements | Joas Schilling | 2016-12-13 | 20 | -40/+40 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2659 from nextcloud/fix_2641 | Roeland Jago Douma | 2016-12-14 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix overwriting parameter | Roeland Jago Douma | 2016-12-13 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #2643 from nextcloud/apps-buttons-wording | Joas Schilling | 2016-12-13 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | fix wording for apps mgmt buttons | Jan-Christoph Borchardt | 2016-12-13 | 2 | -2/+2 |
* | | | | | | Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mountsv11.0.0 | Lukas Reschke | 2016-12-13 | 5 | -0/+214 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update autoloading | Joas Schilling | 2016-12-13 | 2 | -0/+2 |
| * | | | | | | Add a unit test | Joas Schilling | 2016-12-13 | 1 | -0/+132 |
| * | | | | | | Add a repair step to fix broken mounts | Joas Schilling | 2016-12-13 | 2 | -0/+80 |
* | | | | | | | Merge pull request #2637 from nextcloud/mount-cache-storageid | Lukas Reschke | 2016-12-13 | 4 | -21/+28 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | always use numeric storage id in cacheentry | Robin Appelman | 2016-12-13 | 3 | -6/+3 |
| * | | | | | | fix cacheentry return wrong storage id | Robin Appelman | 2016-12-13 | 2 | -1/+2 |
| * | | | | | | reuse cacheentry | Robin Appelman | 2016-12-13 | 1 | -15/+19 |
| * | | | | | | also compare storage ids when checking for changed mounts | Robin Appelman | 2016-12-13 | 1 | -1/+6 |