Commit graph

8836 commits

Author SHA1 Message Date
ansuz
4037270a23 add a FIXME note for a sketchy implementation in history keeper 2020-05-04 15:46:08 -04:00
ansuz
c9846e532b compare live blob activity against 'inactiveTime' instead of 'retentionTime' which is intended for archived content expiration 2020-05-04 15:40:51 -04:00
ansuz
7d15583b0e lint compliance 2020-05-04 15:39:40 -04:00
ansuz
f50c3caf08 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-05-04 11:57:50 -04:00
ansuz
84909f8c30 Merge remote-tracking branch 'origin/communities-comments' into staging 2020-05-04 11:57:38 -04:00
ansuz
9714783818 Merge remote-tracking branch 'origin/lessonce' into staging 2020-05-04 11:54:55 -04:00
yflory
1d2b838b05 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-05-04 15:56:25 +02:00
yflory
dfc669154c Fix issue with sheet ID in onlyoffice 2020-05-04 15:56:19 +02:00
yflory
c26bbba73a lint compliance 2020-05-04 13:34:48 +02:00
yflory
7c7bfe72d7 Allow comments on mathjax 2020-05-04 13:30:08 +02:00
yflory
05f164a2e5 Fix issue with the addComment button in the toolbar 2020-05-04 12:20:18 +02:00
yflory
977301dfc3 Get the pad data from team drives when mentionned in a comment 2020-05-04 12:16:34 +02:00
yflory
bafe4718ef Merge branch 'communities-comments' of github.com:xwiki-labs/cryptpad into communities-comments 2020-05-04 11:59:49 +02:00
yflory
5b337bef7d Add support for readonly and disconnected modes in comments 2020-05-04 11:59:28 +02:00
yflory
43fc0a3721 lint compliance 2020-05-04 11:43:35 +02:00
yflory
c969363290 Fix click, focus and selection issues 2020-05-04 11:42:45 +02:00
ansuz
02347d134a queue signature validation per-channel to ensure correct ordering 2020-04-30 18:18:05 -04:00
ansuz
ddd12bfd7a remove grey style from mermaid flowcharts 2020-04-30 16:48:49 -04:00
ansuz
75dcc3121b Merge branch 'staging' into communities-comments 2020-04-30 14:40:09 -04:00
ansuz
fac09cac09 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-30 13:51:33 -04:00
ansuz
2c24a824f9 Merge branch 'premium-colors' of github.com:xwiki-labs/cryptpad into premium-colors 2020-04-30 13:50:59 -04:00
David Benqué
20622c152b Merge remote-tracking branch 'origin/communities-comments' into communities-comments 2020-04-30 16:02:10 +01:00
David Benqué
c381c614ba fix reply button layout and mention names 2020-04-30 16:01:40 +01:00
David Benqué
dc383615e0 different color for premium users 2020-04-30 15:46:21 +01:00
yflory
e8b38ebc64 Merge branch 'soon' into communities-comments 2020-04-30 16:28:13 +02:00
Weblate
98c24aa22a Translated using Weblate (Japanese)
Currently translated at 14.1% (177 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ja/
2020-04-30 16:20:46 +02:00
Weblate
587a3a2e4c Translated using Weblate (French)
Currently translated at 100.0% (1269 of 1269 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-30 16:20:46 +02:00
Weblate
5d15adaf8c Translated using Weblate (English)
Currently translated at 100.0% (1269 of 1269 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1268 of 1268 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1267 of 1267 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1266 of 1266 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1265 of 1265 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1264 of 1264 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1263 of 1263 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1262 of 1262 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1261 of 1261 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1260 of 1260 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1259 of 1259 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1258 of 1258 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-30 16:20:46 +02:00
Weblate
861ba3b291 Translated using Weblate (German)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-30 16:20:46 +02:00
David Benqué
933adcce61 Merge remote-tracking branch 'origin/communities-comments' into communities-comments 2020-04-30 13:20:56 +01:00
David Benqué
88cbb0d8ef fix comment form button layout 2020-04-30 13:20:25 +01:00
yflory
7ba88751eb Fix addComment button 2020-04-30 14:11:50 +02:00
yflory
49d037a085 Fix resolve button UI issues in comments 2020-04-30 12:25:22 +02:00
yflory
b37b8c4b31 Fix race condition between click events in comments 2020-04-30 12:18:29 +02:00
yflory
565a855734 Fix upload error with audio files 2020-04-30 11:07:55 +02:00
ansuz
9975c27e84 increase timeout from one minute to three and decrease the number of parallel jobs per worker 2020-04-29 17:24:38 -04:00
ansuz
488f876ad6 lint compliance 2020-04-29 17:23:29 -04:00
ansuz
6dc6fed21d check whether support tickets came from a premium user, not whether the person viewing the content is a premium user 2020-04-29 14:51:09 -04:00
ansuz
36e790dee6 style support tickets from premium users via a class 2020-04-29 14:40:42 -04:00
yflory
9e947e4fd6 Fix modal errors 2020-04-29 18:18:59 +02:00
David Benqué
003ad074a5 adjust colors 2020-04-29 16:53:36 +01:00
David Benqué
7fa9fd454e fix margins 2020-04-29 16:41:54 +01:00
David Benqué
6274591fab Merge remote-tracking branch 'origin/communities-comments' into communities-comments 2020-04-29 15:58:52 +01:00
David Benqué
6db6bc86db margin adjustments 2020-04-29 15:56:16 +01:00
yflory
abf083252c Fix multiline comments 2020-04-29 16:54:02 +02:00
yflory
0d78ae86dc Ability to edit a comment 2020-04-29 16:45:42 +02:00
David Benqué
ddb833eb97 Merge remote-tracking branch 'origin/communities-comments' into communities-comments 2020-04-29 14:41:31 +01:00
David Benqué
1e4af92c13 margin adjustments 2020-04-29 14:27:16 +01:00
yflory
5c64e1fa4e Make comment input grow with new lines 2020-04-29 15:24:25 +02:00
David Benqué
41ceedd3f7 Merge remote-tracking branch 'origin/communities-comments' into communities-comments 2020-04-29 09:49:54 +01:00