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

49612 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Morris Jobke
ae7f89fd9f
Merge pull request #15615 from nextcloud/dependabot/npm_and_yarn/build/jsdoc-3.6.2 
Bump jsdoc from 3.6.1 to 3.6.2 in /build
 2019-05-20 13:44:04 +02:00
Roeland Jago Douma
9fce7014af
Merge pull request #15578 from nextcloud/3rdparty/openstack/3.0.6 
[3rdparty] Bump openstack to 3.0.6
 2019-05-20 13:26:24 +02:00
Roeland Jago Douma
faf49dd3d7
Merge pull request #15626 from nextcloud/update-crl 
Update CRL due to revoked cookbook.crt
 2019-05-20 12:41:40 +02:00
Morris Jobke
afdcb132dd
Update CRL due to revoked cookbook.crt 
See https://github.com/nextcloud/app-certificate-requests/pull/241

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-05-20 11:33:54 +02:00
John Molakvoæ
bb68f4c1de
Bump babel-loader from 8.0.5 to 8.0.6 (#15616) 
Bump babel-loader from 8.0.5 to 8.0.6
 2019-05-20 10:16:59 +02:00
Nextcloud bot
b47be33821
[tx-robot] updated from transifex 2019-05-20 02:13:14 +00:00
Nextcloud bot
a44bb8bdcd
[tx-robot] updated from transifex 2019-05-19 02:13:57 +00:00
dependabot[bot]
a04dd96283
Bump babel-loader from 8.0.5 to 8.0.6 
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>
 2019-05-19 01:13:49 +00:00
dependabot[bot]
cb53a582e6
Bump jsdoc from 3.6.1 to 3.6.2 in /build 
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>
 2019-05-19 01:13:24 +00:00
Nextcloud bot
db6c89ded0
[tx-robot] updated from transifex 2019-05-18 02:13:05 +00:00
Jan-Christoph Borchardt
fa066da77c
Fix app update script for macOS 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt
8f0656aae9
Remove eduplicate git fetch from update scripts 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt
bc61b15e2f
Adjust script to remove branches which are deleted on GitHub 
Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
 2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt
934924577a
Fix for update script when submodule is not initialized 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt
b403d72f51
Also add script to update both server and apps 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-17 22:49:38 +02:00
Jan-Christoph Borchardt
9f4ae034c1
Add script to update Nextcloud apps from latest git master, ref #15145 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-05-17 22:49:38 +02:00
Arthur Schiwon
3372bcc7fc
fixes possible override of uniqueMember by autodetection 
* 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>
 2019-05-17 16:19:23 +02:00
Roeland Jago Douma
49a379b339
[3rdparty] Bump openstack to 3.0.6 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-05-17 14:15:32 +02:00
Morris Jobke
a3b4410283
Merge pull request #15571 from nextcloud/enhancement/maintenance-mode-bundle 
Migrate the maintenance script to a modern module and bundle
 2019-05-17 14:08:58 +02:00