7601 Commits

Author SHA1 Message Date
Adrian Nöthlich
a714e41d49
Log errors in faulty custom config file
CryptPAD now terminates and does not fallback to default config if the custom config is faulty.
The error in the custom config is logged to the terminal now.

Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2020-01-04 23:58:01 +01:00
yflory
89d9f22e0e Merge branch 'staging' into soon 2019-12-20 14:48:40 +01:00
Weblate
18c342760a Translated using Weblate (French)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-12-20 13:47:35 +00:00
Weblate
4d265248c9 Translated using Weblate (Finnish)
Currently translated at 31.7% (376 of 1185 strings)

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

Translated using Weblate (Finnish)

Currently translated at 31.7% (376 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
2019-12-20 13:47:35 +00:00
yflory
a461733aa1 Fix team invitation with no contact 2019-12-20 14:33:28 +01:00
yflory
3be7a387b4 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-12-20 14:28:44 +01:00
yflory
4db16faac0 Catch href decryption errors 2019-12-20 14:26:34 +01:00
ansuz
7d5bdc33bb update changelog for v3.8.0 2019-12-19 14:52:34 -05:00
Weblate
f84a876f27 Translated using Weblate (German)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-12-19 15:37:49 +00:00
yflory
8a6713e552 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-19 16:21:35 +01:00
yflory
826a86c7d6 Fix joining your own team 2019-12-19 16:21:10 +01:00
David Benqué
dc47091637 outline mute button 2019-12-19 14:48:57 +00:00
yflory
361292ff01 Fix button width in profile 2019-12-19 15:37:09 +01:00
yflory
20aeb0fde6 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-19 11:56:31 +01:00
yflory
4869b4e0c3 Delete invitation after using it 2019-12-19 11:56:20 +01:00
yflory
aca9ddca06 Display error message when trying to use an invitation link a second time 2019-12-19 11:45:50 +01:00
David Benqué
5db81f3990 add margin to team roster header buttons 2019-12-19 10:43:28 +00:00
yflory
0dc4a1d890 Display error message when using an invalid invitation link 2019-12-19 11:38:09 +01:00
yflory
de5feeda13 Remove some tippy titles 2019-12-19 11:27:41 +01:00
David Benqué
f78a4c538c Merge remote-tracking branch 'origin/inviteUI' into inviteUI 2019-12-19 10:10:00 +00:00
David Benqué
c6e7b5d552 add translation keys for errors 2019-12-19 10:09:39 +00:00
yflory
262ccf1265 Merge branch 'staging' into inviteUI 2019-12-19 11:08:26 +01:00
Weblate
92c6bbc99a Translated using Weblate (French)
Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-12-19 10:08:10 +00:00
Weblate
675ef60362 Translated using Weblate (English)
Currently translated at 100.0% (1185 of 1185 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1184 of 1184 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-12-19 10:08:09 +00:00
yflory
3bebab57e4 Remove XXX 2019-12-19 10:54:58 +01:00
yflory
bfc519331b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-12-19 10:35:38 +01:00
yflory
d2ba375491 Improve profile UI 2019-12-19 10:34:08 +01:00
Weblate
e3fc741402 Translated using Weblate (German)
Currently translated at 99.9% (1182 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-12-18 23:21:39 +00:00
Weblate
dc4feda738 Translated using Weblate (English)
Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-12-18 23:21:38 +00:00
ansuz
ceb7fc4f66 remove XXX notes which have been addressed 2019-12-18 18:18:14 -05:00
ansuz
ea7d254d2f remove XXX 2019-12-18 18:00:27 -05:00
ansuz
167a846cf3 remove unused dependency 2019-12-18 17:59:28 -05:00
yflory
9ad2bf2bd6 lint compliance 2019-12-18 19:11:35 +01:00
yflory
e0782d753d Fix conflicting curvePublic 2019-12-18 19:10:30 +01:00
yflory
3cd93b1d52 Fix UI issue 2019-12-18 18:47:08 +01:00
yflory
186487cbda Fix cryptput issues 2019-12-18 18:45:17 +01:00
yflory
8c09e7d43c Merge branch 'staging' into inviteUI 2019-12-18 18:26:41 +01:00
yflory
a518cbcce7 Fix translation keys 2019-12-18 18:26:25 +01:00
yflory
b402b3c552 Add wrong password handler 2019-12-18 18:25:44 +01:00
yflory
0b6539893b Fix missing curvePublic 2019-12-18 18:17:05 +01:00
yflory
62c6765c21 Merge branch 'staging' into inviteUI 2019-12-18 18:14:10 +01:00
Weblate
a6c5ba4013 Translated using Weblate (French)
Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-12-18 17:13:51 +00:00
Weblate
df4664f877 Translated using Weblate (English)
Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-12-18 17:13:51 +00:00
yflory
4d1079e1e2 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 18:11:12 +01:00
yflory
994eefaf63 Merge branch 'staging' into inviteUI 2019-12-18 18:10:50 +01:00
yflory
25b88afeea Fix invitation links 2019-12-18 18:10:33 +01:00
ansuz
f4072ae817 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 12:02:52 -05:00
ansuz
9824136917 fix a typo 2019-12-18 12:02:42 -05:00
yflory
f98543bb83 Add category icon for link invitation 2019-12-18 18:02:33 +01:00
ansuz
90d8a7a684 remove an unused dependency 2019-12-18 12:02:26 -05:00