upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-11 14:54:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
52425 commits 694 branches 1182 tags 8.3 GiB
Commit graph

21785 commits

Author SHA1 Message Date
Robin Appelman
bd201879ca remove the requirement that everything that looks like a placeholder is substituted 
While maybe not common, `$` is a valid option in config fields

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-18 16:11:27 +00:00
Roeland Jago Douma
5e184c58e2
Merge pull request #20008 from nextcloud/backport/19964/stable18 
[stable18] Fix invalid instantiation of TemplateResponse if client not found
 2020-03-18 13:36:10 +01:00
Joas Schilling
2c1de970bb
Merge pull request #19999 from nextcloud/backport/19987/stable18 
[stable18] Only do regular polling of storage statistics if session_keepalive is enabled
 2020-03-18 12:49:40 +01:00
Nextcloud bot
711c0a0417
[tx-robot] updated from transifex 2020-03-18 02:21:17 +00:00
Roeland Jago Douma
6d0c8fc13b
Merge pull request #20001 from nextcloud/backport/19989/stable18 
[stable18] Fix single "ScopeContext" passed to "setScopes"
 2020-03-17 21:27:02 +01:00
Daniel Kesselberg
280444b82f Fix invalid instantiation of TemplateResponse if client not found 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-03-17 18:39:32 +00:00
Roeland Jago Douma
4ce142202b
Merge pull request #19998 from nextcloud/backport/19995/stable18 
[stable18] Default value of lookupServerEnabled should be the same everywhere
 2020-03-17 18:27:22 +01:00
Daniel Calviño Sánchez
2106e6ce04 Fix single "ScopeContext" passed to "setScopes" 
"setScopes" expects an array, but a single "ScopeContext" was being
passed instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-17 14:09:58 +00:00
Julius Härtl
dca0f7e760 Only do regular polling of storage statistics if session_keepalive is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-17 14:08:22 +00:00
Georg Ehrke
8143cf5fa3 Default value of lookupServerEnabled should be the same everywhere 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-03-17 14:07:39 +00:00
Roeland Jago Douma
d5a8507359
Merge pull request #19982 from nextcloud/backport/19698/stable18 
[stable18] Fix default action for deleted shares
 2020-03-17 15:07:29 +01:00
Nextcloud bot
ef515358ef
[tx-robot] updated from transifex 2020-03-17 02:18:53 +00:00
GretaD
045314990e Fix default action for deleted shares 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-03-16 13:33:29 +00:00
Nextcloud bot
34e590935a
[tx-robot] updated from transifex 2020-03-16 02:21:20 +00:00
Roeland Jago Douma
97eb9c7543
Merge pull request #19933 from nextcloud/backport/19907/stable18 
[stable18] Don't allow anchors and queries in remote urls
 2020-03-15 13:39:01 +01:00
Roeland Jago Douma
7b5f56b216
Merge pull request #19940 from nextcloud/backport/19931/stable18 
[stable18] fix external storage controller tests
 2020-03-15 13:08:05 +01:00
Nextcloud bot
80852f9f66
[tx-robot] updated from transifex 2020-03-15 02:19:25 +00:00
Robin Appelman
86dd724e10 properly set 'hide_download' as integer 
the database field is a smallint, not a boolean.

fixes postgresql tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-14 08:19:49 +00:00
Nextcloud bot
c24a30e0d7
[tx-robot] updated from transifex 2020-03-14 02:18:14 +00:00
Robin Appelman
d54eca93b2 fix external storage controller tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-13 18:45:54 +00:00
Joas Schilling
eb105e7eb4 Fix willReturnOnConsecutiveCalls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-13 14:53:09 +00:00
Joas Schilling
8bae6937f8 Don't allow anchors and queries in remote urls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-13 14:53:09 +00:00
Roeland Jago Douma
caf68bd68b
Merge pull request #19921 from nextcloud/backport/19914/stable18 
[stable18] Properly respect hide download on sharebymail
 2020-03-13 13:40:10 +01:00
Roeland Jago Douma
68169ac2f8
Merge pull request #19922 from nextcloud/backport/19915/stable18 
[stable18] Use placeholder values for password fields in external storage webui
 2020-03-13 13:39:44 +01:00
