summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check for free space on touchJulius Härtl2019-05-283-3/+19
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #15738 from ↵Roeland Jago Douma2019-05-271-7/+7
|\ | | | | | | | | nextcloud/enh/dont-notify-admin-if-no-exposing-share-links-found Don't notify admins if no potentially over exposing links found
| * Don't notify admins if no potentially over exposing links foundDaniel Kesselberg2019-05-261-7/+7
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | [tx-robot] updated from transifexNextcloud bot2019-05-2718-26/+128
| |
* | [tx-robot] updated from transifexNextcloud bot2019-05-2642-120/+210
| |
* | Merge pull request #15722 from nextcloud/dependabot/npm_and_yarn/build/tar-2.2.2Roeland Jago Douma2019-05-251-31/+93
|\ \ | | | | | | [Security] Bump tar from 2.2.1 to 2.2.2 in /build
| * | [Security] Bump tar from 2.2.1 to 2.2.2 in /builddependabot-preview[bot]2019-05-241-31/+93
| | | | | | | | | | | | | | | Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes security fixes.** - [Release notes](https://github.com/npm/node-tar/releases) - [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)
* | | [tx-robot] updated from transifexNextcloud bot2019-05-2516-30/+180
|/ /
* | [Security] Bump tar from 2.2.1 to 2.2.2 (#15729)John Molakvoæ2019-05-251-5/+20
|\ \ | | | | | | [Security] Bump tar from 2.2.1 to 2.2.2
| * | [Security] Bump tar from 2.2.1 to 2.2.2dependabot-preview[bot]2019-05-241-5/+20
|/ / | | | | | | | | Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes security fixes.** - [Release notes](https://github.com/npm/node-tar/releases) - [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)
* | Merge pull request #15714 from nextcloud/fix/204_304_rfcRoeland Jago Douma2019-05-242-11/+18
|\ \ | | | | | | Check the actual status code for 204 and 304
| * | Check the actual status code for 204 and 304Roeland Jago Douma2019-05-242-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header is the full http header like: HTTP/1.1 304 Not Modified So comparing this to an int always yields false This also makes the 304 RFC compliant as the resulting content length should otherwise be the length of the message and not 0. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #15700 from nextcloud/fix/open_multiple_link_sharesMorris Jobke2019-05-241-0/+14
|\ \ \ | | | | | | | | Redirect to the right token on public shares
| * | | Redirect to the right token on public sharesRoeland Jago Douma2019-05-231-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the token doesn't match (or isn't set) during the redirect. We should properly set it. Else we might redirect to a later auth display that set these values. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #15697 from ↵Morris Jobke2019-05-247-63/+179
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/calendar_birthday_move_repair_to_background Don't run repair step for every individual user, outsource that to background job
| * | | | Don't run repair step for every individual user, outsource that to ↵Georg Ehrke2019-05-237-63/+179
| |/ / / | | | | | | | | | | | | | | | | | | | | background job Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #15679 from nextcloud/feature/sub-admin-settingsRoeland Jago Douma2019-05-2413-52/+271
|\ \ \ \ | | | | | | | | | | Make it possible to show admin settings for sub admins
| * | | | Make it possible to show admin settings for sub adminsChristoph Wurst2019-05-2313-52/+271
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #15715 from nextcloud/s3-bucket-nameMorris Jobke2019-05-241-1/+4
|\ \ \ \ | | | | | | | | | | Allow other code to use the s3 client from object store
| * | | | add method to get bucket name from s3 storageRobin Appelman2019-05-241-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #15706 from nextcloud/smb-hidden-filesMorris Jobke2019-05-242-5/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | | add option to show hidden files in SMB shares
| * | | | add option to show hidden files in SMB sharesRobin Appelman2019-05-232-5/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note hidden files can mean different things in smb and the option the the files web ui, the webui only counts files starting with '.' as hidden, while smb files can be marked as hidden regardless, any files that are marked as hidden on smb will thus be shown in the webui regardless of the setting in the files app. Fixes #15644 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | / / [tx-robot] updated from transifexNextcloud bot2019-05-2426-10/+150
| |/ / |/| |
* | | Merge pull request #15699 from nextcloud/funding-ymlMorris Jobke2019-05-231-0/+2
|\ \ \ | |_|/ |/| | Add funding.yml with Bountysource info
| * | Add funding.yml with Bountysource infoJan-Christoph Borchardt2019-05-231-0/+2
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2019-05-23134-296/+434
| |
* | Merge pull request #15676 from nextcloud/revert/9609Morris Jobke2019-05-221-67/+0
|\ \ | | | | | | Revert "send invitations for shared calendars"
| * | Revert "send invitations for shared calendars"Georg Ehrke2019-05-221-67/+0
| |/ | | | | | | This reverts commit a9c313ce451c701a2e065e34022659cf17523963.
* | Merge pull request #15684 from nextcloud/objectstore-expose-urnMorris Jobke2019-05-221-1/+1
|\ \ | | | | | | make ObjectStoreStorage::getURN public
| * | make ObjectStoreStorage::getURN publicRobin Appelman2019-05-221-1/+1
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #12114 from RubenHoms/masterMorris Jobke2019-05-226-12/+99
|\ \ | | | | | | Stop decryption when maintenance mode is enabled
| * | Stop decryption when maintenance mode is enabled, fixes #8311Ruben Homs2019-05-216-12/+99
| | | | | | | | | | | | Signed-off-by: Ruben Homs <ruben@homs.codes>
* | | Merge pull request #15506 from ↵Morris Jobke2019-05-2237-3488/+12227
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud-vue-0.11.1 Bump nextcloud-vue from 0.8.0 to 0.11.1
| * | | Bump files_sharing bundlesJulius Härtl2019-05-2210-2337/+642
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Bump nextcloud-vue-collectionsJulius Härtl2019-05-223-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Bump settingsJohn Molakvoæ (skjnldsv)2019-05-2238-3427/+13859
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Bump nextcloud-vue from 0.8.0 to 0.11.1dependabot[bot]2019-05-222-4/+5
| | |/ | |/| | | | | | | | | | | | | | | | Bumps [nextcloud-vue](https://github.com/nextcloud/nextcloud-vue) from 0.8.0 to 0.11.1. - [Release notes](https://github.com/nextcloud/nextcloud-vue/releases) - [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v0.8.0...v0.11.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #15604 from ↵blizzz2019-05-227-13/+17
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/12682/fix-possible-override-of-uniquemember fixes possible override of uniqueMember by autodetection
| * | | set the ldapGroupMemberAssocAttr for group testsArthur Schiwon2019-05-222-6/+10
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fixes possible override of uniqueMember by autodetectionArthur Schiwon2019-05-175-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uniqueMember was the default so we did not know whether this setting is desired or the initial value * autodetection of the user-group association attribute runs only when it was not set (as far as we knew) * the default is now empty * thus LDAPProvider might return this value as well (in exceptional cases) * if a group base is given (edge case), use this instead of general base * resolves #12682 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #15682 from nextcloud/enh/15675/lazy_l10nMorris Jobke2019-05-224-25/+100
|\ \ \ \ | | | | | | | | | | Make the L10N loading lazy
| * | | | Make the L10N loading lazyRoeland Jago Douma2019-05-224-25/+100
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15675 This makes loading of the actual L10N lazy. So we only detect and load the actual translations when they are used. Instead of trying to load them all the time just because an app is enabled. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #15685 from nextcloud/fix/noid/redis-cluster-with-authMorris Jobke2019-05-222-3/+11
|\ \ \ \ | |/ / / |/| | | Allow redis cluster to use password
| * | | Allow redis cluster to use passwordMorris Jobke2019-05-222-3/+11
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [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