upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 10:49:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
53168 commits 979 branches 1211 tags 8.7 GiB
Commit graph

53168 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
b42e2edab5
Merge pull request #23516 from nextcloud/backport/23478/stable18 
[stable18] Clear cached app config while waiting for the SCSSCache lock to return
 2020-10-16 20:35:14 +02:00
Morris Jobke
afeafd91a4
Clear cached app config while waiting for the SCSSCache to finish processing the file 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 18:28:54 +02:00
Morris Jobke
20043ac401
Merge pull request #23512 from nextcloud/backport/23488/stable18 
[stable18] SCSSCacher - Lock should not be removed
 2020-10-16 14:56:04 +02:00
Morris Jobke
cf26392b98 SCSSCacher - Lock should not be removed 
This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 11:32:27 +00:00
Morris Jobke
6a1cac620e
Merge pull request #23506 from nextcloud/backport/23490/stable18 
[stable18] Provide log statements for SCSS cache
 2020-10-16 13:24:11 +02:00
Morris Jobke
b81d0fab9d
Merge pull request #23500 from nextcloud/backport/23492/stable18 
[stable18] SharedMountTest.php:367 is unreliable
 2020-10-16 10:56:54 +02:00
Morris Jobke
8c44b2ee1f Provide log statements for SCSS cache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 07:55:34 +00:00
Morris Jobke
d544b56260
SharedMountTest.php:367 is unreliable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 09:25:31 +02:00
Nextcloud bot
6627c351f8
[tx-robot] updated from transifex 2020-10-16 02:18:35 +00:00
Nextcloud bot
c391e73337
[tx-robot] updated from transifex 2020-10-15 02:18:49 +00:00
Morris Jobke
311cf8280d
Merge pull request #23437 from nextcloud/backport/18816+20720+21221/stable18 
[stable18] Use paginated search for contacts + fixes
 2020-10-14 21:24:51 +02:00
Christoph Wurst
f0a16b3c11
Merge pull request #23386 from nextcloud/backport/23284/stable18 
[stable18] Fix adminpass strengthify margin
 2020-10-14 15:59:22 +02:00
Joas Schilling
d78b5e0030
Fix pagination of contacts search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-14 14:03:11 +02:00
Joas Schilling
d683026bda
Temporary fix contacts search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-14 14:02:30 +02:00
Julius Härtl
b66f4cf2dc
Use paginated search for contacts 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-10-14 14:02:08 +02:00
Nextcloud bot
7768388816
[tx-robot] updated from transifex 2020-10-14 02:19:15 +00:00
Nextcloud bot
57002d1b39
[tx-robot] updated from transifex 2020-10-13 19:34:05 +00:00
Morris Jobke
d11d9884e5
Merge pull request #23423 from nextcloud/backport/22057/stable18 
[stable18] contactsmanager shall limit number of results early
 2020-10-13 21:15:29 +02:00
Arthur Schiwon
fb39aec4fd contactsmanager shall limit number of results early 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-10-13 15:45:02 +00:00
Morris Jobke
a79a6d5f34
Merge pull request #23405 from nextcloud/backport/23396/stable18 
[stable18] VersioningTest.php:729 is unreliable and should be disabled
 2020-10-13 17:36:32 +02:00
Morris Jobke
ca39ca4e98 VersioningTest:729 is unreliable and should be disabled 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-13 07:15:35 +00:00
Nextcloud bot
b7979a422f
[tx-robot] updated from transifex 2020-10-13 02:18:57 +00:00
Richard Steinmetz
d0af402362 Fix adminpass strengthify margin 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2020-10-12 15:43:41 +00:00
Nextcloud bot
c48a750ca9
[tx-robot] updated from transifex 2020-10-12 02:18:22 +00:00
Nextcloud bot
cef592b994
[tx-robot] updated from transifex 2020-10-11 02:19:00 +00:00
Nextcloud bot
1a72842f19
[tx-robot] updated from transifex 2020-10-10 02:19:01 +00:00
Nextcloud bot
886999a637
[tx-robot] updated from transifex 2020-10-09 02:19:03 +00:00
Roeland Jago Douma
e61ac0275c
Merge pull request #23262 from nextcloud/version/18.0.10/final 
18.0.10
 2020-10-08 09:09:17 +02:00
