Commit graph

6343 commits

Author SHA1 Message Date
yflory
6edbe019d6 Fix fixSheets 2020-05-05 15:03:20 +02:00
yflory
84b5741cdf Reload when a checkpoint has drawings 2020-05-05 14:41:02 +02:00
yflory
f087837e67 Loop over all oo checkpoints until you find one available 2020-05-05 14:03:30 +02:00
yflory
74eb4ffc6d Merge branch 'soon' into staging 2020-05-05 12:15:22 +02:00
yflory
53f72e2d9c Fix type error 2020-05-05 12:14:26 +02:00
David Benqué
09d1ddf825 remove // XXX related to translations 2020-05-05 10:19:32 +01:00
David Benqué
0eb89871cf use translation key for comment error 2020-05-05 10:16:09 +01:00
yflory
d7ce297d0d Fix user verifisation in mailbox messages 2020-05-05 11:12:58 +02:00
Weblate
258a4bc8cb Translated using Weblate (German)
Currently translated at 99.9% (1269 of 1270 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-05-05 11:08:56 +02:00
Weblate
fbfc9267af Translated using Weblate (German)
Currently translated at 100.0% (1269 of 1269 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-05-05 11:05:35 +02:00
Weblate
b24e78e22c Translated using Weblate (French)
Currently translated at 100.0% (1270 of 1270 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-05-05 11:05:35 +02:00
Weblate
c561c43126 Translated using Weblate (English)
Currently translated at 100.0% (1270 of 1270 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-05-05 11:05:35 +02: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
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
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
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
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
yflory
fce3c742d9 Fix issues with the previous commit 2020-04-29 17:54:54 +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
yflory
7c17d34d12 Fix errors 2020-04-29 12:30:59 +02:00
yflory
4d6d9637ff lint compliance 2020-04-28 18:16:21 +02:00
yflory
9467839d6c Fix size of the autocomplete dropdown for mentions 2020-04-28 18:11:46 +02:00
yflory
a05015ad3c Display mention notification if you don't have access to the pad 2020-04-28 16:43:44 +02:00
yflory
60555f65a7 Little fixes and improvements to comments 2020-04-28 16:40:40 +02:00
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
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