Commit graph

8744 commits

Author SHA1 Message Date
yflory
a834d653aa Fix download button size in mediatag preview 2020-04-06 16:48:42 +02:00
David Benqué
bee2a44c5a Merge remote-tracking branch 'origin/staging' into staging 2020-04-06 15:43:21 +01:00
David Benqué
f95c385c82 filepicker button 2020-04-06 15:42:26 +01:00
David Benqué
e1be241406 filepicker thumbnail style 2020-04-06 15:42:14 +01:00
ansuz
7434c344f5 Merge branch 'soon' into staging 2020-04-06 10:29:19 -04:00
ansuz
7027033ed1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 10:29:01 -04:00
ansuz
c53675c9d5 WIP worker rpc call queue 2020-04-06 10:28:26 -04:00
Weblate
3f126f1bec Translated using Weblate (German)
Currently translated at 100.0% (1246 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-06 16:27:15 +02:00
Weblate
6ea958c7bd Translated using Weblate (Finnish)
Currently translated at 72.2% (899 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
2020-04-06 16:27:15 +02:00
yflory
f5de72dcb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 16:27:12 +02:00
yflory
15d86c9bd1 Merge branch 'pcs' into staging 2020-04-06 16:26:38 +02:00
yflory
8370f3121c Remove XXX 2020-04-06 16:26:29 +02:00
ansuz
d802173325 remove an invalid line 2020-04-06 10:18:11 -04:00
ansuz
90518224fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 10:16:12 -04:00
ansuz
5196440e65 guard against a typeError when httpSafeOrigin is not defined 2020-04-06 10:16:02 -04:00
yflory
3aefc3a893 Fix icon size in the new pad modal 2020-04-06 16:13:51 +02:00
yflory
0f21f3118b Fix lightbox errors 2020-04-06 16:00:01 +02:00
yflory
c29b7d3389 Fix reference error 2020-04-06 15:52:13 +02:00
yflory
20111e8416 Drop support for external URL as avatar 2020-04-06 13:22:56 +02:00
yflory
9da47ebac9 lint compliance 2020-04-06 13:22:22 +02:00
yflory
033b784576 Add max file size in whiteboard 2020-04-06 13:21:08 +02:00
yflory
175ee492a5 Merge branch 'staging' into lightbox 2020-04-06 11:43:13 +02:00
yflory
35394476a6 Improve scrollbars and modal size 2020-04-06 11:42:47 +02:00
ansuz
2b3f6e3464 Merge branch 'soon' into staging 2020-04-03 10:49:51 -04:00
ansuz
9a137e0025 Merge branch 'master' into soon 2020-04-03 10:49:44 -04:00
ansuz
aace3c006c Merge branch 'csp-issue' into staging 2020-04-03 10:37:37 -04:00
ansuz
9fa93172cf tolerate trailing slashes in httpSafeDomain 2020-04-03 10:37:23 -04:00
Weblate
427389d1c7 Translated using Weblate (French)
Currently translated at 100.0% (1246 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-03 16:35:47 +02:00
Weblate
7ccfe7a673 Translated using Weblate (English)
Currently translated at 100.0% (1246 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-03 16:35:47 +02:00
yflory
18a4d2a72c Merge duplicated code between framework and whiteboard 2020-04-03 15:31:42 +02:00
yflory
7ca45eac72 Add preview for mermaid graphs in code 2020-04-03 15:01:52 +02:00
yflory
3bc32f6085 Start at the correct index when previewing multiple mediatags 2020-04-03 12:32:25 +02:00
yflory
b4c61ee753 Fix preview modal not stopping keydown propagation in drive 2020-04-03 12:31:39 +02:00
yflory
c6fa00b14c Add a start value to the new debug tool to simulate a user joining from a checkpoint 2020-04-03 11:46:05 +02:00
yflory
ae78f0a5df Merge branch 'staging' into debugtime 2020-04-03 11:20:03 +02:00
yflory
5739773378 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-03 11:19:47 +02:00
yflory
902e9624e8 Don't send encrypted messages to chainpad 2020-04-03 11:19:35 +02:00
yflory
8a658336a7 Fix issues with the new debugging code 2020-04-03 11:19:18 +02:00
ansuz
adfd1eaaa2 avoid a silly typeError in the event of an error 2020-04-02 22:57:57 -04:00
ansuz
3b05d24f10 wip csp issue 2020-04-02 17:46:29 -04:00
ansuz
2daf759299 remove clickable items from rendered mermaid 2020-04-02 15:39:55 -04:00
ansuz
110a26cc85 Merge branch 'soon' into staging 2020-04-02 13:11:36 -04:00
yflory
d12fad3420 Fix kanban edit modal not locked on disconnect 2020-04-02 16:16:40 +02:00
yflory
572f81877f Fix reconnecting issues after EUNKNOWN and ENOENT 2020-04-02 15:28:33 +02:00
yflory
c0f8129675 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-02 10:25:36 +02:00
yflory
32406a5995 Merge branch 'master' into staging 2020-04-02 10:23:09 +02:00
yflory
1169156e55 Replay history in order 2020-04-02 10:21:12 +02:00
Weblate
1f3e47e109 Translated using Weblate (Italian)
Currently translated at 100.0% (1246 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-04-02 00:00:48 +02:00
ansuz
0c65a69bab resolve merge conflict 2020-04-01 17:45:56 -04:00
ansuz
834c96a4fc update comments and remove some notes 2020-04-01 17:43:40 -04:00