wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
49732 commits 157 branches 562 tags 714 MiB
Commit graph

49732 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
67432a2141
Merge pull request #15700 from nextcloud/fix/open_multiple_link_shares 
Redirect to the right token on public shares
 2019-05-24 16:09:01 +02:00
Morris Jobke
e7ae8511fb
Merge pull request #15697 from nextcloud/bugfix/noid/calendar_birthday_move_repair_to_background 
Don't run repair step for every individual user, outsource that to background job
 2019-05-24 15:55:23 +02:00
Roeland Jago Douma
5b0e70ff77
Merge pull request #15679 from nextcloud/feature/sub-admin-settings 
Make it possible to show admin settings for sub admins
 2019-05-24 15:37:46 +02:00
Roeland Jago Douma
b0c030cbb5
Check the actual status code for 204 and 304 
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>
 2019-05-24 15:18:32 +02:00
Morris Jobke
96e892770d
Merge pull request #15715 from nextcloud/s3-bucket-name 
Allow other code to use the s3 client from object store
 2019-05-24 15:03:22 +02:00
Morris Jobke
9c7503ea7e
Merge pull request #15706 from nextcloud/smb-hidden-files 
add option to show hidden files in SMB shares
 2019-05-24 14:59:13 +02:00
Robin Appelman
834db3af2c
add method to get bucket name from s3 storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-05-24 14:02:03 +02:00
Nextcloud bot
96d1921bb3
[tx-robot] updated from transifex 2019-05-24 02:13:40 +00:00
Robin Appelman
6d5579863e
add option to show hidden files in SMB shares 
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>
 2019-05-23 21:23:56 +02:00
Christoph Wurst
22ae682823
Make it possible to show admin settings for sub admins 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-23 20:31:40 +02:00
Roeland Jago Douma
96e51b5f6f
Redirect to the right token on public shares 
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>
 2019-05-23 13:49:04 +02:00
Morris Jobke
09974ae92d
Merge pull request #15699 from nextcloud/funding-yml 
Add funding.yml with Bountysource info
 2019-05-23 12:34:45 +02:00
Jan-Christoph Borchardt
6f13005a11
Add funding.yml with Bountysource info 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-23 12:19:03 +02:00
Georg Ehrke
7ec8e6d35b
Don't run repair step for every individual user, outsource that to background job 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-05-23 11:24:32 +02:00
Nextcloud bot
e38f55d788
[tx-robot] updated from transifex 2019-05-23 02:13:45 +00:00
Morris Jobke
237a493b6a
Merge pull request #15676 from nextcloud/revert/9609 
Revert "send invitations for shared calendars"
 2019-05-22 22:58:24 +02:00
Morris Jobke
3d306bfef3
Merge pull request #15684 from nextcloud/objectstore-expose-urn 
make ObjectStoreStorage::getURN public
 2019-05-22 22:49:40 +02:00
Morris Jobke
9a733b7f50
Merge pull request #12114 from RubenHoms/master 
Stop decryption when maintenance mode is enabled
 2019-05-22 22:32:13 +02:00
Morris Jobke
daaa14e921
Merge pull request #15506 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-0.11.1 
Bump nextcloud-vue from 0.8.0 to 0.11.1
 2019-05-22 22:00:40 +02:00
blizzz
755611866e
Merge pull request #15604 from nextcloud/fix/12682/fix-possible-override-of-uniquemember 
fixes possible override of uniqueMember by autodetection
 2019-05-22 19:09:28 +02:00
Jan-Christoph Borchardt
aba395faf0
Remove divider in app content list (Mail, Contacts, …) 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-22 17:44:14 +02:00
Morris Jobke
78c1492df9
Merge pull request #15682 from nextcloud/enh/15675/lazy_l10n 
Make the L10N loading lazy
 2019-05-22 14:11:48 +02:00
Morris Jobke
024fc27e9a
Merge pull request #15685 from nextcloud/fix/noid/redis-cluster-with-auth 
Allow redis cluster to use password
 2019-05-22 13:47:11 +02:00
