Commit graph

6389 commits

Author SHA1 Message Date
yflory
7309ae1b23 Add mentions 2020-04-28 15:54:12 +02:00
yflory
2608b0f66e Comment out inactive code 2020-04-27 16:47:03 +02:00
yflory
73654a4e65 Fix 'show/hide cke toolbar' button 2020-04-27 15:13:51 +02:00
yflory
0cbe14acf5 Ability to disable comments notifications 2020-04-27 15:09:36 +02:00
yflory
3d22a5e95a Add missing icon 2020-04-27 14:38:44 +02:00
yflory
473577a9f1 Send a notification when replying to a comment 2020-04-27 14:38:29 +02:00
yflory
52f2ad68d8 Move large mode icon to cke toolbar 2020-04-27 13:01:42 +02:00
yflory
e71a6fb1e2 Update user data in comments in realtime 2020-04-27 11:39:06 +02:00
yflory
8e08f1b3e5 Don't add author data for anonymous users 2020-04-27 10:46:34 +02:00
Alexander Dietrich
a5cd0bdbff Add privacy policy option 2020-04-26 15:10:23 +02:00
yflory
da7411dab6 Hide CKE insert image button in pad 2020-04-24 18:46:29 +02:00
yflory
9929ce3568 Load less files only once 2020-04-24 18:42:50 +02:00
yflory
66b74b0a68 Inline button to add comments 2020-04-24 17:53:33 +02:00
yflory
5630b78763 Add icon 2020-04-24 13:18:03 +02:00
yflory
cdd90cea82 Clean links plugin code for ckeditor 2020-04-24 13:17:56 +02:00
yflory
f3e921d7a5 Comment from context menu 2020-04-24 12:49:21 +02:00
yflory
685be534ec Clear ghost data on ready if you're alone 2020-04-24 11:37:38 +02:00
yflory
45d3c1304f Restore a comment with undo 2020-04-24 11:16:56 +02:00
yflory
8e4ede3bb8 Fix mediatags in comments 2020-04-24 10:50:39 +02:00
yflory
a8eeac6e5a Use tab to move between comments 2020-04-23 17:42:28 +02:00
yflory
3722725462 Fix race condition when adding a new comment 2020-04-23 17:22:36 +02:00
yflory
a71d75bad3 Better representation of active comments 2020-04-23 16:19:58 +02:00
yflory
e58dfbabd4 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2020-04-23 15:08:24 +02:00
yflory
13e1d1267d Add chat ID in the console 2020-04-23 15:08:13 +02:00
yflory
5fc40974cb Merge branch 'staging' into communities-comments 2020-04-23 13:52:31 +02:00
yflory
448edbf972 lint compliance 2020-04-23 13:52:21 +02:00
yflory
c2f26775d8 Visual link between comments and commented content 2020-04-23 13:47:03 +02:00
yflory
2a7dbc1294 Fix sort issue in the drive 2020-04-23 11:33:45 +02:00
yflory
70545c64fc Fix sort issue in the drive 2020-04-23 11:32:57 +02:00
yflory
34768261b0 Recover previous comment input on redraw 2020-04-23 10:56:03 +02:00
ansuz
0a97ae8c52 Merge branch 'master' into soon 2020-04-22 15:14:37 -04:00
ansuz
c860819eb1 guard against coercing undefined to a string
visible in the author's tooltip when author marks were enabled
for the document, but hidden by the local user
2020-04-22 15:09:27 -04:00
yflory
17d78a3831 Add support for comments with multiple users 2020-04-22 18:48:49 +02:00
yflory
0a72ed2977 Fix cursor recovery in pad 2020-04-22 18:43:12 +02:00
Weblate
52da3eae5d Translated using Weblate (Italian)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-04-22 17:46:38 +02:00
yflory
97f41edd94 Fix comments replies 2020-04-22 16:46:36 +02:00
yflory
96948ed55b Fix comments section hidden when adding first comment 2020-04-22 16:35:28 +02:00
yflory
7f2b44d6a5 Merge branch 'staging' into communities-comments 2020-04-22 16:23:56 +02:00
yflory
31081eac46 Add comments UI 2020-04-22 16:23:45 +02:00
yflory
37bbb815f0 Remove cba on non-owned pads 2020-04-22 10:44:35 +02:00
yflory
cf8841cdfa Remove cba on non-owned pads 2020-04-22 10:44:16 +02:00
yflory
e5f1fa7ef0 Fix color by author automatically enabled for non-owned pads 2020-04-22 10:39:57 +02:00
yflory
0d2f37890b Fix color by author automatically enabled for non-owned pads 2020-04-22 10:37:51 +02:00
yflory
440980c4af Display preview with a single click 2020-04-21 16:40:19 +02:00
yflory
9d03d0effb Update rich text app structure to add a comments container 2020-04-21 16:07:04 +02:00
yflory
fa1e15e7d8 Merge branch 'staging' into communities-comments 2020-04-21 14:59:25 +02:00
yflory
89de5869c5 Fix cursor and scroll position in codemirror after undo 2020-04-21 14:42:49 +02:00
yflory
aeb81fdfad lint compliance 2020-04-21 13:35:36 +02:00
yflory
872e636ac5 Fix access modal in drive 2020-04-21 12:13:52 +02:00
yflory
97f9244efd Merge branch 'soon' into staging 2020-04-21 12:05:16 +02:00
yflory
c2e0ed0d59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-21 12:05:13 +02:00
yflory
1d0feeb323 Fix cba reset on join. Change how the cba state is stored 2020-04-21 12:04:24 +02:00
Weblate
ac2cb29cf7 Translated using Weblate (French)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-21 11:17:49 +02:00
Weblate
65c8c043d5 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-21 11:17:49 +02:00
Weblate
0544c31bea Translated using Weblate (English)
Currently translated at 100.0% (1257 of 1257 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-21 11:17:49 +02:00
ansuz
a8c8b85f0c add an XXX note for the 3.16.0 release 2020-04-20 14:31:02 -04:00
ansuz
a04461f7c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-20 14:26:28 -04:00
ansuz
9efbe59361 force a page reload for patch version changes 2020-04-20 14:25:43 -04:00
Weblate
b8d13328cb Translated using Weblate (German)
Currently translated at 100.0% (1256 of 1256 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-20 20:07:31 +02:00
yflory
d8855ed5f7 Remove XXX 2020-04-20 18:32:13 +02:00
ansuz
f4f4e0011f don't merge this, it's very wrong 2020-04-20 12:32:07 -04:00
yflory
8896b2eae2 Fix mediatag preview 2020-04-20 18:19:21 +02:00
yflory
22a2b85fae Fix broken share modal 2020-04-20 18:14:38 +02:00
yflory
f2641bc0ee Fix initial marker 2020-04-20 17:57:25 +02:00
yflory
6d84fc5b8a Add initial marker to fix errors while 'joining' markers 2020-04-20 17:32:45 +02:00
Weblate
723549c0ba Translated using Weblate (English)
Currently translated at 100.0% (1256 of 1256 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1256 of 1256 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1255 of 1255 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-20 17:00:10 +02:00
Weblate
9656abcade Translated using Weblate (French)
Currently translated at 100.0% (1256 of 1256 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-20 17:00:10 +02:00
yflory
c6cb9876a7 Fix secure iframe conflict with cba button 2020-04-20 16:47:04 +02:00
yflory
49eacf752b Fix markers errors 2020-04-20 16:37:40 +02:00
yflory
0ca779dbd1 Fix 'enable cba' button in properties 2020-04-20 16:20:46 +02:00
yflory
b208ca367d Merge branch 'staging' into cba 2020-04-20 15:38:47 +02:00
yflory
9f5f4a4d52 Fix possible duplicate author id 2020-04-20 15:38:27 +02:00
yflory
3be884d702 Comments prototype 2020-04-20 15:22:45 +02:00
yflory
e6af3476d9 Upgrade ckeditor to 4.14 2020-04-20 15:22:16 +02:00
ansuz
cb04bec348 Merge branch 'soon' into staging 2020-04-20 08:57:36 -04:00
yflory
3f2d21fd71 Merge branch 'staging' into communities-comments 2020-04-20 12:10:27 +02:00
yflory
41c0704ad8 Page mode by default in rich text 2020-04-20 11:56:12 +02:00
yflory
ca9f874afb Redraw mermaid on preview 2020-04-20 11:09:46 +02:00
Weblate
14b4411110 Translated using Weblate (German)
Currently translated at 100.0% (1254 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-18 18:41:04 +02:00
yflory
1e9b9913c5 Better debug function and fix marker error 2020-04-17 18:18:16 +02:00
ansuz
d6d4c4c70b Merge branch 'soon' into staging 2020-04-17 11:44:30 -04:00
yflory
19e565a7dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-17 17:38:22 +02:00
yflory
adae4b690b outer.css cache busting 2020-04-17 17:38:15 +02:00
ansuz
d0c3f0fa84 remove XXX notes 2020-04-17 11:36:48 -04:00
Weblate
8009c01f70 Translated using Weblate (French)
Currently translated at 100.0% (1254 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-17 17:22:13 +02:00
Weblate
fab1fcdb33 Translated using Weblate (Dutch)
Currently translated at 30.2% (376 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nl/
2020-04-17 17:06:07 +02:00
Weblate
5807f3680b Translated using Weblate (German)
Currently translated at 99.4% (1246 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-17 17:06:07 +02:00
Weblate
8b0006fba7 Translated using Weblate (French)
Currently translated at 99.4% (1246 of 1254 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-04-17 17:06:07 +02:00
Weblate
78afbaa6a8 Translated using Weblate (English)
Currently translated at 100.0% (1254 of 1254 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1253 of 1253 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1252 of 1252 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1252 of 1252 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1251 of 1251 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1250 of 1250 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1249 of 1249 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1249 of 1249 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1248 of 1248 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1247 of 1247 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-04-17 17:06:07 +02:00
yflory
9ba2d11cd5 Guard against a type error 2020-04-17 16:50:41 +02:00
yflory
d27dc768f3 Fix missing button to enable cba 2020-04-17 15:56:22 +02:00
yflory
283f739be5 lint compliance 2020-04-17 15:30:27 +02:00
yflory
dd814713dd Merge branch 'staging' into cba 2020-04-17 15:17:24 +02:00
yflory
f03713e60a Fix small issues, clean debugging logs and add known issues 2020-04-17 15:16:49 +02:00
yflory
92738828ff Merge branch 'debugtime' into cba 2020-04-17 10:31:42 +02:00
yflory
1d3f0ded81 Fix more markers errors 2020-04-17 10:31:37 +02:00
yflory
38acd01b35 Fix issues with falsy values 2020-04-16 16:24:09 +02:00
yflory
b74a4b6bb4 Fix more cba issues and add debugging data 2020-04-16 16:03:17 +02:00
yflory
026bf6a425 Fix obvious issues in cba 2020-04-16 11:20:18 +02:00
yflory
9c5f0c0d6f Use rgba instead of #RRGGBBAA for the author markers 2020-04-16 10:36:51 +02:00
yflory
cdcb01623d Merge branch 'q' into staging 2020-04-15 17:03:02 +02:00
yflory
7890342ae1 Add cba hint 2020-04-15 16:49:38 +02:00
yflory
fd2ee0fced Add comment 2020-04-15 16:23:36 +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
yflory
94c9e47d32 Remember the state of cba per user in their owned pads 2020-04-15 15:36:37 +02:00
yflory
87fc1f8daf Show/hide and enable/disable cba 2020-04-15 15:20:04 +02:00
yflory
88760fde6a Clean the code 2020-04-15 13:27:25 +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
d41c362d46 Fix more errors after ot 2020-04-14 17:11:47 +02:00
yflory
5fe7f55f51 Fix share with a team when we don't have contacts yet 2020-04-14 10:47:53 +02:00
yflory
a70233d492 Fix OT errors 2020-04-10 14:41:51 +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
62fde59a89 temp 2020-04-09 16:06:04 +02:00
yflory
cba8f5fce6 Merge branch 'staging' into stoppegp-code-authorcolors-PR 2020-04-08 17:03:30 +02:00
yflory
ee3adccafc Merge branch 'code-authorcolors-PR' of https://github.com/stoppegp/cryptpad into stoppegp-code-authorcolors-PR 2020-04-08 17:03:09 +02:00
yflory
7acbe4ba2c Comment plugin 2020-04-08 16:16:57 +02:00
stoppegp
272c1007db authorcolor storage optimizations 2020-04-07 20:49:36 +02:00
stoppegp
56031a5c14 authorcolor storage optimization, add undefined checks before access, code styling 2020-04-07 20:30:55 +02:00
stoppegp
79325b8cca bugfix authorcolors: wrong end position on multiline edit 2020-04-07 19:07:12 +02:00
stoppegp
5f7bc9fca5 fix remove author color button when nothing is selected 2020-04-07 17:14:57 +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
stoppegp
8696ecc692 add 'remove authorcolors' button 2020-04-07 16:52:38 +02:00
stoppegp
45b5eb7cac add basic author colors to code app 2020-04-07 16:08:28 +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
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
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
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
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
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
yflory
75e5d3cc42 Move the mediatag and avatar code outsite of common-ui-elements 2020-03-30 12:09:12 +02:00
Weblate
80ac7c8a96 Translated using Weblate (Italian)
Currently translated at 88.9% (1108 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 88.9% (1108 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 87.5% (1090 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 87.5% (1090 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 86.2% (1074 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.3% (1025 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.2% (1024 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 82.2% (1024 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-28 17:03:00 +01:00
Weblate
0ff883f8b2 Translated using Weblate (Italian)
Currently translated at 82.1% (1023 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-28 01:00:39 +01:00
ansuz
db9eaa8d4f Merge branch 'soon' into staging 2020-03-27 19:59:45 -04:00
ansuz
c8c98b5747 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-03-27 17:22:48 -04:00
Weblate
4ce980f406 Translated using Weblate (Spanish)
Currently translated at 67.3% (839 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2020-03-27 22:22:32 +01:00
Weblate
2df7c62613 Translated using Weblate (Italian)
Currently translated at 80.8% (1007 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 74.0% (922 of 1246 strings)

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

Translated using Weblate (Italian)

Currently translated at 74.0% (922 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-27 22:22:32 +01:00
Weblate
b4d61f0519 Translated using Weblate (Swedish)
Currently translated at 15.5% (193 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/sv/
2020-03-27 22:22:32 +01:00
ansuz
9058a59555 reassign db tasks if the responsible worker fails 2020-03-27 17:17:42 -04:00
yflory
7047abe407 Fix cache issues with mermaid 2020-03-27 17:25:45 +01:00
yflory
812d8f8770 Deprecate 'skip PCS' feature 2020-03-27 15:48:34 +01:00
yflory
05cb082e2f Stop refreshing the usage bar if the tab is not visible 2020-03-27 15:16:17 +01:00
yflory
980baf9ce3 Fix usage bar in drive and read only teams 2020-03-27 15:06:15 +01:00
yflory
9a4da6e6e0 Remove console log 2020-03-27 13:58:53 +01:00
yflory
6cde052a46 Update mermaid 2020-03-27 13:54:43 +01:00
ansuz
a4c8039cc7 improve error handling with rpc response API 2020-03-26 14:45:24 -04:00
yflory
7b82d9dba4 Remove/fix XXX 2020-03-26 17:25:36 +01:00
yflory
c7688b7c8c Merge branch 'duplicateText2' into staging 2020-03-26 16:23:12 +01:00
yflory
e15196bd53 Merge branch 'reconnect' into staging 2020-03-26 15:24:38 +01:00
yflory
cad12ab31f Merge branch 'soon' into staging 2020-03-26 15:23:48 +01:00
yflory
5248c81b65 Fix opening a text blob in the code editor 2020-03-26 14:47:55 +01:00
yflory
7b15775d75 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-03-26 13:12:52 +01:00
yflory
ed722f7385 Fix properties and access modal being opened multiple times at once 2020-03-26 13:12:41 +01:00
yflory
36d7bb031f Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-03-26 11:11:27 +01:00
Weblate
517e11c994 Translated using Weblate (Italian)
Currently translated at 71.0% (885 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-26 11:11:09 +01:00
Weblate
1d6c108cfd 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-03-26 11:11:09 +01:00
yflory
86959bc048 Add Hindi translation 2020-03-26 11:10:44 +01:00
ansuz
51e6fe1cce Merge branch 'scaling-file-size' into soon 2020-03-25 17:48:11 -04:00
ansuz
c4f3026331 don't bother sending IS_CHANNEL_PINNED requests 2020-03-25 17:44:32 -04:00
David Benqué
01cdac21cc remove // XXX related to Whiteboard keys 2020-03-25 17:07:31 +00:00
Weblate
963da1c145 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-03-25 18:06:33 +01:00
Weblate
c9fa814e00 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/

Translated using Weblate (English)

Currently translated at 100.0% (1245 of 1245 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-03-25 18:06:33 +01:00
David Benqué
b20beee2dc remove // XXX related to translation keys 2020-03-25 16:40:41 +00:00
yflory
d7b2876711 Fix UI for brush settings in whiteboard 2020-03-25 17:37:52 +01:00
yflory
f780087ac7 Better UI for whiteboard controls 2020-03-25 17:23:29 +01:00
Weblate
67c933622d Translated using Weblate (French)
Currently translated at 100.0% (1244 of 1244 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-03-25 17:15:37 +01:00
Weblate
9521b9dd37 Translated using Weblate (English)
Currently translated at 100.0% (1244 of 1244 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1243 of 1243 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1242 of 1242 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-03-25 17:15:37 +01:00
Weblate
0453ec60e8 Translated using Weblate (Swedish)
Currently translated at 13.2% (164 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/sv/
2020-03-25 17:12:06 +01:00
Weblate
008bc42a63 Translated using Weblate (Japanese)
Currently translated at 13.6% (169 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ja/
2020-03-25 17:12:06 +01:00
Weblate
4add675921 Translated using Weblate (Italian)
Currently translated at 70.6% (876 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-25 17:12:05 +01:00
Weblate
454d951621 Translated using Weblate (German)
Currently translated at 100.0% (1241 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-03-25 17:12:05 +01:00
yflory
fbdb8e547e Merge branch 'soon' into staging 2020-03-25 16:33:47 +01:00
yflory
dcfd9c5a73 Smaller palette in whiteboard 2020-03-25 16:33:45 +01:00
David Benqué
bad3ae3efd move copy key button 2020-03-24 19:34:17 +00:00
yflory
ba4614f0e8 Fix a type error in onlyoffice 2020-03-24 18:38:08 +01:00
yflory
facc6d877a Remove hardcoded translation key 2020-03-24 18:36:55 +01:00
yflory
64596b8097 lint compliance 2020-03-24 16:16:25 +01:00
yflory
fe14399e67 Merge branch 'whiteboard' into soon 2020-03-24 16:15:13 +01:00
yflory
ae1b59b2c1 Fix canvas initial size 2020-03-24 15:32:56 +01:00
yflory
24e474e688 Big canvas 2020-03-24 15:25:58 +01:00
yflory
9aaddea148 Add edPublic to user profiles 2020-03-24 13:18:32 +01:00
yflory
e74f713983 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-03-24 12:40:57 +01:00
yflory
a4d1b47a4c Fix 'readonly' mode after disconnection in onlyoffice 2020-03-24 12:40:13 +01:00
yflory
2c4c18bef6 Merge branch 'soon' into staging 2020-03-24 12:39:33 +01:00
yflory
2fe417bf52 Send contacts public data to accounts 2020-03-23 18:01:52 +01:00
yflory
dc0b26da0b Merge branch 'soon' into staging 2020-03-23 12:33:17 +01:00
yflory
de456cd70a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-03-23 12:32:21 +01:00
yflory
8e8b371690 Fix issues with trim history in spreadsheets 2020-03-23 12:32:03 +01:00
Weblate
f3e6c6c36d Translated using Weblate (Italian)
Currently translated at 69.7% (865 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-23 11:53:37 +01:00