Commit Graph

7342 Commits (3b7732ceb298cbe405b63f0112ff4fb751aa7222)

Author SHA1 Message Date
yflory 0a8c6dc6b2 Fix issue with a same shared folder loaded in multiple teams 2019-10-02 17:49:51 +02:00
yflory d09a1c27ac Hide upgrade button in teams 2019-10-01 18:00:01 +02:00
yflory 5b75417a3b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-10-01 14:18:51 +02:00
yflory fa20d80c09 Display team ed public 2019-10-01 14:18:30 +02:00
yflory 56d8b92c99 Make team drive leftside menu collapsable 2019-10-01 14:10:44 +02:00
ansuz d4e5b98c14 update nginx config to add trailing slashes to new apps 2019-10-01 13:23:38 +02:00
ansuz e4914d60a6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-10-01 12:17:13 +02:00
ansuz c46e7f4021 log the time it takes to load pins and to run the eviction script 2019-10-01 12:17:01 +02:00
yflory 6abc8151d1 lint compliance 2019-10-01 12:15:50 +02:00
yflory b8f6b57019 Demote yourself as owner only if there are no other owners 2019-10-01 12:15:23 +02:00
Weblate 1f14f75e95 Translated using Weblate (French)
Currently translated at 100.0% (1121 of 1121 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-10-01 10:03:05 +00:00
Weblate 24a474068b Translated using Weblate (English)
Currently translated at 100.0% (1121 of 1121 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-10-01 10:03:05 +00:00
Weblate 260b25079c Translated using Weblate (French)
Currently translated at 100.0% (1120 of 1120 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-10-01 10:01:41 +00:00
Weblate f33bc98c14 Translated using Weblate (English)
Currently translated at 100.0% (1120 of 1120 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1119 of 1119 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-10-01 10:01:41 +00:00
yflory 572b9eb09b Fix merge conflict with weblate 2019-10-01 12:01:18 +02:00
yflory 3a8b3ea6cd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-10-01 11:57:42 +02:00
yflory 590e6bd211 Demote yourself 2019-10-01 11:57:21 +02:00
yflory 22d5e417e4 Prevent infinite loop in the drive 2019-10-01 11:46:52 +02:00
yflory 50e39f9945 Fix a race condition in teams 2019-10-01 11:33:42 +02:00
ansuz 469d674ca0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-10-01 10:59:44 +02:00
yflory f341ac2637 Enable teams by default 2019-10-01 10:59:26 +02:00
ansuz 5876f5c737 include user block location in support requests 2019-10-01 10:59:23 +02:00
ansuz b111a88531 include user block location in support requests 2019-10-01 10:58:59 +02:00
yflory 1a69a0cab7 Add links to the teams APP 2019-10-01 10:57:46 +02:00
ansuz 3ccca553bc apparently readline expects a 'close' event listener, not 'end' 2019-10-01 10:32:37 +02:00
yflory 0b542f6be8 Use the correct app name for teams 2019-10-01 10:32:37 +02:00
yflory a1e0722a09 Update translation keys 2019-10-01 10:28:10 +02:00
Weblate 992fba0148 Translated using Weblate (German)
Currently translated at 100.0% (1118 of 1118 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-10-01 08:27:08 +00:00
yflory 5dbc06633a Show the current displayed team in the leftside menu 2019-09-30 17:51:44 +02:00
yflory 123794fe99 Remove console.error 2019-09-30 17:38:09 +02:00
yflory 30492be60c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-30 17:37:03 +02:00
yflory b5cce5f215 Improve team and account deletion for pads multiple owners 2019-09-30 17:36:56 +02:00
ansuz a725f69ee7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-30 17:14:17 +02:00
ansuz afae5d7f85 apparently readline expects a 'close' event listener, not 'end' 2019-09-30 17:14:11 +02:00
Weblate 1fd8e2a08f Translated using Weblate (German)
Currently translated at 100.0% (1107 of 1107 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-09-30 15:01:50 +00:00
Weblate 794eba0fed Translated using Weblate (French)
Currently translated at 100.0% (1118 of 1118 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-09-30 15:01:50 +00:00
Weblate 7e1beeb4e9 Translated using Weblate (English)
Currently translated at 100.0% (1118 of 1118 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1118 of 1118 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1117 of 1117 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1116 of 1116 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1115 of 1115 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1114 of 1114 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1113 of 1113 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1112 of 1112 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1111 of 1111 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1110 of 1110 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1109 of 1109 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1108 of 1108 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-09-30 15:01:50 +00:00
yflory 72ba9ab999 Add translation keys 2019-09-30 16:41:31 +02:00
yflory 01a7430833 Fix usage bar refresh after leaving a team 2019-09-30 15:58:38 +02:00
yflory a530776ba8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-30 15:54:34 +02:00
yflory 1288f28931 Team deletion 2019-09-30 15:49:02 +02:00
ansuz 16e8c96210 allow for selection of user data in admin side of support tickets 2019-09-30 15:41:11 +02:00
ansuz 2a809cf120 roster changes:
* validate that a user can add a role before adding them
* support deletion of non-required metadata attributes via null
2019-09-30 15:35:27 +02:00
yflory 7b4a72b3a2 lint compliance 2019-09-30 15:20:44 +02:00
yflory 295a712942 Transfer team ownership 2019-09-30 15:17:26 +02:00
ansuz 8761e2071a test many more features of roster.js via rpc tests 2019-09-30 14:57:15 +02:00
ansuz 59a361449d don't allow deletion of displayName or notifications via describe command 2019-09-30 14:56:16 +02:00
ansuz 8e07b03581 fix parse error 2019-09-30 14:51:40 +02:00
ansuz fd31fd3096 roster changes: validate roles when describing. interpret assignment of null as deletion. prevent a typeError when describing somebody that doesn't exist 2019-09-30 11:50:01 +02:00
ansuz 9b74136b66 Merge branch 'invitations' into staging 2019-09-30 10:53:10 +02:00