Commit graph

6068 commits

Author SHA1 Message Date
yflory
cdcb01623d Merge branch 'q' into staging 2020-04-15 17:03:02 +02:00
yflory
1dee2fd13c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-15 16:07:29 +02:00
yflory
f83179cb62 Fix mediatag cache preventing preview modal 2020-04-15 16:07:18 +02:00
ansuz
9a7681dc5d add a note about handling syntax errors in mermaid 2020-04-14 15:18:20 -04:00
ansuz
ca2dc85b34 reduce eye-bleed with gentler styles for mermaid charts 2020-04-14 15:17:41 -04:00
yflory
5fe7f55f51 Fix share with a team when we don't have contacts yet 2020-04-14 10:47:53 +02:00
ansuz
44a3c72f13 Merge branch 'soon' into staging 2020-04-09 16:31:35 -04:00
ansuz
de6594f4c9 add some XXX notes 2020-04-09 16:31:16 -04:00
Weblate
ebd4998edd Translated using Weblate (Catalan)
Currently translated at 50.8% (633 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
2020-04-09 19:08:24 +02:00
yflory
1551a1b969 lint compliance 2020-04-07 17:14:06 +02:00
yflory
0ccc57f6f7 Protect current pad keys in the unsafe iframe 2020-04-07 17:12:06 +02:00
yflory
43904df0fb Display properties modal in the secure iframe 2020-04-07 17:04:39 +02:00
ansuz
dca2707ae3 guard against incorrect types in /auth/ 2020-04-07 09:45:21 -04:00
yflory
ca8c50ca37 Merge branch 'staging' into secureiframe 2020-04-07 15:41:49 +02:00
yflory
e5bcaeedce Fix regression in the access modal 2020-04-07 15:38:16 +02:00
yflory
4f838777ab Merge branch 'q' into secureiframe 2020-04-07 15:24:17 +02:00
yflory
2aec7c2569 Open the access modal in the secure iframe 2020-04-07 15:24:12 +02:00
yflory
6103588faa Fix access modal bug introduced with the latest commit 2020-04-07 15:22:40 +02:00
yflory
19a0dafbe1 Merge branch 'q' into secureiframe 2020-04-07 14:54:48 +02:00
yflory
62187d855f lint compliance 2020-04-07 14:29:58 +02:00
yflory
fc2cd19821 lint compliance 2020-04-07 14:29:31 +02:00
yflory
894a355f0a Merge filepicker and share iframes 2020-04-07 14:27:44 +02:00
yflory
4672bf794b Make sure we don't try to get metadata for blobs 2020-04-07 11:03:35 +02:00
yflory
9de345044a Prompt anonymous users to login if they should create a checkpoint in oo 2020-04-07 10:47:57 +02:00
ansuz
2e290a6667 last minute fixes and notes 2020-04-06 18:21:07 -04:00
David Benqué
bee2a44c5a Merge remote-tracking branch 'origin/staging' into staging 2020-04-06 15:43:21 +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
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
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
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
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
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