Commit graph

10921 commits

Author SHA1 Message Date
ansuz
a450a5bd58 Merge remote-tracking branch 'origin/oov4' into staging 2021-03-17 17:17:08 +05:30
ansuz
21b1d7fbb8 remove XXX note for translation 2021-03-17 16:54:21 +05:30
ansuz
c4e782cfa5 add a note about ckeditor to the changelog 2021-03-17 16:54:04 +05:30
ansuz
13689dc0e1 Merge branch 'soon' into staging 2021-03-17 16:50:48 +05:30
ansuz
6cad2ace27 Merge branch 'soon' into help-translations 2021-03-17 16:45:57 +05:30
Weblate
e1790f143c Translated using Weblate (German)
Currently translated at 100.0% (1214 of 1214 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2021-03-17 11:11:08 +01:00
ansuz
83fe271568 update help menu translation key 2021-03-17 15:31:30 +05:30
ansuz
1a9c6b0b2e remove unused help translations 2021-03-17 15:25:42 +05:30
ansuz
9155ca6cf0 manually set attributes on the toolbar's link to our docs 2021-03-17 15:21:27 +05:30
ansuz
230c0b9ee7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-03-17 14:55:17 +05:30
ansuz
cbd3c45700 construct dom elements without parsing html 2021-03-17 14:54:53 +05:30
ansuz
b5ecc6efe5 update changelog with reviewed changes 2021-03-17 14:54:28 +05:30
yflory
73f0a236d6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-03-16 18:00:36 +01:00
yflory
b0e44b136a Possible fix for the rich text cursor issue with firefox #406 2021-03-16 17:58:22 +01:00
ansuz
4ed0c682d0 Merge branch 'soon' into staging 2021-03-16 13:57:10 +05:30
ansuz
7d07acc580 Merge branch 'main' into soon 2021-03-16 13:57:00 +05:30
yflory
2601613656 Add OnlyOffice 6.2 files 2021-03-15 18:43:21 +01:00
yflory
de91854774 Migration to V4 (OnlyOffice 6.2) 2021-03-15 18:42:21 +01:00
David Benqué
82f85d1bde Fix website link Save button on profile 2021-03-15 17:03:52 +00:00
ansuz
534b6789d2 Merge remote-tracking branch 'origin/ooimage' into staging 2021-03-15 15:44:18 +05:30
ansuz
0d50cdd835 Merge branch 'staging' into degraded 2021-03-15 15:41:25 +05:30
ansuz
5f269fbe53 Merge branch 'soon' into staging 2021-03-15 15:35:42 +05:30
David Benqué
37a76ee60b Adjust Ctrl-e New pad modals 2021-03-12 14:30:57 +00:00
David Benqué
35591d363d Change text of ghost "New Pad" button in the drive 2021-03-11 17:44:44 +00:00
yflory
9a39b67697 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2021-03-10 17:40:53 +01:00
yflory
a17e732473 Add XXX 2021-03-10 17:40:42 +01:00
yflory
6f82f68333 Fix localStorage bug in OnlyOffice with private browsing #699 2021-03-10 13:24:23 +01:00
yflory
ce56447031 Update changelog and version 2021-03-10 12:06:58 +01:00
Weblate
771b8e6458 Translated using Weblate (English)
Currently translated at 100.0% (1214 of 1214 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2021-03-09 11:52:14 +01:00
Weblate
b6a5e0399f Translated using Weblate (French)
Currently translated at 100.0% (1214 of 1214 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2021-03-09 11:52:14 +01:00
yflory
0aff693e7e Merge branch 'soon' into degraded 2021-03-08 12:41:30 +01:00
yflory
5c688c8e77 Update changelog and version 2021-03-08 12:38:32 +01:00
yflory
8fc5647aea Guard against possible type error 2021-03-08 12:07:46 +01:00
yflory
61b8830df4 Fix snapshots in sheets 2021-03-08 12:04:02 +01:00
yflory
543115b993 Force .md extensions to be recognized as markdown when uploading a file 2021-03-08 11:33:21 +01:00
yflory
942efcae07 Fix type error 2021-03-08 11:26:10 +01:00
yflory
3a91f7c06d Fix team avatar 2021-03-08 11:25:23 +01:00
yflory
7ab529d4e9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-03-05 16:53:07 +01:00
yflory
88ff7a0219 Force .md extensions to be recognized as markdown when uploading a file 2021-03-05 16:52:57 +01:00
yflory
f7e777d5a6 Fix image upload with the same name in onlyoffice 2021-03-05 16:44:28 +01:00
yflory
e6b11c3748 Remove ID map in pad chat to save network and CPU usage 2021-03-05 16:01:27 +01:00
ansuz
e98d7d72ed Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-03-05 16:33:31 +05:30
yflory
79f1f939d7 Merge branch 'soon' into degraded 2021-03-05 11:40:36 +01:00
yflory
bdbfbaa109 Merge branch 'soon' into staging 2021-03-05 11:38:02 +01:00
yflory
001d4f4958 Fix OnlyOffice sheets 2021-03-05 11:10:51 +01:00
yflory
023aef7e68 Fix OnlyOffice sheets 2021-03-05 11:10:32 +01:00
yflory
5919111e30 Merge branch 'degraded' of github.com:xwiki-labs/cryptpad into degraded 2021-03-05 11:01:34 +01:00
yflory
d7c4339ab9 Merge branch 'soon' into degraded 2021-03-05 11:01:20 +01:00
yflory
0033921610 Fix OO error 2021-03-05 11:00:50 +01:00
ansuz
adc4243841 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into degraded 2021-03-05 13:01:39 +05:30