Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add catch for RuntimeException | Daniel Kesselberg | 2019-05-17 | 1 | -1/+2 |
| | | | | | | | | getDirectoryListing can throw a NotFoundException or a RuntimeException. The repair step should be skipped if the cache directory is missing so a catch for both exceptions is required. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
* | Merge pull request #15571 from nextcloud/enhancement/maintenance-mode-bundle | Morris Jobke | 2019-05-17 | 10 | -59/+405 |
|\ | | | | | Migrate the maintenance script to a modern module and bundle | ||||
| * | Migrate the maintenance script to a modern module and bundle | Christoph Wurst | 2019-05-16 | 10 | -59/+405 |
| | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | Merge pull request #15304 from nextcloud/enh/2fa_setup_at_login | Roeland Jago Douma | 2019-05-17 | 17 | -9/+677 |
|\ \ | | | | | | | 2FA setup during login | ||||
| * | | Allow 2FA to be setup on first login | Roeland Jago Douma | 2019-05-17 | 17 | -9/+677 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Once 2FA is enforced for a user and they have no 2FA setup yet this will now prompt them with a setup screen. Given that providers are enabled that allow setup then. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Merge pull request #15590 from nextcloud/enh/15480/delete_apptoken_ocs_endpoint | Roeland Jago Douma | 2019-05-17 | 3 | -0/+81 |
|\ \ \ | | | | | | | | | Allow clients to delete their own apptoken | ||||
| * | | | Allow clients to delete their own apptoken | Roeland Jago Douma | 2019-05-17 | 3 | -0/+81 |
| |/ / | | | | | | | | | | | | | | | | Fixes #15480 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #15582 from nextcloud/bugfix/noid/update-shipped-apps | Morris Jobke | 2019-05-17 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | Update shipped.json to include privacy and recommendations | ||||
| * | | Update shipped.json to include privacy, recommendations, viewer | Georg Ehrke | 2019-05-17 | 1 | -0/+3 |
| | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2019-05-17 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #15564 from nextcloud/fix/noid/rephrase-unclear-error-msg | Roeland Jago Douma | 2019-05-16 | 2 | -2/+2 |
|\ \ | |/ |/| | User management/subadmin: rephrase ambiguous error message | ||||
| * | fixes misunderstanding of the error message | Arthur Schiwon | 2019-05-16 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | Merge pull request #15547 from nextcloud/3rdparty/aws/sdk/3.93.9 | Morris Jobke | 2019-05-16 | 1 | -0/+0 |
|\ \ | | | | | | | [3rdparty] Bump AWS SDK to 3.93.9 | ||||
| * | | [3rdparty] Bump AWS SDK to 3.93.9 | Roeland Jago Douma | 2019-05-16 | 1 | -0/+0 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2019-05-16 | 4 | -118/+138 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2019-05-16 | 2 | -0/+4 |
| | | |||||
* | | Merge pull request #15552 from nextcloud/update-ca-bundle-checker | Roeland Jago Douma | 2019-05-15 | 1 | -2/+1 |
|\ \ | | | | | | | Update ca bundle checker | ||||
| * | | Remove whitespace | Daniel Kesselberg | 2019-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
| * | | Use DRONE_SOURCE_BRANCH instead of DRONE_COMMIT_REFSPEC | Daniel Kesselberg | 2019-05-15 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | Looks like DRONE_COMMIT_REFSPEC is not available anymore on Drone 1.x Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
| * | | Update regex to also match version/x.y.z | Daniel Kesselberg | 2019-05-15 | 1 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
* | | | Merge pull request #15548 from nextcloud/update-ca-bundle | Roeland Jago Douma | 2019-05-15 | 1 | -2/+108 |
|\ \ \ | | | | | | | | | update ca bundle | ||||
| * | | | update ca bundle | Arthur Schiwon | 2019-05-15 | 1 | -2/+108 |
| | |/ | |/| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | Merge pull request #15526 from nextcloud/fix/noid/building-wfe-handlebars | Roeland Jago Douma | 2019-05-15 | 6 | -21/+22 |
|\ \ \ | |/ / |/| | | fix building WFE Handlebars | ||||
| * | | fix building WFE Handlebars | Arthur Schiwon | 2019-05-15 | 6 | -21/+22 |
| | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | Merge pull request #15537 from nextcloud/3rdparty/phpseclib-2.0.15 | Roeland Jago Douma | 2019-05-15 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | [3rdparty] Bump phpseclib to 2.0.15 | ||||
| * | | | [3rdparty] Bump phpseclib to 2.0.15 | Roeland Jago Douma | 2019-05-15 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2019-05-15 | 148 | -510/+562 |
|/ / / | |||||
* | | | Merge pull request #15542 from ↵ | Roeland Jago Douma | 2019-05-15 | 9 | -152/+142 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/refactor/legacy-ajax-error-handling-bundle Move legacy ajax error handling bundle and 🔥 js.js | ||||
| * | | | Remove empty js.js | Christoph Wurst | 2019-05-15 | 3 | -11/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Move legacy Ajax error handling logic to the bundle | Christoph Wurst | 2019-05-15 | 7 | -141/+142 |
|/ / / | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Move OC.appSettings to the bundle and deprecate it (#15533) | John Molakvoæ | 2019-05-15 | 7 | -104/+182 |
|\ \ \ | | | | | | | | | Move OC.appSettings to the bundle and deprecate it | ||||
| * | | | Move OC.appSettings to the bundle and deprecate it | Christoph Wurst | 2019-05-14 | 7 | -104/+182 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | Merge pull request #15497 from nextcloud/3rdparty/doctrine/dbal-292 | Roeland Jago Douma | 2019-05-15 | 2 | -22/+0 |
|\ \ \ \ | | | | | | | | | | | [3rdparty] Doctrine dbal to 2.9.2 | ||||
| * | | | | No need for platform hacks anymore | Roeland Jago Douma | 2019-05-14 | 1 | -22/+0 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | [3rdparty] Doctrine dbal to 2.9.2 | Roeland Jago Douma | 2019-05-14 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | Merge pull request #15336 from epma01/redis-patch | Roeland Jago Douma | 2019-05-15 | 1 | -1/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix Redis with unix socket #730 | ||||
| * | | | | Fix Redis with unix socket | Alejandro Varela | 2019-05-14 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alejandro Varela <epma01@gmail.com> | ||||
* | | | | | Merge pull request #15531 from nextcloud/refactor/remove-js-js-ocp | Roeland Jago Douma | 2019-05-14 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove OCP (re)declaration from js.js | ||||
| * | | | | | Remove OCP (re)declaration from js.js | Christoph Wurst | 2019-05-14 | 1 | -3/+0 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | | Merge pull request #15532 from nextcloud/refactor/oc-query-string-helpers-bundle | Roeland Jago Douma | 2019-05-14 | 7 | -126/+196 |
|\ \ \ \ \ | |/ / / / |/| | | | | Move query string helpers to the bundle | ||||
| * | | | | Move query string helpers to the bundle | Christoph Wurst | 2019-05-14 | 7 | -126/+196 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | Move OC.theme to the bundle and deprecate oc_defaults (#15525) | John Molakvoæ | 2019-05-14 | 17 | -39/+101 |
|\ \ \ \ | |_|_|/ |/| | | | Move OC.theme to the bundle and deprecate oc_defaults | ||||
| * | | | Move OC.theme to the bundle and deprecate oc_defaults | Christoph Wurst | 2019-05-14 | 17 | -39/+101 |
|/ / / | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Merge pull request #15524 from ↵ | Roeland Jago Douma | 2019-05-14 | 7 | -13/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/refactor/oc-add-translations-bundle-deprecate Deprecate OC.fileIsBlacklisted and move it to the bundle | ||||
| * | | | Deprecate OC.fileIsBlacklisted and move it to the bundle | Christoph Wurst | 2019-05-14 | 7 | -13/+15 |
|/ / / | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Merge pull request #15523 from ↵ | Christoph Wurst | 2019-05-14 | 6 | -18/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/refactor/oc-add-translations-bundle-deprecate Move OC.addTranslations to the bundle and deprecate it | ||||
| * | | | Move OC.addTranslations to the bundle and deprecate it | Christoph Wurst | 2019-05-14 | 6 | -18/+13 |
|/ / / | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Merge pull request #15520 from nextcloud/refactor/oc-host-port-protocol-bundle | Christoph Wurst | 2019-05-14 | 7 | -48/+81 |
|\ \ \ | | | | | | | | | Move OC host/port/protocol helpers to the bundle and deprecate them | ||||
| * | | | Move OC host/port/protocol helpers to the bundle and deprecate them | Christoph Wurst | 2019-05-14 | 7 | -48/+81 |
|/ / / | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Move OC.getCapabilities to the bundle and deprecate OC._capabilities,… ↵ | John Molakvoæ | 2019-05-14 | 15 | -74/+99 |
|\ \ \ | | | | | | | | | | | | | | | | | (#15521) Move OC.getCapabilities to the bundle and deprecate OC._capabilities,… |