Commit graph

11010 commits

Author SHA1 Message Date
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
2c5f28807b Merge branch 'degraded' into nodrive 2021-03-08 17:23:47 +01:00
yflory
508201ab28 On-demand anon creation drive 2021-03-08 17:23:13 +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
d81e1f3ecd Prototype 2021-03-08 10:59:54 +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
yflory
38830d262a Fix degraded race condition 2021-03-04 18:43:40 +01:00
yflory
1a0f06f860 Fix userlist in non-degraded apps 2021-03-04 18:40:38 +01:00
yflory
f6015e419e Implement degraded mode when too many editors are in a pad 2021-03-04 18:24:31 +01:00
David Benqué
d269a18315 Truncate support messages after 2000 chars 2021-03-04 15:22:24 +00:00
yflory
a5232b6cdb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-03-04 15:56:51 +01:00
yflory
52393cafd6 Truncate long messages in support 2021-03-04 15:56:32 +01:00
ansuz
e22af80574 Merge branch 'deleteBlock' into staging 2021-03-04 17:23:39 +05:30
ansuz
d1cd310645 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-03-04 17:23:37 +05:30
ansuz
02b7ad7669 stop calling a function that hasn't existed for 4 months 2021-03-04 17:14:43 +05:30
yflory
54fcd3cf13 Fix account deletion form multiple password attempts 2021-03-04 12:42:46 +01:00
ansuz
1f61dbcc02 Merge branch 'staging' into deleteBlock 2021-03-04 17:04:17 +05:30