Commit graph

8570 commits

Author SHA1 Message Date
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
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
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
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
ansuz
ed5d97f899 WIP history-keeper fixes 2020-04-01 11:48:16 -04:00
yflory
572db00987 Preview multiple mediatags 2020-04-01 12:04:31 +02:00
yflory
81b460abd8 Open pdf in the file app 2020-03-31 17:55:31 +02:00
yflory
d8d515a450 Add spinner while loading preview 2020-03-31 17:03:16 +02:00
yflory
6a10ec711a Preview mediatag in the drive and in diffMarked 2020-03-31 16:43:00 +02:00
yflory
817309d602 Move code from ui-elements to common-interface 2020-03-31 10:38:42 +02:00
yflory
179e7d68b4 Add new common-mediatag file 2020-03-31 10:38:27 +02:00
yflory
b27eb956df Merge branch 'staging' into lightbox 2020-03-31 10:21:54 +02:00
ansuz
eddbe80eef Merge branch 'soon' into staging 2020-03-30 18:30:34 -04:00
ansuz
1a825ad664 Merge branch 'master' into soon 2020-03-30 18:30:27 -04:00
ansuz
ad118222d0 add a new test to send a stream of data to a mailbox 2020-03-30 18:27:57 -04:00
ansuz
3d8e78a268 fix overly broad config interpretation for daily check 2020-03-30 18:27:14 -04:00
ansuz
e6ec891d9a improve admin rpc for diagnosing memory used by the cache 2020-03-30 18:26:04 -04:00
ansuz
77961e3954 trim lookup tables for channels without checkpoints 2020-03-30 18:03:37 -04:00
yflory
44d05d1756 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2020-03-30 16:42:42 +02:00
yflory
8210ae3a09 Fix duplicate text bug #352 2020-03-30 16:41:47 +02:00
ansuz
b588e8ed43 Merge branch 'soon' into staging 2020-03-30 08:57:51 -04:00
ansuz
a6943b12b4 Merge branch 'soon' 2020-03-30 08:57:18 -04:00
Weblate
4963806cf2 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/

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/

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/

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/

Translated using Weblate (Italian)

Currently translated at 93.3% (1163 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 93.3% (1163 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 93.3% (1162 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-30 14:29:25 +02:00
yflory
b4b1ad893f Disable cursor position in rich text (possible cause of duplicate text) 2020-03-30 12:20:24 +02:00
yflory
938e5c5cb1 Merge branch 'staging' into lightbox 2020-03-30 12:10:42 +02:00
yflory
e5d4dbea30 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-03-30 12:10:14 +02:00
yflory
acada4c733 lint compliance 2020-03-30 12:10:06 +02:00