infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
8,229 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

8229 Commits (6e9441ed39d39336e9725b529bc3e337e41b48b0)

Author SHA1 Message Date
ansuz c146125283 sketch out a method for graceful shutdown 2020-01-23 14:32:32 -05:00
ansuz 873a7c7c84 remove some flow annotations 2020-01-23 14:32:10 -05:00
ansuz 88dcadcb1b sketch out trimHistory interface 2020-01-23 14:31:45 -05:00
ansuz 47290fca1e leave some notes about something that was tricky to read 2020-01-23 14:10:20 -05:00
ansuz 75f1f8c40b refactor some methods that will be used 2020-01-23 13:56:16 -05:00
ansuz b585dd998d throw in a little asynchrony 2020-01-23 13:27:12 -05:00
ansuz a0f1680e85 Merge branch 'staging' into trim-history 2020-01-23 12:49:34 -05:00
yflory e3f5c89333 Remove window.location.hash and window.location.href from common-hash 2020-01-23 16:11:06 +01:00
ansuz 99beeca8fd update changelog for Kouprey release (3.10.0) 2020-01-22 13:04:24 -05:00
yflory a9b7b51547 Check if fileType is an array 2020-01-22 17:29:23 +01:00
yflory cdbe4ed8eb Only allow image upload in onlyoffice 2020-01-22 17:15:37 +01:00
yflory 6fd079bfb0 Clean images in onlyoffice 2020-01-22 15:47:12 +01:00
yflory ad94e97444 Fix missing callback 2020-01-22 15:41:17 +01:00
yflory 1067389e37 lint 2020-01-22 15:37:01 +01:00
yflory 7b026868fd Fix images in onlyoffice 2020-01-22 15:35:46 +01:00
yflory b76d308db8 Move new onlyoffice code 2020-01-22 14:54:24 +01:00
ansuz 0ad314c1ce Merge branch 'soon' into staging 2020-01-22 08:19:29 -05:00
yflory af8bda0755 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-22 14:18:20 +01:00
yflory 0fd711aebc Remove existing style in the default empty spreadsheet 2020-01-22 12:02:43 +01:00
yflory ad8bf87c3f Ability to force the version of onlyoffice 2020-01-22 11:55:27 +01:00
Weblate 16744cd140 Translated using Weblate (German) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-22 08:17:54 +00:00
ansuz 189dc0db71 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-21 14:08:35 -05:00
ansuz 95a2742b7a add an example systemd service file 2020-01-21 14:08:26 -05:00
ansuz 47d9c4daeb update onlyoffice detection to support sheet migration 2020-01-21 14:07:46 -05:00
yflory 746b382166 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-21 18:52:24 +01:00
yflory 47e3cffde7 Fix race condition onlyoffice 2020-01-21 18:50:45 +01:00
David Benqué 7e4ceeb192 Merge remote-tracking branch 'origin/staging' into staging 2020-01-21 17:53:17 +01:00
David Benqué 7dd1602060 lint 2020-01-21 17:53:01 +01:00
Weblate 03ad3218de Translated using Weblate (German) 
Currently translated at 99.4% (1191 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-21 16:52:03 +00:00
Weblate f3867c9d74 Translated using Weblate (French) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2020-01-21 16:52:03 +00:00
Weblate 2cdfbe7104 Translated using Weblate (English) 
Currently translated at 100.0% (1198 of 1198 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1197 of 1197 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1196 of 1196 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1195 of 1195 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2020-01-21 16:52:03 +00:00
yflory a6425fd38e Update jshintignore 2020-01-21 17:51:40 +01:00
yflory 0f41dddf92 Fix OnlyOffice UI in readonly mode 2020-01-21 17:50:27 +01:00
yflory ddb3738574 Add translation keys 2020-01-21 17:47:13 +01:00
yflory 1d67e421d0 temp 2020-01-21 17:02:44 +01:00
yflory a7a91fb0a5 Add back old OO 2020-01-21 15:39:15 +01:00
ansuz 671999c600 treat onlyoffice iframes specially with regard to CSP 2020-01-21 08:39:55 -05:00
David Benqué a5265e4c61 fix margin on OO export format alert 2020-01-21 14:16:19 +01:00
yflory 0ece81afff Merge branch 'communities-oo' into staging 2020-01-21 12:02:08 +01:00
Weblate d17c115a23 Translated using Weblate (French) 
Currently translated at 100.0% (1195 of 1195 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2020-01-21 11:01:11 +00:00
Weblate 952708113c Translated using Weblate (English) 
Currently translated at 100.0% (1195 of 1195 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1194 of 1194 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1193 of 1193 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1192 of 1192 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2020-01-21 11:01:10 +00:00
yflory 404c2a1467 Prevent importing xlsx with non-supported browsers 2020-01-21 12:00:20 +01:00
yflory 4a4146f39d Fix burn after reading with onlyoffice 2020-01-21 11:01:07 +01:00
David Benqué 003a616c81 remove XXXs 2020-01-21 10:13:41 +01:00
ansuz 698c2f946e update footer and package.json version to 3.10.0 (Kouprey) 2020-01-20 16:03:34 -05:00
ansuz 10cdd5c76b Merge remote-tracking branch 'origin/communities-oo' into staging 2020-01-20 15:59:29 -05:00
ansuz a19cebd42f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-20 15:54:26 -05:00
ansuz e6d5b0886e evict unpinned blobs and blob proofs 2020-01-20 15:54:15 -05:00
Weblate 611aa0be25 Translated using Weblate (German) 
Currently translated at 100.0% (1191 of 1191 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2020-01-20 17:07:17 +00:00
Weblate d4a5f194ee Translated using Weblate (Finnish) 
Currently translated at 67.8% (808 of 1191 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
 2020-01-20 17:07:17 +00:00