Commit Graph

8082 Commits (f0e5fc761436a09c3f2ad9b1a00fd905a062b16c)

Author SHA1 Message Date
ansuz f0e5fc7614 merge some missing code from communities-allow-list 2020-02-25 09:09:16 -05:00
ansuz ad08fe0c08 silence a few more routine websocket errors 2020-02-25 08:01:25 -05:00
ansuz 492e9496c8 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-02-24 14:33:02 -05:00
ansuz 21cf2b70c5 update changelog for v3.12.0 (Megaloceros) 2020-02-24 14:32:53 -05:00
yflory 8eaf197b5b Disable 'make a copy' for spreadsheets in the drive 2020-02-24 16:40:23 +01:00
yflory 99f04c3d6f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-24 16:32:35 +01:00
yflory f103a0fb08 Fix dropping files in non-ROOT categories in the drive 2020-02-24 16:32:18 +01:00
Weblate 20b591a39c Translated using Weblate (German)
Currently translated at 100.0% (1215 of 1215 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-02-24 15:47:18 +01:00
yflory 6e6ba73eca Remove XXX 2020-02-24 14:55:29 +01:00
yflory c6deabe79c Fix order of 'copy' button in the toolbar 2020-02-24 14:53:52 +01:00
yflory 59d23ef5ff Fix issues with trim history button 2020-02-24 11:28:30 +01:00
ansuz 6f742fc295 WIP changelog 2020-02-21 15:22:51 -05:00
ansuz 021a6b361f remove a bogus XXX note 2020-02-21 14:33:28 -05:00
ansuz e871e1f1e2 bump footer version to 3.12.0 (Megaloceros) 2020-02-21 14:31:11 -05:00
ansuz 668ea95de2 Merge branch 'soon' into staging 2020-02-21 13:47:03 -05:00
ansuz e8142d983b fix an invalid use of dropChannel 2020-02-21 13:46:48 -05:00
ansuz 386add7c58 fix an invalid use of dropChannel 2020-02-21 13:46:11 -05:00
ansuz 76d369bc83 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-21 13:39:07 -05:00
ansuz 33c12c27a1 ignore successive metadata errors with the same message 2020-02-21 13:38:56 -05:00
Weblate 78c292bc2e Translated using Weblate (Italian)
Currently translated at 41.3% (501 of 1213 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-02-21 17:16:56 +01:00
Weblate e292a0b295 Translated using Weblate (French)
Currently translated at 100.0% (1215 of 1215 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-21 17:16:56 +01:00
Weblate 01ba2c4d40 Translated using Weblate (English)
Currently translated at 100.0% (1215 of 1215 strings)

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

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/
2020-02-21 17:16:56 +01:00
Weblate 316d2a4689 Translated using Weblate (German)
Currently translated at 100.0% (1213 of 1213 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-02-21 17:16:55 +01:00
yflory ff97c2cf63 Add (copy) to the title for copied pads 2020-02-21 17:10:50 +01:00
yflory 3abe522a9f Make a copy 2020-02-21 15:45:16 +01:00
yflory 2cceb54aac Fix cornerPopup timeout not always applied 2020-02-21 12:15:34 +01:00
yflory d0bce11c21 Fix errors when an anonymous user leaves the shared worker 2020-02-21 12:07:53 +01:00
yflory d3939e87b2 Fix readOnly mode in spreadsheets 2020-02-20 16:39:50 +01:00
ansuz 4fee896b5d update chainpad-listmap's dependency chain 2020-02-20 09:51:47 -05:00
ansuz c8b0907fbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-20 09:50:44 -05:00
ansuz 0edcdcb1b8 oups! fix a missing callback that's been here for a while... 2020-02-18 16:15:05 -05:00
yflory 04009bf9bb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-18 17:24:43 +01:00
yflory d48cecf28e Load mailboxes after teams 2020-02-18 17:24:28 +01:00
David Benqué 72564a7cfe Merge remote-tracking branch 'origin/staging' into staging 2020-02-18 17:23:46 +01:00
Weblate 70b87f31dd Translated using Weblate (French)
Currently translated at 100.0% (1213 of 1213 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-18 17:23:12 +01:00
Weblate 7cf9758428 Translated using Weblate (English)
Currently translated at 100.0% (1213 of 1213 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1212 of 1212 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1211 of 1211 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1210 of 1210 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1209 of 1209 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1208 of 1208 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1207 of 1207 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1206 of 1206 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1205 of 1205 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1204 of 1204 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1203 of 1203 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1202 of 1202 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-02-18 17:23:12 +01:00
Weblate 9943e3be78 Translated using Weblate (Italian)
Currently translated at 41.6% (500 of 1201 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-02-18 17:23:12 +01:00
yflory d6c3ad1597 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-18 17:05:17 +01:00
yflory f04a6056ae Fix race condition with team access rights #497 2020-02-18 17:04:49 +01:00
David Benqué 99949ce838 Merge remote-tracking branch 'origin/staging' into staging 2020-02-18 14:24:11 +01:00
David Benqué 1f99c185f6 add new error key 2020-02-18 14:14:46 +01:00
David Benqué 64964e1f80 remove XXXs related to keys 2020-02-18 14:14:29 +01:00
ansuz ecce654ca6 add 'resource:' to script-src to enable shared-worker debugging in firefox 2020-02-17 12:48:10 -05:00
ansuz 626a031115 resolve conflict with master/staging 2020-02-17 12:04:01 -05:00
ansuz ff73e96cb8 reimplement the trim history fix from staging 2020-02-17 12:02:49 -05:00
ansuz 79f1280cf3 Merge branch 'soon' into staging 2020-02-17 11:42:08 -05:00
ansuz b56367414b don't overwrite cached indices when new users join a channel 2020-02-17 11:31:00 -05:00
ansuz e8949168ec lint compliance 2020-02-17 10:30:44 -05:00
ansuz 5dff6535ed add a simple guard against unparsed messages when trimming history 2020-02-17 10:19:51 -05:00
ansuz f86196e40a implement shared environment between historyKeeper and RPC 2020-02-17 09:01:10 -05:00