Commit graph

8041 commits

Author SHA1 Message Date
ansuz
9cac465b08 add missing font-awesome share icon to the safe link hint 2020-02-10 15:39:57 -05:00
ansuz
2a6afcc176 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 13:05:42 -05:00
ansuz
1be01c07ee fix bad copypaste in the example nginx file 2020-02-10 13:04:58 -05:00
yflory
7fdf67b438 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 18:34:15 +01:00
yflory
44de8a41a1 Improve confirm modal keydown listeners 2020-02-10 18:33:59 +01:00
Weblate
4f9d0d71f9 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:01 +01:00
Weblate
8f06090626 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
fbf1e287e9 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
985ed2505d Translated using Weblate (German)
Currently translated at 100.0% (1201 of 1201 strings)

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

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
80ae86cda3 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
be929ecc8f Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
ac39a97a0f Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
9c6109799e Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
b73ef31a2c Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
d372f436d8 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
Weblate
67a837349b Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-02-10 18:28:00 +01:00
yflory
c0e9e86a9e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 17:59:01 +01:00
yflory
532333d427 Fix keyboard shortcut in confirm 2020-02-10 17:58:39 +01:00
ansuz
0e9ba3a88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 11:48:11 -05:00
ansuz
bc2febfb8b bump version, drop flow dependency, use newer chainpad-server 2020-02-10 11:47:55 -05:00
yflory
a86469206e Fix horizontal scrollbar again 2020-02-10 17:37:48 +01:00
yflory
26d05920c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 17:25:58 +01:00
yflory
bf7f2e5bcd Fix upload table horizontal scrollbar + add autoscroll 2020-02-10 17:25:50 +01:00
ansuz
1231cacef1 remove XXX 2020-02-10 11:21:04 -05:00
ansuz
0c2e5d14b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 11:07:51 -05:00
ansuz
63a36df39b push the pending upload table below the file upload dialog 2020-02-10 11:07:46 -05:00
yflory
f9eea74b54 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 16:36:10 +01:00
yflory
6a365da3d8 Merge branch 'sidebarlayout' into staging 2020-02-10 16:35:47 +01:00
yflory
38ac562de2 Merge branch 'sidebarlayout' of github.com:xwiki-labs/cryptpad into sidebarlayout 2020-02-10 16:13:47 +01:00
yflory
3d2538c3ca Fix narrow sidebar in teams 2020-02-10 16:13:29 +01:00
ansuz
cff663e876 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 10:01:06 -05:00
ansuz
57be324850 remove some XXX notes 2020-02-10 10:01:02 -05:00
yflory
4cd39f4f32 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 15:45:03 +01:00
yflory
40b144f87b remove XXX 2020-02-10 15:24:27 +01:00
David Benqué
1c9132adcb Merge remote-tracking branch 'origin/staging' into staging 2020-02-10 14:20:41 +00:00
David Benqué
a328dc6c08 fix text input color in team chat 2020-02-10 14:20:14 +00:00
yflory
a333531a36 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 15:11:48 +01:00
yflory
b69261d119 Display the share modal after folder conversion to sf 2020-02-10 15:11:37 +01:00
ansuz
68a77885d4 suppress some routine server logs 2020-02-10 09:03:16 -05:00
yflory
830c401f50 Remove invalid option in context menu 2020-02-10 14:54:35 +01:00
yflory
d0f8458dd2 Fix openincode in anon shared folders 2020-02-10 14:43:22 +01:00
ansuz
7f22da0f57 fix use of incorrect key format in admin-rpc 2020-02-10 08:07:29 -05:00
ansuz
86b9cc2de1 accidentally merge uncommitted work with staging, resolve merge conflicts 2020-02-10 08:05:43 -05:00
yflory
8afb0255c1 Fix team creation 2020-02-10 13:27:07 +01:00
yflory
09076f39ff Fix and reenable folder to SF conversion 2020-02-10 12:01:00 +01:00
David Benqué
fbd8700a18 fix highlighting of support messages 2020-02-10 10:58:17 +00:00
yflory
403867d4cd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 11:17:45 +01:00
yflory
7ca92526e7 Remove 'Owned pads' category from the drive 2020-02-10 11:17:01 +01:00
yflory
243abc3e53 Change default settings for hidden hash 2020-02-10 11:16:44 +01:00
David Benqué
6c23afdcc6 fix max-width 2020-02-10 10:16:17 +00:00