John Molakvoæ
2eb64ee794
Merge branch 'master' into dependabot/npm_and_yarn/marked-1.2.0
2020-10-03 13:28:45 +02:00
Roeland Jago Douma
2a079dfa50
Merge pull request #23031 from nextcloud/dependabot/npm_and_yarn/moment-2.29.0
...
Bump moment from 2.27.0 to 2.29.0
2020-10-03 13:26:49 +02:00
dependabot-preview[bot]
0fdfc74011
Bump marked from 1.1.1 to 1.2.0
...
Bumps [marked](https://github.com/markedjs/marked ) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/markedjs/marked/releases )
- [Commits](https://github.com/markedjs/marked/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-03 11:15:19 +00:00
dependabot-preview[bot]
020ba0847b
Bump moment from 2.27.0 to 2.29.0
...
Bumps [moment](https://github.com/moment/moment ) from 2.27.0 to 2.29.0.
- [Release notes](https://github.com/moment/moment/releases )
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/moment/moment/compare/2.27.0...2.29.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-03 11:00:34 +00:00
John Molakvoæ
734c479574
Merge pull request #23149 from nextcloud/dependabot/npm_and_yarn/sinon-9.1.0
...
Bump sinon from 9.0.3 to 9.1.0
2020-10-03 12:48:22 +02:00
Roeland Jago Douma
5e44831b45
Merge pull request #23150 from nextcloud/dependabot/npm_and_yarn/vue-router-3.4.5
...
Bump vue-router from 3.4.4 to 3.4.5
2020-10-03 12:01:58 +02:00
dependabot-preview[bot]
d0574fb5d5
Bump vue-router from 3.4.4 to 3.4.5
...
Bumps [vue-router](https://github.com/vuejs/vue-router ) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/vuejs/vue-router/releases )
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/vuejs/vue-router/compare/v3.4.4...v3.4.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-03 09:50:40 +00:00
Roeland Jago Douma
403aee1585
Merge pull request #23142 from nextcloud/fix/23140/multiple-inline-translations
...
Split dashboard attributions in multiple lines
2020-10-03 11:31:47 +02:00
Nextcloud bot
e819a0cad0
[tx-robot] updated from transifex
2020-10-03 02:19:27 +00:00
dependabot-preview[bot]
de1ade0736
Merge pull request #23148 from nextcloud/dependabot/npm_and_yarn/eslint-plugin-import-2.22.1
2020-10-03 02:01:32 +00:00
dependabot-preview[bot]
6e93c1fbd4
Bump sinon from 9.0.3 to 9.1.0
...
Bumps [sinon](https://github.com/sinonjs/sinon ) from 9.0.3 to 9.1.0.
- [Release notes](https://github.com/sinonjs/sinon/releases )
- [Changelog](https://github.com/sinonjs/sinon/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sinonjs/sinon/compare/v9.0.3...v9.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-03 01:17:02 +00:00
dependabot-preview[bot]
f8fc5a6089
Bump eslint-plugin-import from 2.22.0 to 2.22.1
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.22.0 to 2.22.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.22.0...v2.22.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-03 01:16:05 +00:00
Christian Wenz
8aa13f37b0
Add apple-touch-icon-precomposed ( fixes #14818 )
...
Signed-off-by: Christian Wenz <christian@wenz.org>
2020-10-02 21:49:14 +02:00
Daniel Kesselberg
64b10f61df
Update signature for set
...
also ILiteral and IQueryFunction are valid.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-02 19:15:34 +02:00
Daniel Kesselberg
8fdb74bdd5
Update signature for in/notIn
...
$y is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-02 19:09:28 +02:00
Daniel Kesselberg
d14c971ad6
Update signature for like/notLike/in/notIn
...
$x is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-02 18:59:53 +02:00
Nextcloud bot
7819305eba
[tx-robot] updated from transifex
2020-10-02 15:28:57 +00:00
Roeland Jago Douma
0f7e2f3364
Merge pull request #23114 from nextcloud/bugfix/noid/user_status-show-icon
...
Show icon only with dnd status in the message
2020-10-02 16:58:03 +02:00
Julien Veyssier
e97fb669e1
refs #23140 split dashboard attributions in multiple lines to allow translation parsing
...
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2020-10-02 15:55:52 +02:00
Joas Schilling
2cd0f8dba7
Merge pull request #23136 from nextcloud/mark-all-compiled-js-as-binary
...
Mark all compiled JS as binary
2020-10-02 15:39:38 +02:00
Joas Schilling
97f9b18e9e
Show the full status and icon all the time
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 14:14:00 +02:00
Julius Härtl
0afccb5d9a
Show icon only with dnd status in the message
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-02 13:35:16 +02:00
Roeland Jago Douma
0de44a8014
Merge pull request #23135 from nextcloud/fix/user-status
...
Fix subline hint
2020-10-02 13:16:48 +02:00
Nextcloud bot
0d05c600d6
[tx-robot] updated from transifex
2020-10-02 11:06:18 +00:00
John Molakvoæ (skjnldsv)
4addaf2ca4
Bump @nextcloud/vue to v2.6.8
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-02 12:21:22 +02:00
Joas Schilling
94353362d7
Mark all compiled JS as binary
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 12:21:05 +02:00
John Molakvoæ (skjnldsv)
9dfea4e982
Fix subline hint
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-02 12:13:53 +02:00
Roeland Jago Douma
905e1918d2
Merge pull request #23130 from nextcloud/fix/user-status
...
Move online status into modal
2020-10-02 11:24:29 +02:00
Joas Schilling
95a301ea57
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 10:37:18 +02:00
Joas Schilling
e9c7fa0f04
Show the subline
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 09:31:43 +02:00
Joas Schilling
7255666557
Set status is also there now
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 09:12:03 +02:00
Joas Schilling
dab344f674
Update @nextcloud/vue to 2.6.7
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 09:08:22 +02:00
Iscle
0e5d692866
DirectController: Verify that expirationTime is between 0s and 24h
...
Signed-off-by: Iscle <albertiscle9@gmail.com>
2020-10-01 23:48:41 +02:00
Jan C. Borchardt
56670fc904
Status: Add subline for Invisible to explain it properly
...
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
2020-10-01 23:36:35 +02:00
Jan C. Borchardt
b1d0fd27c1
Enable scrollbar for too long content, same way as in Dashboard customize
...
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
2020-10-01 23:34:19 +02:00
John Molakvoæ (skjnldsv)
f240794f2b
Move online status into modal
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-01 22:19:05 +02:00
Daniel Kesselberg
00bca0fe3e
Another test for user live status listener
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-01 21:27:45 +02:00
Roeland Jago Douma
5451dcbec5
Merge pull request #23112 from nextcloud/bugfix/noid/increase-timeout-of-statuses
...
Increase the timeout of statuses
2020-10-01 11:43:36 +02:00
Joas Schilling
0c7c358d13
Increase the timeout of statuses
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-01 08:54:35 +02:00
Nextcloud bot
6b7d91d7c1
[tx-robot] updated from transifex
2020-10-01 02:18:34 +00:00
Roeland Jago Douma
f11a05553e
Merge pull request #23113 from nextcloud/design/status-wording
...
Change wording from 'custom status' to 'status message'
2020-09-30 19:28:30 +02:00
Joas Schilling
da2c88ef28
Merge pull request #23108 from nextcloud/bugfix/noid/reset-user-status-when-message-is-empty
...
Reset the user status when clearing the custom message
2020-09-30 19:24:57 +02:00
Jan C. Borchardt
9a517d5b35
Change wording from 'custom status' to 'status message'
...
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
2020-09-30 16:49:41 +02:00
Robin Appelman
e0d688c365
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-09-30 14:30:54 +02:00
Joas Schilling
32b577a5df
Reset the user status when clearing the custom message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-30 14:12:02 +02:00
Joas Schilling
aeb7329b3d
Merge pull request #23104 from nextcloud/bugfix/noid/bump-nextcloud-vue
...
Bump @nextcloud/vue to 2.6.6
2020-09-30 11:42:04 +02:00
Joas Schilling
4f26408303
Bump @nextcloud/vue to 2.6.6
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-30 10:55:37 +02:00
eleith
aa956ab46e
broaden exception handling on webcal refresh
...
when iterating through a calendar, recurrance events can throw an
exception if no instances of the recurrance are found.
this exception is of class `Exception` but the try/catch clause in the
webcal refresh loop only catches `BadRequest` exception.
this leads to the exception bubbling up and thus other calendar events
do not get processed by the event iterator.
this PR broadens the exception to handle both BadRequest and
NoInstanceFoundException so that the full webcal can be processed, even
if minor hiccups are processing on vobject
Signed-off-by: leith abdulla <online-nextcloud@eleith.com>
2020-09-29 20:47:38 -07:00
Nextcloud bot
54f4ede126
[tx-robot] updated from transifex
2020-09-30 02:18:17 +00:00
Julius Härtl
d52caba30f
Merge pull request #22999 from nextcloud/bugfix/noid/settings-container-height
...
Adjust scroll container height to make it a proper boundary element for actions
2020-09-29 18:41:40 +02:00