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

49568 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
528eb1b223
Merge pull request #15304 from nextcloud/enh/2fa_setup_at_login 
2FA setup during login
 2019-05-17 11:04:42 +02:00
Roeland Jago Douma
f9d30b946f
Merge pull request #15590 from nextcloud/enh/15480/delete_apptoken_ocs_endpoint 
Allow clients to delete their own apptoken
 2019-05-17 10:57:18 +02:00
Morris Jobke
0857d92a58
Merge pull request #15582 from nextcloud/bugfix/noid/update-shipped-apps 
Update shipped.json to include privacy and recommendations
 2019-05-17 10:49:06 +02:00
Roeland Jago Douma
579162d7b9
Allow 2FA to be setup on first login 
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>
 2019-05-17 10:11:53 +02:00
Roeland Jago Douma
2dcb4cfbd6
Allow clients to delete their own apptoken 
Fixes #15480

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-05-17 09:52:06 +02:00
Georg Ehrke
1ac913230e
Update shipped.json to include privacy, recommendations, viewer 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-05-17 09:00:02 +02:00
Nextcloud bot
e625164e85
[tx-robot] updated from transifex 2019-05-17 02:13:21 +00:00
Roeland Jago Douma
58658f1c78
Merge pull request #15564 from nextcloud/fix/noid/rephrase-unclear-error-msg 
User management/subadmin: rephrase ambiguous error message
 2019-05-16 19:47:51 +02:00
Christoph Wurst
0cfcccee29
Migrate the maintenance script to a modern module and bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-16 16:45:00 +02:00
Morris Jobke
633a198142
Merge pull request #15547 from nextcloud/3rdparty/aws/sdk/3.93.9 
[3rdparty] Bump AWS SDK to 3.93.9
 2019-05-16 16:26:58 +02:00
Nextcloud bot
7c7ea657ec
[tx-robot] updated from transifex 2019-05-16 12:50:48 +00:00
Arthur Schiwon
45110f4c5d
fixes misunderstanding of the error message 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-05-16 14:31:10 +02:00
Roeland Jago Douma
1e0c317fc1
[3rdparty] Bump AWS SDK to 3.93.9 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-05-16 10:02:48 +02:00
Nextcloud bot
856a33ec47
[tx-robot] updated from transifex 2019-05-16 02:13:30 +00:00
Roeland Jago Douma
51d0a44b30
Merge pull request #15552 from nextcloud/update-ca-bundle-checker 
Update ca bundle checker
 2019-05-15 22:33:11 +02:00
Daniel Kesselberg
bc35b59fc7
Remove whitespace 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-05-15 20:37:06 +02:00
Roeland Jago Douma
51143a95e7
Merge pull request #15548 from nextcloud/update-ca-bundle 
update ca bundle
 2019-05-15 20:26:52 +02:00
Roeland Jago Douma
3ad1a6f1df
Merge pull request #15526 from nextcloud/fix/noid/building-wfe-handlebars 
fix building WFE Handlebars
 2019-05-15 20:11:43 +02:00
Daniel Kesselberg
941018cfe5
Use DRONE_SOURCE_BRANCH instead of DRONE_COMMIT_REFSPEC 
Looks like DRONE_COMMIT_REFSPEC is not available anymore on Drone 1.x

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-05-15 19:56:20 +02:00
Daniel Kesselberg
3e9f9ea06b
Update regex to also match version/x.y.z 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-05-15 19:36:01 +02:00
Arthur Schiwon
406c68a512
update ca bundle 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-05-15 16:07:01 +02:00
Roeland Jago Douma
e8d187fdb3
Merge pull request #15537 from nextcloud/3rdparty/phpseclib-2.0.15 
[3rdparty] Bump phpseclib to 2.0.15
 2019-05-15 15:15:47 +02:00
Nextcloud bot
b5850a0318
[tx-robot] updated from transifex 2019-05-15 13:11:39 +00:00
Roeland Jago Douma
dcc54b4fd1
[3rdparty] Bump phpseclib to 2.0.15 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-05-15 14:16:20 +02:00
Roeland Jago Douma
9eb8e3e1f4
Merge pull request #15542 from nextcloud/refactor/legacy-ajax-error-handling-bundle 
Move legacy ajax error handling bundle and 🔥 js.js
 2019-05-15 13:17:57 +02:00
Arthur Schiwon
738ca9f849
fix building WFE Handlebars 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-05-15 11:24:12 +02:00
Christoph Wurst
334c4fddfe
Remove empty js.js 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-15 10:40:53 +02:00
Christoph Wurst
ab72bd64f5
Move legacy Ajax error handling logic to the bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-15 10:40:15 +02:00
John Molakvoæ
b5fed59812
Move OC.appSettings to the bundle and deprecate it (#15533) 
Move OC.appSettings to the bundle and deprecate it
 2019-05-15 10:10:29 +02:00
Roeland Jago Douma
1cfc59c3ad
Merge pull request #15497 from nextcloud/3rdparty/doctrine/dbal-292 
[3rdparty] Doctrine dbal to 2.9.2
 2019-05-15 08:57:13 +02:00
Roeland Jago Douma
9fe4d8e7a1
Merge pull request #15336 from epma01/redis-patch 
Fix Redis with unix socket #730
 2019-05-15 08:43:20 +02:00
Christoph Wurst
07699c199d
Move OC.appSettings to the bundle and deprecate it 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-14 22:00:22 +02:00
Roeland Jago Douma
b8c01dc2cd
Merge pull request #15531 from nextcloud/refactor/remove-js-js-ocp 
Remove OCP (re)declaration from js.js
 2019-05-14 21:05:53 +02:00
Roeland Jago Douma
b06aebbe60
Merge pull request #15532 from nextcloud/refactor/oc-query-string-helpers-bundle 
Move query string helpers to the bundle
 2019-05-14 21:05:26 +02:00
Alejandro Varela
f6d069ee58 Fix Redis with unix socket 
Signed-off-by: Alejandro Varela <epma01@gmail.com>
 2019-05-14 18:59:17 +02:00
Christoph Wurst
291c4a121e
Move query string helpers to the bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-14 18:18:31 +02:00
Christoph Wurst
d9accd306e
Remove OCP (re)declaration from js.js 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-14 15:29:18 +02:00
John Molakvoæ
f08aed74d7
Move OC.theme to the bundle and deprecate oc_defaults (#15525) 
Move OC.theme to the bundle and deprecate oc_defaults
 2019-05-14 15:24:46 +02:00
Roeland Jago Douma
d11caf1a3a
No need for platform hacks anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-05-14 12:24:43 +02:00
Roeland Jago Douma
b50a11d852
[3rdparty] Doctrine dbal to 2.9.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-05-14 12:24:43 +02:00
Christoph Wurst
0f3e438f7c
Move OC.theme to the bundle and deprecate oc_defaults 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-14 11:14:29 +02:00
Roeland Jago Douma
c41aa7a209
Merge pull request #15524 from nextcloud/refactor/oc-add-translations-bundle-deprecate 
Deprecate OC.fileIsBlacklisted and move it to the bundle
 2019-05-14 11:00:22 +02:00
Christoph Wurst
2f5df9387d
Deprecate OC.fileIsBlacklisted and move it to the bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-05-14 10:07:56 +02:00
Christoph Wurst
c2177caf52
Merge pull request #15523 from nextcloud/refactor/oc-add-translations-bundle-deprecate 
Move OC.addTranslations to the bundle and deprecate it
 2019-05-14 10:04:51 +02:00