Christoph Wurst
4af8bf2468
Merge pull request #23403 from nextcloud/backport/23396/stable20
...
[stable20] VersioningTest.php:729 is unreliable and should be disabled
2020-10-13 11:45:24 +02:00
Morris Jobke
3fc4120ebb
VersioningTest:729 is unreliable and should be disabled
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-13 07:10:52 +00:00
Morris Jobke
f730812af3
Merge pull request #23281 from nextcloud/backport/23269/stable20
...
[stable20] Fix the user remove from group in UI
2020-10-13 00:29:44 +02:00
npmbuildbot[bot]
64da029df9
Compile assets
...
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-12 19:53:34 +00:00
Morris Jobke
a70bbf1f4b
Merge pull request #23388 from nextcloud/backport/23378/stable20
...
[stable20] Fix typo 'shared'
2020-10-12 21:50:14 +02:00
Morris Jobke
cf9c643793
Merge pull request #23390 from nextcloud/backport/23379/stable20
...
[stable20] Expose CLOUD federation for local users in the recent addressbook
2020-10-12 21:38:25 +02:00
John Molakvoæ (skjnldsv)
a9425c7ebf
Drop X-NEXTCLOUD-UID
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-12 18:51:53 +00:00
John Molakvoæ (skjnldsv)
a9a552ec95
Expose CLOUD federation for local users as well
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-12 18:51:53 +00:00
Morris Jobke
a7ff7c47ab
Fix code style
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-12 18:08:36 +00:00
Robin Windey
06895ef8cc
Fix typo 'shared'
2020-10-12 18:08:36 +00:00
kesselb
830d911507
Merge pull request #23383 from nextcloud/backport/23371/stable20
...
[stable20] Add Psalm type for the bootstrap registration context
2020-10-12 19:12:21 +02:00
Christoph Wurst
bab06f9bf9
Add Psalm type for the bootstrap registration context
...
This can potentially catch a few bugs with wrong class strings.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-12 15:16:34 +00:00
Morris Jobke
aff015661f
Merge pull request #23375 from nextcloud/backport/23310/stable20
...
[stable20] Add template typing to the QBMapper
2020-10-12 13:50:35 +02:00
Christoph Wurst
a1856176d5
Add template typing to the QBMapper
...
The QBMapper is kind of a generic type, though this concept does not
exist in php. Hence you have a lot of type coercion in subtypes (mappers
in the individual apps) because you suddenly don't expect an Entity[]
but your specific type.
Luckily Psalm lets us type those. Then in the subclass you can
psalm-implement the mapper with a concrete type and psalm will do all
the magic to ensure types are used correctly.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-12 11:12:35 +00:00
Roeland Jago Douma
e58134e0c9
Merge pull request #23288 from nextcloud/backport/23275/stable20
...
[stable20] Fix dashboard statuses sort
2020-10-08 20:06:03 +02:00
Julien Veyssier
07ad1978a8
fix dashboard statuses sort function
...
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-08 13:39:54 +00:00
Sujith Haridasan
22b24b8f5d
Fix the user remove from group in UI
...
Fix the removal of user from the group in UI.
Signed-off-by: Sujith Haridasan <sujith.h@gmail.com>
2020-10-08 11:21:02 +00:00
John Molakvoæ
c578b11fe3
Merge pull request #23271 from nextcloud/fix/sidebar-updateTabs
...
Fix sidebar updateTabs method
2020-10-08 12:25:59 +02:00
Roeland Jago Douma
2d2cba3c9b
Merge pull request #23256 from nextcloud/backport/23184/stable20
...
[stable20] Make sure getUsersFavoritingObject can be run without a user
2020-10-08 11:49:03 +02:00
John Molakvoæ (skjnldsv)
fbf77cb653
Fix sidebar updateTabs method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-08 09:36:24 +00:00
Joas Schilling
d68d62f052
Make sure getUsersFavoritingObject can be run without a user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-07 11:10:38 +00:00
Morris Jobke
f4891da160
Merge pull request #23254 from nextcloud/backport/23252/stable20
...
[stable20] Use the correct l10n for activities
2020-10-07 12:24:28 +02:00
Roeland Jago Douma
1f3e3e782f
Use the correct l10n for activities
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-07 09:37:23 +00:00
Roeland Jago Douma
f26998364b
Merge pull request #23216 from nextcloud/backport/23183/stable20
...
[stable20] Don't influence toastify errors and always use white
2020-10-07 11:06:53 +02:00
Morris Jobke
7581ba94f4
Merge pull request #23235 from nextcloud/backport/22974/stable20
...
[stable20] Fix appid in translation
2020-10-06 22:13:15 +02:00
Joas Schilling
f3060b62c6
Fix appid in translation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 18:55:40 +02:00
Morris Jobke
21f00069fe
Merge pull request #23213 from nextcloud/backport/22937/stable20
...
[stable20] Allow configuring the activity update interval of token
2020-10-06 16:07:54 +02:00
Roeland Jago Douma
ca32ee1a65
Merge pull request #23220 from nextcloud/backport/23215/stable20
...
[stable20] Only run the query to get the account data once
2020-10-06 14:46:06 +02:00
Roeland Jago Douma
ee1a6ad434
Merge pull request #23195 from nextcloud/backport/23175/stable20
...
[stable20] Fix legacy update notifications
2020-10-06 13:29:26 +02:00
Roeland Jago Douma
a81ec17235
Merge pull request #23170 from nextcloud/backport/22913/stable20
...
[stable20] add mount point to quota warning message
2020-10-06 13:18:12 +02:00
Roeland Jago Douma
3bd9297bb1
Merge pull request #23211 from nextcloud/backport/23096/stable20
...
[stable20] Also check the path based mimetype for flow rule checks
2020-10-06 13:07:11 +02:00
Joas Schilling
851acc1d74
Only run the query to get the account data once
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 10:48:24 +00:00
Joas Schilling
27854f05a8
Don't influence toastify errors and always use white
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 09:09:01 +00:00
Roeland Jago Douma
e0bc29d907
Allow configuring the activity update interval of token
...
On some systems with a lot of users this creates a lot of extra DB
writes.
Being able to increase this interval helps there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-06 08:04:12 +00:00
Morris Jobke
76fe051ecb
Merge pull request #23185 from nextcloud/backport/23109/stable20
...
[stable20] dont hold a transaction during the move to trash
2020-10-06 09:10:57 +02:00
Morris Jobke
853b17b2a9
Merge pull request #23207 from nextcloud/backport/23028/stable20
...
[stable20] Fix array to string conversion on event search
2020-10-06 09:09:34 +02:00
Julius Härtl
53ac186473
Make sure to check the mimetype on the path if a secure one could not be detemined though the content
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-06 06:08:04 +00:00
Joas Schilling
732cf6b8d3
Fix array to string conversion on event search
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-05 21:07:05 +00:00
Morris Jobke
20524cff33
Merge pull request #23203 from nextcloud/backport/23182/stable20
...
[stable20] Fix the user email issue while creating a user
2020-10-05 23:03:48 +02:00
Sujith Haridasan
c998209ec1
Fix the user email issue while creating a user
...
When the user is created, the provisioning api
was not adding the email address of the user
when provided if the `send email to new user`
is not set.
Signed-off-by: Sujith Haridasan <sujith.h@gmail.com>
2020-10-05 19:34:24 +00:00
Roeland Jago Douma
453aafee73
Fix unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-05 21:33:40 +02:00
Roeland Jago Douma
4f5a24bb50
Merge pull request #23192 from nextcloud/backport/23179/stable20
...
[stable20] Fix dashboard rendering if accessibility app is disabled
2020-10-05 20:01:30 +02:00
Julius Härtl
2070ef6270
Fix dashboard rendering if accessibility app is disabled
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-05 14:13:56 +00:00
mrtnmtth
608fab3741
Fix legacy update notifications
...
Signed-off-by: mrtnmtth <mrtn.mtth@gmx.de>
2020-10-05 14:07:51 +00:00
Robin Appelman
acef3620e0
dont hold a transaction during the move to trash
...
because moving to trash can take a long time, keeping a transaction active for the duration can lead to issues
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-10-05 15:25:36 +02:00
Robin Appelman
aec422a874
add mount point to quota warning message
...
makes it more clear to the user what the quota applies to
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-10-04 11:05:24 +00:00
Roeland Jago Douma
615b994816
Merge pull request #23071 from nextcloud/version/20.0.0/final
...
20 final
2020-10-02 18:42:10 +02:00
Roeland Jago Douma
c2eb39d662
Merge pull request #23143 from nextcloud/backport/23114/stable20
...
[stable20] Show icon only with dnd status in the message
2020-10-02 18:33:17 +02:00
Joas Schilling
d2bd0664be
Show the full status and icon all the time
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-02 17:18:43 +02:00
Julius Härtl
d3d7209be9
Show icon only with dnd status in the message
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-02 17:13:26 +02:00