Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't set Content-Disposition header if one already exists | Lukas Reschke | 2016-12-14 | 4 | -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-regressions | Joas Schilling | 2016-12-14 | 1 | -2/+0 |
|\ | | | | | Safari CSPv3 support is sub-par | ||||
| * | Safari CSPv3 support is sub-par | Lukas Reschke | 2016-12-14 | 1 | -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-version | Roeland Jago Douma | 2016-12-14 | 23 | -49/+50 |
|\ | | | | | Update app versions and requirements | ||||
| * | Use the mocked config version | Joas Schilling | 2016-12-14 | 2 | -6/+7 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Increase server version | Joas Schilling | 2016-12-13 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Update app versions and requirements | Joas Schilling | 2016-12-13 | 20 | -40/+40 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #2659 from nextcloud/fix_2641 | Roeland Jago Douma | 2016-12-14 | 1 | -3/+3 |
|\ \ | |/ |/| | Fix overwriting parameter | ||||
| * | Fix overwriting parameter | Roeland Jago Douma | 2016-12-13 | 1 | -3/+3 |
|/ | | | | | | Fixes #2641 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | Merge pull request #2643 from nextcloud/apps-buttons-wording | Joas Schilling | 2016-12-13 | 2 | -2/+2 |
|\ | | | | | fix wording for apps mgmt buttons | ||||
| * | fix wording for apps mgmt buttons | Jan-Christoph Borchardt | 2016-12-13 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mountsv11.0.0 | Lukas Reschke | 2016-12-13 | 5 | -0/+214 |
|\ \ | | | | | | | Add a repair step to fix broken mounts | ||||
| * | | Update autoloading | Joas Schilling | 2016-12-13 | 2 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Add a unit test | Joas Schilling | 2016-12-13 | 1 | -0/+132 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Add a repair step to fix broken mounts | Joas Schilling | 2016-12-13 | 2 | -0/+80 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #2637 from nextcloud/mount-cache-storageid | Lukas Reschke | 2016-12-13 | 4 | -21/+28 |
|\ \ \ | |/ / |/| | | also compare storage ids when checking for changed mounts | ||||
| * | | always use numeric storage id in cacheentry | Robin Appelman | 2016-12-13 | 3 | -6/+3 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | fix cacheentry return wrong storage id | Robin Appelman | 2016-12-13 | 2 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | reuse cacheentry | Robin Appelman | 2016-12-13 | 1 | -15/+19 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | also compare storage ids when checking for changed mounts | Robin Appelman | 2016-12-13 | 1 | -1/+6 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | Merge pull request #2642 from nextcloud/avatars_class_name | Lukas Reschke | 2016-12-13 | 3 | -2/+2 |
|\ \ \ | | | | | | | | | Avatars class name | ||||
| * | | | Fixed correct filename of MoveAvatarsBackgroundJob | Roeland Jago Douma | 2016-12-13 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #2639 from nextcloud/final-increase-of-version | Lukas Reschke | 2016-12-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Final version increasement for 11 | ||||
| * | | | Final version increasement for 11 | Lukas Reschke | 2016-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | | Merge pull request #2635 from nextcloud/fix_autoload_checker | Roeland Jago Douma | 2016-12-13 | 5 | -7/+48 |
|\ \ \ \ | |/ / / |/| | | | Fix autoload checker | ||||
| * | | | Update autoloader | Roeland Jago Douma | 2016-12-13 | 4 | -6/+48 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | The hash can change so checking for it is kind of dangerous | Roeland Jago Douma | 2016-12-13 | 1 | -1/+0 |
|/ / / | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #2615 from nextcloud/daita-sharecontroller | Lukas Reschke | 2016-12-12 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | Download a file in a subfolder in a sharedlink is not working | ||||
| * | | | update phpdoc | Maxence Lange | 2016-12-12 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@pontapreta.net> | ||||
| * | | | Download a file in a subfolder in a sharedlink is not working | Maxence Lange | 2016-12-11 | 1 | -3/+3 |
| | | | | | | | | | | | | the $node created using the path (GET) parameter is not used when executing fileListDownloaded() | ||||
* | | | | Merge pull request #2629 from nextcloud/increase-v-1-again | Lukas Reschke | 2016-12-12 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Increase version once again | ||||
| * | | | Increase version once again | Lukas Reschke | 2016-12-12 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | For https://github.com/nextcloud/server/pull/2615 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #2627 from nextcloud/already-increase-version | Lukas Reschke | 2016-12-12 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Increase version to 11.0.0 | ||||
| * | | | Increase version to 11.0.0 | Lukas Reschke | 2016-12-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | | Merge pull request #2620 from nextcloud/theming-externalfiles | Lukas Reschke | 2016-12-12 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | Show theming icons on external storage folders | ||||
| * | | | Show theming icons on external storage folders | Julius Haertl | 2016-12-12 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | | | | Merge pull request #2622 from nextcloud/improve-wording | Lukas Reschke | 2016-12-12 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | improve wording of admin settings to enable search on the public address book | ||||
| * | | | improve wording of admin settings to enable search on the public address book | Bjoern Schiessle | 2016-12-12 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | / | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-12 | 14 | -10/+734 |
| |/ |/| | |||||
* | | 11.0 RC2v11.0RC2 | Lukas Reschke | 2016-12-11 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-11 | 2 | -0/+16 |
| | | |||||
* | | Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars | Lukas Reschke | 2016-12-10 | 2 | -0/+66 |
|\ \ | | | | | | | Do not add invites into read-only calendars | ||||
| * | | Overwrite the schedule target calendar with the personal one and create it ↵ | Joas Schilling | 2016-12-09 | 2 | -0/+66 |
| |/ | | | | | | | | | | | | | | | | | | | if missing Otherwise this leads to problems like events being added to the birthday calendar, if that one is the first calendar which was created for the user. See: https://github.com/nextcloud/server/pull/2274 Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #2598 from nextcloud/fix_2403 | Lukas Reschke | 2016-12-10 | 1 | -0/+9 |
|\ \ | | | | | | | Check for app updates on disabled page | ||||
| * | | Check for app updates on disabled page | Roeland Jago Douma | 2016-12-09 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2403 We need to check for updates of disabled apps so that if you update with incompatible apps you at least get a chance to upgrade. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-10 | 14 | -14/+250 |
| | | | |||||
* | | | Merge pull request #2590 from nextcloud/postgres-install-failing | Roeland Jago Douma | 2016-12-09 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Revert "Quote database and role in queries" | ||||
| * | | | Lower the role name before using it | Joas Schilling | 2016-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Revert "Quote database and role in queries" | Joas Schilling | 2016-12-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | This reverts commit 9ebd5d5bb20af9178e071c3c6f3b41d9a9bc8be0. | ||||
* | | | | Merge pull request #2594 from nextcloud/dont-use-cached-info | Roeland Jago Douma | 2016-12-09 | 3 | -5/+12 |
|\ \ \ \ | | | | | | | | | | | Don't use cached informations for app version when installing the app |