| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions | Joas Schilling | 2017-01-17 | 2 | -9/+15 |
| |\ | | | | | Markdown support for app descriptions | ||||
| | * | Apply DOMPurify over HTML | Lukas Reschke | 2017-01-13 | 1 | -1/+2 |
| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | Fix JSUnit tests | Morris Jobke | 2017-01-13 | 1 | -1/+2 |
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | Fix tests | Joas Schilling | 2017-01-13 | 1 | -8/+12 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Merge pull request #3023 from ↵ | Christoph Wurst | 2017-01-17 | 2 | -0/+29 |
| |\ \ | |/ |/| | | | | | nextcloud/issue-2915-filter-out-sensitive-appconfigs Filter out sensitive appconfig values | ||||
| | * | Fix tests | Joas Schilling | 2017-01-12 | 2 | -0/+29 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Merge pull request #3060 from nextcloud/cleanup-js-tests | Joas Schilling | 2017-01-13 | 1 | -2/+7 |
| |\ \ | | | | | | | Cleanup js tests | ||||
| | * | | fix image warnings | Christoph Wurst | 2017-01-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| | * | | allow/fix loading of fonts | Christoph Wurst | 2017-01-13 | 1 | -1/+4 |
| | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvements | Morris Jobke | 2017-01-13 | 2 | -38/+43 |
| |\ \ \ | |/ / |/| | | create new encryption keys on password reset and backup the old one | ||||
| | * | | create new encryption keys on password reset and backup the old one | Bjoern Schiessle | 2017-01-10 | 2 | -38/+43 |
| | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | fix coding style and increase code coverage | Christoph Wurst | 2017-01-11 | 1 | -40/+111 |
| | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Fix tests | Cornelius Kölbel | 2017-01-11 | 1 | -2/+5 |
| | |/ |/| | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2745 from nextcloud/oc_26590 | Roeland Jago Douma | 2017-01-11 | 1 | -0/+21 |
| |\ \ | | | | | | | [downstream] Skip local shares in bkg scan and occ files:scan (#26590) | ||||
| | * | | Only check for local shared storages | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | Skip local shares in bkg scan and occ files:scan (#26590) | Vincent Petry | 2017-01-10 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | Local shares should only be scanned when doing it for the owner to avoid repeatedly rescanning the same shared storage over and over again for every recipient. | ||||
| * | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully | Roeland Jago Douma | 2017-01-11 | 1 | -0/+18 |
| |\ \ \ | |_|/ |/| | | Handle log_type "nextcloud" more gracefully | ||||
| | * | | Better fallback for unknown log types | Joas Schilling | 2017-01-10 | 1 | -2/+4 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | Add tests | Joas Schilling | 2017-01-09 | 1 | -0/+16 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #3012 from nextcloud/fix-karma-image-warnings | Roeland Jago Douma | 2017-01-10 | 1 | -2/+3 |
| |\ \ \ | |_|/ |/| | | show fewer warnings in karma test runs | ||||
| | * | | show fewer warnings in karma test runs | Christoph Wurst | 2017-01-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Merge pull request #3000 from nextcloud/cache-no-store | Roeland Jago Douma | 2017-01-10 | 3 | -3/+3 |
| |\ \ \ | | | | | | | | | set 'no-store' cache header if we do not want FF to cache | ||||
| | * | | | fix controller test | Christoph Wurst | 2017-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| | * | | | fix data response test expected cache headers | Christoph Wurst | 2017-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| | * | | | set 'no-store' cache header if we do not want FF to cache | Christoph Wurst | 2017-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | Merge pull request #2943 from nextcloud/kill_old_preview_code | Morris Jobke | 2017-01-10 | 1 | -963/+0 |
| |\ \ \ \ | |_|/ / |/| | | | Cleanup old preview code | ||||
| | * | | | Remove old preview code | Roeland Jago Douma | 2017-01-04 | 1 | -963/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \OC\Preview is no more * \Test\PreviewTests is no more * PreviewHooks in base.php are gone Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #2955 from ↵ | Roeland Jago Douma | 2017-01-10 | 1 | -0/+110 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/make-share-by-mail-work-without-linkshares share by mail should continue to work, even if public links are disabled | ||||
| | * | | | | also create mail share if public links are disabled | Bjoern Schiessle | 2017-01-04 | 1 | -0/+110 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | Merge pull request #2925 from nextcloud/remove-close-wrapper | Roeland Jago Douma | 2017-01-10 | 1 | -68/+0 |
| |\ \ \ \ | | | | | | | | | | | replace close:// streamwrapper with CallBackWrapper | ||||
| | * | | | | replace close:// streamwrapper with CallBackWrapper | Robin Appelman | 2017-01-06 | 1 | -68/+0 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | Merge pull request #2987 from nextcloud/no-empty-bundle | Lukas Reschke | 2017-01-09 | 1 | -3/+4 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | dont write a certificate bundle if the shipped ca bundle is empty | ||||
| | * | | | | dont write a certificate bundle if the shipped ca bundle is empty | Robin Appelman | 2017-01-09 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | Merge pull request #2814 from nextcloud/appstore_etag_validation | Joas Schilling | 2017-01-09 | 2 | -5/+164 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Add ETag validation to appstore requests | ||||
| | * | | | | Add ETag validation to appstore requests | Roeland Jago Douma | 2017-01-05 | 2 | -5/+164 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the ETag if present store it * If a stored ETag is present then pass it along (with the original response) to get * Add tests * Added files to classmap Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #2934 from nextcloud/quota-stream-non-global | Roeland Jago Douma | 2017-01-06 | 1 | -4/+1 |
| |\ \ \ \ | |_|/ / |/| | | | remove the need to register the quota streamwrapper globally | ||||
| | * | | | remove the need to register the quota streamwrapper globally | Robin Appelman | 2017-01-04 | 1 | -4/+1 |
| | | |/ | |/| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | Fix js tests | Roeland Jago Douma | 2017-01-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Adds CssControllerTests | Roeland Jago Douma | 2017-01-06 | 1 | -0/+111 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #2817 from nextcloud/fix-invalid-share-perms | Morris Jobke | 2017-01-05 | 1 | -0/+67 |
| |\ \ \ | | | | | | | | | Fix invalid share perms | ||||
| | * | | | Add repair step to fix file share permissions | Vincent Petry | 2017-01-05 | 1 | -0/+67 |
| | | |/ | |/| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #2946 from nextcloud/kill-apc | Joas Schilling | 2017-01-05 | 1 | -26/+0 |
| |\ \ \ | | | | | | | | | Kill APC because it requires PHP 5.4 or lower | ||||
| | * | | | Kill APC because it requires PHP 5.4 | Joas Schilling | 2017-01-05 | 1 | -26/+0 |
| | |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Remove warning | Joas Schilling | 2017-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Fix tests | Joas Schilling | 2017-01-05 | 1 | -1/+13 |
| |/ / | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * / | remove static:// stream wrapper | Robin Appelman | 2017-01-04 | 4 | -76/+22 |
| |/ | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | Merge pull request #2923 from nextcloud/remove-fakedir-stream | Robin Appelman | 2017-01-03 | 1 | -12/+0 |
| |\ | | | | | remove no longer used fakedir stream wrapper | ||||
| | * | remove no longer used fakedir stream wrapper | Robin Appelman | 2017-01-03 | 1 | -12/+0 |
| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | Merge pull request #2872 from nextcloud/admin-settings-split-db | Morris Jobke | 2017-01-02 | 2 | -136/+232 |
| |\ \ | | | | | | | split db logic from settings manager and test them separately | ||||
| | * | | split db logic from settings manager | Robin Appelman | 2016-12-28 | 2 | -136/+232 |
| | |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |