Commit graph

8230 commits

Author SHA1 Message Date
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
ansuz
eac3e4cbcd sketch out some historyKeeper functionality related to access lists 2020-02-18 16:05:12 -05:00
ansuz
d5e8fc35f7 Merge branch 'mkTimeout' into communities-allow-list 2020-02-18 15:31:58 -05:00
ansuz
156c37942d implement new metadata commands related to allow lists and mailboxes 2020-02-18 14:16:07 -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
yflory
3647d583f8 Add allowList tab 2020-02-18 16:10:39 +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
yflory
0a45d48710 Improve ownership UI 2020-02-18 11:14:29 +01:00
yflory
81a0bbb0ef Add owners tab 2020-02-18 10:28:36 +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
a280cc85d2 Merge branch 'staging' into communities-allow-list 2020-02-17 12:04:41 -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
a4be6185de merge staging and do a little lint compliance 2020-02-17 11:54:27 -05:00
ansuz
f478ae725d Merge branch 'staging' into communities-allow-list 2020-02-17 11:48:56 -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
253ea0d336 Merge branch 'staging' into communities-allow-list 2020-02-17 10:38:40 -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
8694c17023 sketch out metadata commands for allow lists 2020-02-17 09:26:36 -05:00
ansuz
f86196e40a implement shared environment between historyKeeper and RPC 2020-02-17 09:01:10 -05:00
yflory
4ec6d8072c Merge branch 'staging' into communities-allow 2020-02-17 14:59:14 +01:00
ansuz
8700345ccc add missing connect-src directives to example nginx conf 2020-02-17 08:49:21 -05:00
ansuz
1fc8c1de16 add missing connect-src directives to example nginx conf 2020-02-17 08:48:15 -05:00
yflory
de820dc0d1 Split properties modal into 2 modals 2020-02-17 14:07:29 +01:00
yflory
ff895bbc82 Move inner files 2020-02-17 10:53:04 +01:00
ansuz
d9ab8d3f62 lint compliance 2020-02-14 16:48:14 -05:00