Commit Graph

9218 Commits (77177921c24d65ad6fb3c8be928d61de81fc7653)

Author SHA1 Message Date
ansuz e871e1f1e2 bump footer version to 3.12.0 (Megaloceros) 2020-02-21 14:31:11 -05:00
ansuz 033bd361f9 add backwards compatibility with older servers 2020-02-21 13:58:21 -05:00
ansuz cac114bb52 merge staging into pending allow-list work 2020-02-21 13:52:10 -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
ansuz 7ee8778210 kick unauthorized users from restricted channels
and update dependencies
2020-02-21 13:05:24 -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
ansuz 77785e79af Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list 2020-02-21 10:59:26 -05:00
ansuz 075eddb1db guard against a typeError if there are no owners 2020-02-21 10:50:59 -05:00
ansuz fe0e02a421 restrict access to metadata 2020-02-21 10:31:10 -05:00
yflory cebb2d3900 Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list 2020-02-21 16:25:50 +01:00
yflory 0990148810 Fix team ownership in the access modal 2020-02-21 16:25:43 +01:00
yflory 3abe522a9f Make a copy 2020-02-21 15:45:16 +01:00
ansuz ad7096d754 Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list 2020-02-21 08:41:13 -05:00
ansuz 42ffb4efb6 Merge branch 'staging' into communities-allow-list 2020-02-21 08:40:45 -05:00
ansuz 791aad53f2 WIP allow list changes 2020-02-21 08:18:05 -05: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
yflory e6c948febb Display ERESTRICTED error in the UI 2020-02-20 12:12:22 +01:00
yflory 866ce6fb7d Add translation key 2020-02-20 11:43:35 +01:00
yflory 5a189862eb Fix color 2020-02-20 11:31:54 +01:00
yflory 9d5bf7e1bb Disable allow list for files and shared folders 2020-02-20 11:30:38 +01:00
ansuz 597f417ad6 WIP block history requests that bypass JOIN restriction (where appropriate) 2020-02-19 15:32:15 -05:00
ansuz 79bc8830ef disable access restriction if all owners are removed 2020-02-19 14:39:28 -05:00
ansuz f579c9b059 semi-functional allow-list implementation in historyKeeper 2020-02-19 14:22:12 -05:00
yflory 521db379a0 Add access button in all the apps 2020-02-19 19:05:29 +01:00
yflory 620995506e lint compliance 2020-02-19 18:52:17 +01:00
yflory 43492b6df5 Add mute pad option 2020-02-19 18:51:04 +01:00
yflory b4ca18d7c2 Fix access modal bug 2020-02-19 17:26:31 +01:00
yflory 57c360ebf6 Refresh access modal when other tabs make changes 2020-02-19 17:20:37 +01:00
yflory bd0e4e66bb Fix allow list issues 2020-02-19 16:35:12 +01:00
yflory d0eb96815d Merge remote-tracking branch 'origin/communities-allow-list' into communities-allow 2020-02-19 16:00:11 +01:00
yflory e861cd3ab7 lint compliance 2020-02-19 15:58:30 +01:00
yflory 5f8ae61bd4 Add request access button to the access modal 2020-02-19 15:56:25 +01:00
yflory ef4188db5b Fix translation keys and fix UI 2020-02-19 14:31:59 +01:00
yflory 175423fee4 Add translation keys 2020-02-19 13:14:50 +01:00
yflory 17113f298c Display allow list state in access modal 2020-02-19 13:03:49 +01:00
ansuz 0edcdcb1b8 oups! fix a missing callback that's been here for a while... 2020-02-18 16:15:05 -05:00
ansuz 27e57e7af0 oups! fix a missing callback that's been here for a while... 2020-02-18 16:07:14 -05:00
ansuz 505e383f9f test restricted access from the command line 2020-02-18 16:06:06 -05:00