upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
42437 commits 951 branches 1208 tags 8.3 GiB
Commit graph

14945 commits

Author SHA1 Message Date
Nextcloud bot
d8d09475c4
[tx-robot] updated from transifex 2018-05-09 00:11:50 +00:00
Morris Jobke
7bf713edaf
Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13 
[13] Log lock state on conflict
 2018-05-07 16:29:42 +02:00
Robin Appelman
a6ea5eb1b5
remove unneeded locks in getCacheEntry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 15:06:39 +02:00
Robin Appelman
bc1a17a9e2
always log locking errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:35:26 +02:00
Robin Appelman
a070c1177a
Log more info about locking conflicts for memcache locking backends 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 13:35:26 +02:00
Roland Tapken
cc54429646 Issue #9318: catch exceptions in SCSSCacher::resetCache() 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-05-03 11:02:53 +02:00
Nextcloud bot
8029998a60
[tx-robot] updated from transifex 2018-04-27 00:12:15 +00:00
Nextcloud bot
cc533aad3b
[tx-robot] updated from transifex 2018-04-22 00:12:14 +00:00
Nextcloud bot
8c0624149f
[tx-robot] updated from transifex 2018-04-21 00:12:06 +00:00
Morris Jobke
26c153667a
Merge pull request #9231 from nextcloud/13-9205 
[stable13] Provide an option to disable HTML emails
 2018-04-18 22:38:33 +02:00
Roeland Jago Douma
a1c4bdfdf8
Merge pull request #9233 from nextcloud/13-9159 
[stable13] fix appinfo parsing when a single localized option is provided
 2018-04-18 21:18:37 +02:00
Robin Appelman
5fbba7854b
fix appinfo parsing when a single localized option is provided 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-18 17:32:19 +02:00
Morris Jobke
01278056a5
Provide an option to disable HTML emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-18 16:59:34 +02:00
Joas Schilling
6b97429ebe
Show EOL warning in the update section 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 13:46:25 +02:00
Nextcloud bot
7f2838cf68
[tx-robot] updated from transifex 2018-04-07 00:12:12 +00:00
John Molakvoæ
d45a889fe2
Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names 
[stable13] Show group display names
 2018-04-06 15:14:12 +02:00
Morris Jobke
b9ca121671
Merge pull request #9095 from JaredBoone/bugfix/8387 
Do not convert email addresses with idn_to_ascii if…
 2018-04-06 11:44:51 +02:00
Jared Boone
52c7f17faf Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined. 
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
 2018-04-05 11:28:31 -07:00
Morris Jobke
bb656750f5
Add more logging for the object storage during creation of the buckets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-05 17:29:44 +02:00
Roeland Jago Douma
41b37c905c
Allow usage of Windows 10 WebDav Netdrive 
Fixes #3523

As long as we don't have #8123 lets not leave our Window10 netdrive
users hanging.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-05 13:51:22 +02:00
Morris Jobke
4732a34b04
Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13 
[stable13] Move on with the next user if we found the user on one user back-end
 2018-04-05 08:13:26 +02:00
Nextcloud bot
2c6a534d5d
[tx-robot] updated from transifex 2018-04-05 00:12:13 +00:00
Bjoern Schiessle
bd0672530b
Move on with the next user if we found the user on one user back-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-04 17:13:47 +02:00
Roeland Jago Douma
5a74b9cb99
Fix proper permissions for multiple file access 
Fixes #8890

In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write

Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:02:37 +02:00
Bjoern Schiessle
d4f64b94f2
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-03 18:12:16 +02:00
Morris Jobke
7bb8ce0e67
Merge pull request #9015 from nextcloud/backport-apps-versions 
[stable13] Use app version to generate scss filename
 2018-04-03 10:28:17 +02:00
Nextcloud bot
e5684a9287
[tx-robot] updated from transifex 2018-04-03 00:12:13 +00:00
Nextcloud bot
9c1c47400f
[tx-robot] updated from transifex 2018-04-02 00:12:13 +00:00
Nextcloud bot
77bdbb6443
[tx-robot] updated from transifex 2018-03-31 00:14:19 +00:00
John Molakvoæ (skjnldsv)
05f76b3469
Use app version to generate scss filename 
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-28 16:11:10 +02:00
Nextcloud bot
b3ffcda8ff
[tx-robot] updated from transifex 2018-03-22 01:12:05 +00:00
Nextcloud bot
684f6b6429
[tx-robot] updated from transifex 2018-03-21 01:12:19 +00:00
Arthur Schiwon
e2e27004ff
the FN is optional, carrying the displayname if present 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-03-20 14:35:46 +01:00
Nextcloud bot
23022d5dd7
[tx-robot] updated from transifex 2018-03-17 01:11:55 +00:00
Nextcloud bot
f66af48d49
[tx-robot] updated from transifex 2018-03-13 01:12:30 +00:00
Joas Schilling
63089821a4
Correctly return the group name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-12 12:01:19 +01:00
Joas Schilling
97dbaa26c4
Show the displayname in the users group list 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-12 12:00:54 +01:00
Morris Jobke
b0f0c26fe3
Merge pull request #8745 from nextcloud/stable13-8716 
[13] Remove base url from global cache prefix
 2018-03-09 16:15:48 +01:00
Morris Jobke
6176296c80
Merge pull request #8749 from nextcloud/backport/8596/sharee-email-matches-not-limited 
[stable13] Sharee email matches not limited
 2018-03-09 11:29:15 +01:00
Julius Härtl
e2728aaf38
Merge pull request #8746 from nextcloud/8705_13 
[stable13] Check if the cached js file exists
 2018-03-09 10:37:15 +01:00
Morris Jobke
4fa0cac17c
Merge pull request #8725 from nextcloud/objectstore-no-part-files-13 
[13]  disable part files for object stores
 2018-03-09 10:34:33 +01:00
Joas Schilling
a2f3f0a681
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-09 10:16:42 +01:00
Joas Schilling
932fcc9859
Add the users result only when non empty so tests stay the same 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-09 10:15:25 +01:00
Joas Schilling
5b6590f1e9
Also array_slice wide email matches of local users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-09 10:15:04 +01:00
Roeland Jago Douma
2d7d8ca125
Check if the cached js file exists 
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 09:44:32 +01:00
Julius Härtl
b14e4ec6a6
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-09 09:24:07 +01:00
Julius Härtl
a098b57817
Use JSCombiner from server container when searching for JS files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-09 09:24:07 +01:00
Julius Härtl
c4539c34c9
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-09 09:24:06 +01:00
Nextcloud bot
b593fd1406
[tx-robot] updated from transifex 2018-03-09 01:12:37 +00:00
Robin Appelman
a95ccf4248
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-08 13:09:02 +01:00