John Molakvoæ
97e7fdb6c6
Merge pull request #19897 from nextcloud/backport/19777/stable18 
[stable18] Properly emit Viewer event on files and files_sharing
 2020-03-13 11:55:52 +01:00
Joas Schilling
cbdff5c816
Merge pull request #19886 from nextcloud/backport/19861/stable18 
[stable18] Don't break when one remote share is down
 2020-03-13 11:27:08 +01:00
Robin Appelman
ca9272d147 Use placeholder values for password fields in external storage webui 
This prevents the password from being sent to the webui.

While an admin will always be able to retrieve the passwords (as they
can do arbitrairy code execution by design) this prevents casual
password snooping

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-13 09:56:03 +00:00
Roeland Jago Douma
7a1a3c7e75 Properly respect hide download on sharebymail 
fixes #19484

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-13 09:17:56 +00:00
Roeland Jago Douma
b54fdae062
Merge pull request #19882 from nextcloud/backport/18555/stable18 
[stable18]  Allow to edit admin/own user in the user management
 2020-03-12 10:57:54 +01:00
Roeland Jago Douma
126ad3332a
Merge pull request #19879 from nextcloud/backport/19173/stable18 
[stable18] Use contacts name on federated activities
 2020-03-12 10:28:35 +01:00
Roeland Jago Douma
d9f3ed390a
Merge pull request #19884 from nextcloud/backport/19704/stable18 
[stable18] Fix hostname in Apple configuration profile
 2020-03-12 10:27:44 +01:00
John Molakvoæ (skjnldsv)
c4f1389289 Use dispatchTyped 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-03-12 07:48:20 +00:00
John Molakvoæ (skjnldsv)
f74876eb3c Properly emit Viewer event on files and files_sharing 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-03-12 07:48:19 +00:00
John Molakvoæ (skjnldsv)
1125f1767c Fix import order and formatting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-03-12 07:48:19 +00:00
Nextcloud bot
b258e2f541
[tx-robot] updated from transifex 2020-03-12 02:19:13 +00:00
Joas Schilling
e96bb6c8bc Don't break when one remote share is down 
getFileInfo can also return false

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-11 08:38:14 +00:00
Nils Wittenbrink
fb3cf8ca28 Fix test 
Signed-off-by: Nils Wittenbrink <nilswittenbrink@web.de>
 2020-03-11 08:31:47 +00:00
Nils Wittenbrink
372a3ddd50 Fix hostname given in Apple config file 
Signed-off-by: Nils Wittenbrink <nilswittenbrink@web.de>
 2020-03-11 08:31:46 +00:00
Julius Härtl
e8a069e3dd
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-11 09:02:32 +01:00
Julius Härtl
c3c3d218d5
Fix row height and display name input 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-11 09:01:35 +01:00
Julius Härtl
0e53b6983e
Allow to edit admin/own user in the user management 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-11 09:01:27 +01:00
Nextcloud bot
9f8ca72feb
[tx-robot] updated from transifex 2020-03-11 02:19:15 +00:00
Joas Schilling
d2687d69ab Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-10 19:32:05 +00:00
Joas Schilling
26568fa08b Unify the code a bit 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-10 19:32:05 +00:00
Joas Schilling
33b048dd1c Use contacts name on federated activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-10 19:32:05 +00:00
Nextcloud bot
06dd4affeb
[tx-robot] updated from transifex 2020-03-10 02:18:22 +00:00
Roeland Jago Douma
f3f56a97ea
Merge pull request #19824 from nextcloud/backport/19763/stable18 
[stable18] Fix "Error loading the shares list TypeError: "this is undefined"" fo…
 2020-03-09 09:59:03 +01:00
Roeland Jago Douma
7c98f98527
Merge pull request #19803 from nextcloud/backport/stable18/19769 
[stable18] Fix avatar in file list for users with an @ in the uid
 2020-03-09 09:03:15 +01:00
Nextcloud bot
da96dee368
[tx-robot] updated from transifex 2020-03-09 02:18:17 +00:00
Nextcloud bot
7017055915
[tx-robot] updated from transifex 2020-03-08 02:18:37 +00:00