summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-05-2226-56/+228
|
* Merge pull request #15668 from nextcloud/fix/10832/l10n-on-settings-pageblizzz2019-05-223-4/+45
|\ | | | | Fix l10n for SettingsManager by injecting the l10n factory
| * Fix l10n for SettingsManager by injecting the l10n factoryMorris Jobke2019-05-213-4/+45
| | | | | | | | | | | | Fixes #10832 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #15651 from nextcloud/fix/quota/hover-feedbackMorris Jobke2019-05-211-0/+8
|\ \ | | | | | | Remove quota feedback if no link set
| * | Remove quota feedback if no link setJohn Molakvoæ (skjnldsv)2019-05-211-0/+8
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #15659 from nextcloud/version-backend-useMorris Jobke2019-05-214-12/+129
|\ \ | | | | | | add way for version backends to programmatically specify if they should be used
| * | add way for version backends to programmatically specify if they should be usedRobin Appelman2019-05-214-12/+129
| | | | | | | | | | | | | | | | | | this allows for backends that should only be used if specific conditions are met Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #15660 from nextcloud/objectstore-getRoeland Jago Douma2019-05-211-0/+4
|\ \ \ | | | | | | | | add method to get the used object store from the storage
| * | | add method to get the used object store from the storageRobin Appelman2019-05-211-0/+4
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #15499 from nextcloud/app-update-scriptMorris Jobke2019-05-212-0/+30
|\ \ \ | |_|/ |/| | Add scripts to update server & apps or apps only
| * | Fix app update script for macOSJan-Christoph Borchardt2019-05-172-2/+2
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Remove eduplicate git fetch from update scriptsJan-Christoph Borchardt2019-05-172-2/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Adjust script to remove branches which are deleted on GitHubJan-Christoph Borchardt2019-05-172-2/+2
| | | | | | | | | Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
| * | Fix for update script when submodule is not initializedJan-Christoph Borchardt2019-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Also add script to update both server and appsJan-Christoph Borchardt2019-05-171-0/+17
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Add script to update Nextcloud apps from latest git master, ref #15145Jan-Christoph Borchardt2019-05-171-0/+14
| |/ | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #15638 from nextcloud/bugfix/7965/sharing-hide-if-emptyMorris Jobke2019-05-212-0/+7
|\ \ | | | | | | Only show sharing section if it has content
| * | Only show sharing section if it has contentJulius Härtl2019-05-202-0/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #15104 from nextcloud/enh/remote_wipeRoeland Jago Douma2019-05-2134-3429/+4861
|\ \ \ | | | | | | | | Remote wipe support
| * | | Remote wipe supportRoeland Jago Douma2019-05-2034-3429/+4861
| |/ / | | | | | | | | | | | | | | | | | | | | | This allows a user to mark a token for remote wipe. Clients that support this can then wipe the device properly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2019-05-2110-2/+76
| | |
* | | Merge pull request #15601 from nextcloud/url-generation-oc-configMorris Jobke2019-05-207-7/+7
|\ \ \ | |/ / |/| | dont use deprecated oc_config in url generation
| * | dont use deprecated oc_config in url generationRobin Appelman2019-05-207-7/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #15615 from ↵Morris Jobke2019-05-202-4/+4
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/build/jsdoc-3.6.2 Bump jsdoc from 3.6.1 to 3.6.2 in /build
| * | Bump jsdoc from 3.6.1 to 3.6.2 in /builddependabot[bot]2019-05-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/jsdoc/jsdoc/releases) - [Changelog](https://github.com/jsdoc/jsdoc/blob/master/CHANGES.md) - [Commits](https://github.com/jsdoc/jsdoc/compare/3.6.1...3.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #15578 from nextcloud/3rdparty/openstack/3.0.6Roeland Jago Douma2019-05-201-0/+0
|\ \ \ | | | | | | | | [3rdparty] Bump openstack to 3.0.6
| * | | [3rdparty] Bump openstack to 3.0.6Roeland Jago Douma2019-05-171-0/+0
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #15626 from nextcloud/update-crlRoeland Jago Douma2019-05-201-10/+10
|\ \ \ | | | | | | | | Update CRL due to revoked cookbook.crt
| * | | Update CRL due to revoked cookbook.crtMorris Jobke2019-05-201-10/+10
| |/ / | | | | | | | | | | | | | | | See https://github.com/nextcloud/app-certificate-requests/pull/241 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Bump babel-loader from 8.0.5 to 8.0.6 (#15616)John Molakvoæ2019-05-202-119/+16
|\ \ \ | | | | | | | | Bump babel-loader from 8.0.5 to 8.0.6
| * | | Bump babel-loader from 8.0.5 to 8.0.6dependabot[bot]2019-05-192-119/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.5 to 8.0.6. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v8.0.5...v8.0.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-05-2012-8/+42
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-05-1924-2/+80
|/ /
* / [tx-robot] updated from transifexNextcloud bot2019-05-1814-20/+26
|/
* Merge pull request #15571 from nextcloud/enhancement/maintenance-mode-bundleMorris Jobke2019-05-1710-59/+405
|\ | | | | Migrate the maintenance script to a modern module and bundle
| * Migrate the maintenance script to a modern module and bundleChristoph Wurst2019-05-1610-59/+405
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #15304 from nextcloud/enh/2fa_setup_at_loginRoeland Jago Douma2019-05-1717-9/+677
|\ \ | | | | | | 2FA setup during login
| * | Allow 2FA to be setup on first loginRoeland Jago Douma2019-05-1717-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_endpointRoeland Jago Douma2019-05-173-0/+81
|\ \ \ | | | | | | | | Allow clients to delete their own apptoken
| * | | Allow clients to delete their own apptokenRoeland Jago Douma2019-05-173-0/+81
| |/ / | | | | | | | | | | | | | | | Fixes #15480 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #15582 from nextcloud/bugfix/noid/update-shipped-appsMorris Jobke2019-05-171-0/+3
|\ \ \ | |/ / |/| | Update shipped.json to include privacy and recommendations
| * | Update shipped.json to include privacy, recommendations, viewerGeorg Ehrke2019-05-171-0/+3
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-05-172-2/+2
|/ /
* | Merge pull request #15564 from nextcloud/fix/noid/rephrase-unclear-error-msgRoeland Jago Douma2019-05-162-2/+2
|\ \ | |/ |/| User management/subadmin: rephrase ambiguous error message
| * fixes misunderstanding of the error messageArthur Schiwon2019-05-162-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #15547 from nextcloud/3rdparty/aws/sdk/3.93.9Morris Jobke2019-05-161-0/+0
|\ \ | | | | | | [3rdparty] Bump AWS SDK to 3.93.9
| * | [3rdparty] Bump AWS SDK to 3.93.9Roeland Jago Douma2019-05-161-0/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-05-164-118/+138
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2019-05-162-0/+4
| |
* | Merge pull request #15552 from nextcloud/update-ca-bundle-checkerRoeland Jago Douma2019-05-151-2/+1
|\ \ | | | | | | Update ca bundle checker