Nextcloud bot
c16c19a307
[tx-robot] updated from transifex 2020-10-08 02:19:02 +00:00
Roeland Jago Douma
f96f654a78
18.0.10 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-07 11:49:46 +02:00
Nextcloud bot
e8e4e37d34
[tx-robot] updated from transifex 2020-10-07 02:18:32 +00:00
Roeland Jago Douma
5cd316d506
Merge pull request #23224 from nextcloud/version/18.0.10/RC2 
18.0.10 RC2
 2020-10-06 19:32:58 +02:00
Roeland Jago Douma
b602be99f1
Merge pull request #23227 from nextcloud/backport/22983/stable18 
[stable18] Sync all users to the system addresssbook
 2020-10-06 19:30:24 +02:00
Morris Jobke
f415a6e591
Merge pull request #23218 from nextcloud/backport/23183/stable18 
[stable18] Don't influence toastify errors and always use white
 2020-10-06 15:54:24 +02:00
Roeland Jago Douma
806fc59709
Merge pull request #23222 from nextcloud/backport/23215/stable18 
[stable18] Only run the query to get the account data once
 2020-10-06 13:52:12 +02:00
Joas Schilling
c255dd3606
Sync all users to the system addresssbook 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-06 13:31:11 +02:00
Roeland Jago Douma
e8da311bd0
18.0.10 RC2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-06 13:09:04 +02:00
Joas Schilling
90fc06eb7c Only run the query to get the account data once 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-06 10:53:26 +00:00
Joas Schilling
00bd441890 Don't influence toastify errors and always use white 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-06 09:09:15 +00:00
Nextcloud bot
befd1aef42
[tx-robot] updated from transifex 2020-10-06 02:18:55 +00:00
Nextcloud bot
291b34e383
[tx-robot] updated from transifex 2020-10-05 02:19:00 +00:00
Nextcloud bot
65e0ac9158
[tx-robot] updated from transifex 2020-10-04 02:18:33 +00:00
Nextcloud bot
2322811b84
[tx-robot] updated from transifex 2020-10-02 11:06:39 +00:00
Roeland Jago Douma
c774559adf
Merge pull request #23139 from nextcloud/fix/18/settings_ignore_js 
[stable18] Fix ignoring the correct settings files for translations
 2020-10-02 12:44:51 +02:00
Roeland Jago Douma
50f29556f7
[stable18] Fix ignoring the correct settings files for translations 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-02 12:35:58 +02:00
Roeland Jago Douma
4d0e897057
Merge pull request #23076 from nextcloud/version/18.0.10/RC1 
18.0.10 RC1
 2020-10-01 15:23:38 +02:00
Roeland Jago Douma
07c188e7e3
Merge pull request #22443 from nextcloud/backport/22421/stable18 
[stable18] show better quota warning for group folders and external storage
 2020-10-01 15:11:16 +02:00
Roeland Jago Douma
79660f6828
Merge pull request #23088 from nextcloud/backport/23013/stable18 
[stable18] Show federation and email results also with exact user match unless c…
 2020-10-01 11:11:14 +02:00
Roeland Jago Douma
301deeeb0e
Merge pull request #22942 from nextcloud/backport/22395/stable18 
[stable18] Fix settings chunk loading
 2020-10-01 10:52:00 +02:00
Joas Schilling
af2868cb0e
Show federation and email results also with exact user match unless containing @ 
Before when you have a user "smith" and a federated user "smith@example.com"
you could see the federation result with "smit" but not with "smith" anymore.
With most LDAP configurations and local backend setups this is disturbing and
causes issues.
The idea of not showing the email and federation on a matching user was with:
Local user registered with "smith@example.com" user id and having that same
email / cloud id in your contacts addressbook. So we now only hide those
"side results" when the search does contain an @

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-01 09:34:44 +02:00