Arthur Schiwon
54299f4e66
set the ldapGroupMemberAssocAttr for group tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-05-22 12:48:12 +02:00
Morris Jobke
e9e9b6a4b6
Allow redis cluster to use password 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-05-22 12:19:07 +02:00
Robin Appelman
06a119242e
make ObjectStoreStorage::getURN public 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-05-22 12:17:33 +02:00
Julius Härtl
23de9db7a7
Bump files_sharing bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-05-22 11:51:35 +02:00
Julius Härtl
0197448b85
Bump nextcloud-vue-collections 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-05-22 11:48:06 +02:00
John Molakvoæ (skjnldsv)
738ab1a0a0
Bump settings 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-05-22 11:48:06 +02:00
dependabot[bot]
c9fbd9212c
Bump nextcloud-vue from 0.8.0 to 0.11.1 
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>
 2019-05-22 11:48:04 +02:00
Roeland Jago Douma
b2cc5d8fb6
Make the L10N loading lazy 
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>
 2019-05-22 11:22:12 +02:00
Georg Ehrke
98a93d5226
Revert "send invitations for shared calendars" 
This reverts commit a9c313ce45.
 2019-05-22 09:02:25 +02:00
Nextcloud bot
f2885c171f
[tx-robot] updated from transifex 2019-05-22 02:13:52 +00:00
blizzz
f739783780
Merge pull request #15668 from nextcloud/fix/10832/l10n-on-settings-page 
Fix l10n for SettingsManager by injecting the l10n factory
 2019-05-22 00:50:44 +02:00
Morris Jobke
8c3c04596e
Fix l10n for SettingsManager by injecting the l10n factory 
Fixes #10832

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-05-21 22:25:13 +02:00
Morris Jobke
446dfd9d1d
Merge pull request #15651 from nextcloud/fix/quota/hover-feedback 
Remove quota feedback if no link set
 2019-05-21 21:03:14 +02:00
Morris Jobke
553543e85c
Merge pull request #15659 from nextcloud/version-backend-use 
add way for version backends to programmatically specify if they should be used
 2019-05-21 21:00:15 +02:00
Roeland Jago Douma
9daee196a3
Merge pull request #15660 from nextcloud/objectstore-get 
add method to get the used object store from the storage
 2019-05-21 20:02:50 +02:00
Morris Jobke
d3511f69f9
Merge pull request #15499 from nextcloud/app-update-script 
Add scripts to update server & apps or apps only
 2019-05-21 17:42:57 +02:00
Robin Appelman
439b341e89
add method to get the used object store from the storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-05-21 17:18:00 +02:00
Robin Appelman
ccfbee2af9
add way for version backends to programmatically specify if they should be used 
this allows for backends that should only be used if specific conditions are met

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-05-21 17:14:47 +02:00
John Molakvoæ (skjnldsv)
7ec3845494
Remove quota feedback if no link set 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-05-21 11:11:30 +02:00
Morris Jobke
ac92603014
Merge pull request #15638 from nextcloud/bugfix/7965/sharing-hide-if-empty 
Only show sharing section if it has content
 2019-05-21 10:33:07 +02:00
Ruben Homs
98047e8c1c
Stop decryption when maintenance mode is enabled, fixes #8311 
Signed-off-by: Ruben Homs <ruben@homs.codes>
 2019-05-21 09:24:50 +02:00
Roeland Jago Douma
50dbdeea46
Merge pull request #15104 from nextcloud/enh/remote_wipe 
Remote wipe support
 2019-05-21 08:36:31 +02:00
Nextcloud bot
af680f285e
[tx-robot] updated from transifex 2019-05-21 02:13:28 +00:00
Morris Jobke
11f861221e
Merge pull request #15601 from nextcloud/url-generation-oc-config 
dont use deprecated oc_config in url generation
 2019-05-20 23:44:55 +02:00
Roeland Jago Douma
f03eb7ec3c
Remote wipe support 
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>
 2019-05-20 20:50:27 +02:00
Julius Härtl
8f11d2a39b
Only show sharing section if it has content 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-05-20 18:07:24 +02:00
Robin Appelman
1799e1acaf
dont use deprecated oc_config in url generation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-05-20 14:01:14 +02:00