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
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
1f3e3e782f
Use the correct l10n for activities
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-07 09:37:23 +00:00
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
7581ba94f4
Merge pull request #23235 from nextcloud/backport/22974/stable20
...
[stable20] Fix appid in translation
2020-10-06 22:13:15 +02:00
f3060b62c6
Fix appid in translation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 18:55:40 +02:00
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
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
ee1a6ad434
Merge pull request #23195 from nextcloud/backport/23175/stable20
...
[stable20] Fix legacy update notifications
2020-10-06 13:29:26 +02:00
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
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
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
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
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
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
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
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
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
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
bc0a429822
Add acutal response to BeforeTemplateRenderedEvent
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-05 19:53:05 +00:00
7b65eecf72
Only load user status script when needed
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-05 19:53:04 +00:00
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
453aafee73
Fix unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-05 21:33:40 +02:00
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
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
608fab3741
Fix legacy update notifications
...
Signed-off-by: mrtnmtth <mrtn.mtth@gmx.de>
2020-10-05 14:07:51 +00:00
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
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
615b994816
Merge pull request #23071 from nextcloud/version/20.0.0/final
...
20 final
2020-10-02 18:42:10 +02:00
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
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
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
2c149fbd9a
Merge pull request #23141 from nextcloud/backport/23136/stable20
...
[stable20] Mark all compiled JS as binary
2020-10-02 17:01:03 +02:00
998ab15206
Merge pull request #23132 from nextcloud/backport/23130/stable20
...
[stable20] Move online status into modal
2020-10-02 16:58:35 +02:00
d204e5855c
Mark all compiled JS as binary
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 13:41:55 +00:00
bb662c20fe
Bump @nextcloud/vue to v2.6.8
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-02 13:33:43 +02:00
097d62049d
Fix subline hint
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-02 13:22:42 +02:00
be778c94e1
Show the subline
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-02 12:50:29 +02:00
ac3a32f305
Set status is also there now
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 09:26:53 +00:00
28ae039588
Update @nextcloud/vue to 2.6.7
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 09:26:52 +00:00
1f0a5aeae3
Status: Add subline for Invisible to explain it properly
...
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
2020-10-02 09:26:50 +00:00
741ebf5177
Enable scrollbar for too long content, same way as in Dashboard customize
...
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
2020-10-02 09:26:50 +00:00
4817005733
Move online status into modal
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-02 09:26:50 +00:00
fa4cd4435b
Merge pull request #23089 from nextcloud/backport/23074/stable20
...
[stable20] Do not match sharees on an empty email address
2020-10-01 19:29:39 +02:00
61a0069dd5
Merge pull request #23115 from nextcloud/backport/23108/stable20
...
[stable20] Reset the user status when clearing the custom message
2020-10-01 19:23:51 +02:00
2433550eff
Merge pull request #23121 from nextcloud/backport/23112/stable20
...
[stable20] Increase the timeout of statuses
2020-10-01 15:09:51 +02:00
d7d805ef79
Increase the timeout of statuses
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-01 09:45:46 +00:00
612306d290
Merge pull request #23116 from nextcloud/backport/23113/stable20
...
[stable20] Change wording from 'custom status' to 'status message'
2020-10-01 08:29:27 +02:00
b66f5c55e5
Change wording from 'custom status' to 'status message'
...
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
Signed-off-by: Gary Kim <gary@garykim.dev>
2020-09-30 22:26:57 -04:00
413a6042f3
Reset the user status when clearing the custom message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-30 17:27:14 +00:00
Joas Schilling
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
Julius Härtl
Sujith Haridasan
mrtnmtth
Robin Appelman
John Molakvoæ (skjnldsv)
Jan C. Borchardt