7679 Commits

Author SHA1 Message Date
ansuz
4aaef2d811 remove use of deprecated 'new Buffer' instanciation 2020-01-06 14:29:45 -05:00
yflory
f590f60dcb Fix transfer ownership to a team 2020-01-06 17:51:40 +01:00
yflory
eb85a5908e Fix pad type in search for read-only pads 2020-01-06 17:05:29 +01:00
yflory
080ffa09a6 Fix 'team is undefined' error 2020-01-06 10:43:04 +01:00
ansuz
1cf95e6dae
Merge pull request #484 from promasu/master
Log errors in faulty custom config file
2020-01-04 18:28:14 -05:00
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
ansuz
32bdfacd92 fix incorrectly pasted line 2020-01-04 11:56:09 -05:00
ansuz
75925b6ceb fix blob support in example config 2020-01-04 01:39:37 -05:00
ansuz
6cef88cced Merge branch 'soon' 2019-12-30 12:59:07 -05:00
ansuz
78b54fad53 prevent form autofill on the team invite modal 2019-12-30 12:59:00 -05:00
ansuz
78a1c6bdbd prevent form autofill on the team invite modal 2019-12-30 12:58:48 -05:00
ansuz
743f7264e0 prevent form autofill on the team invite modal 2019-12-30 12:58:26 -05:00
ansuz
adc29e8b42 Merge branch 'soon' into staging 2019-12-30 12:33:38 -05:00
ansuz
448a5c4b2c take note of config changes in CHANGELOG 2019-12-30 12:13:04 -05:00
ansuz
69bfca52fa nest volumes not exposed via HTTP in 'data' folder for easier migration 2019-12-30 12:11:44 -05:00
ansuz
80f3175a0e simplify cipher list, better dhparams 2019-12-27 13:05:02 -05:00
ansuz
f2129161d9 Merge branch 'nginx-domain-variables' into staging 2019-12-26 18:24:28 -05:00
ansuz
7c9b53695b add a bunch of comments to all the mysterious sections of the nginx example config
also remove a large, complicated, unnecessary section
2019-12-26 18:23:52 -05:00
ansuz
05699b2c94 unify websocket configuration points 2019-12-23 18:27:11 -05:00
ansuz
a8b363dba0 drop support for 'websocketPath' and 'useExternalWebsocket' configuration points 2019-12-23 18:23:50 -05:00
ansuz
97bc793ca8 simplify websocket configuration even more 2019-12-23 17:39:13 -05:00
ansuz
67cde69120 drop support for configuration points we can't possibly support 2019-12-23 17:28:01 -05:00
ansuz
4c51d464fd drop replify integration 2019-12-23 17:15:07 -05:00
ansuz
cffb0da833 remove ssl support in node server.
Use a reverse proxy for this.
2019-12-23 17:05:08 -05:00
ansuz
2dfbb522b0 simplify server websocket configuration 2019-12-23 17:01:00 -05:00
ansuz
31ec784de6 remove examples directoryr 2019-12-23 16:48:15 -05:00
yflory
72e308994d Fix scrollbar in support's textarea 2019-12-23 15:46:16 +01:00
yflory
c2c5dbdb64 Remove hash when joining a team with a link 2019-12-20 15:48:29 +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