Commit graph

7228 commits

Author SHA1 Message Date
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
yflory
3fb0cc38ec Delete team 2019-09-27 18:04:48 +02:00
yflory
44edbf8b39 Remove some XXX 2019-09-27 16:03:06 +02:00
yflory
aaed0b939e Transfer ownership from or to a team 2019-09-27 16:00:58 +02:00
ansuz
69e61ec2f2 ignore metadata commands which add invalid owners 2019-09-27 14:28:59 +02:00
ansuz
648980ad50 a few more slow nacl imports that I missed 2019-09-27 13:32:57 +02:00
ansuz
c968d1cdae use nacl-fast in history keeper 2019-09-27 13:31:42 +02:00
ansuz
069776e804 use fast implementations of tweetnacl serverside 2019-09-27 13:30:17 +02:00
ansuz
252b2729a6 supply plan information with support ticket submissions 2019-09-27 13:20:53 +02:00
ansuz
717a7d550c increase size of pdfs rendered via media-tags in code preview pane 2019-09-27 12:40:37 +02:00
ansuz
4f862d59d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-27 12:11:53 +02:00
yflory
98800a34cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-27 12:11:02 +02:00
yflory
c0a0275fd3 Add missing file 2019-09-27 12:10:50 +02:00
ansuz
777d9eff5f pass arguments to 'throttle' 2019-09-27 12:05:56 +02:00
ansuz
61e66e9add WIP invitation link generation 2019-09-27 12:05:08 +02:00