Commit Graph

8870 Commits (3e71b3afac6f927056b62b04e66922290df31d66)

Author SHA1 Message Date
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
David Benqué 961cb8e427 apply max-width only to settings 2020-02-10 10:07:16 +00:00
yflory 4d2538c796 Make hidden hashes disabled by default 2020-02-10 10:46:20 +01:00
ansuz 7000be0e70 clean up historykeeper 2020-02-07 18:58:57 -05:00
ansuz 802034616c centralize historykeeper-rpc interaction in rpc methods 2020-02-07 12:53:12 -05:00
David Benqué f23649c1ce remove obsolete keys 2020-02-07 16:28:29 +00:00
Weblate 1332f33a1a Translated using Weblate (French)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-07 17:25:22 +01:00
Weblate 49294fc0c3 Translated using Weblate (English)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-02-07 17:25:22 +01:00
yflory 7d0dbe5d09 Remove XXX 2020-02-07 14:10:50 +01:00
yflory 1a1620f76d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-07 13:37:06 +01:00
yflory ea5c6defe6 Fix import mediatag to the drive 2020-02-07 13:36:54 +01:00
David Benqué fede44c8e5 remove XXXs related to translation keys 2020-02-07 11:04:51 +00:00
David Benqué f9b101dcd9 use the same key to say 'don't show again' 2020-02-07 10:59:50 +00:00
Weblate 4cf834fb22 Translated using Weblate (English)
Currently translated at 100.0% (1204 of 1204 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1204 of 1204 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1203 of 1203 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1202 of 1202 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1201 of 1201 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1200 of 1200 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1199 of 1199 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1198 of 1198 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-02-07 11:55:57 +01:00
Weblate 164e5d63d2 Translated using Weblate (French)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-07 11:55:57 +01:00
Weblate 961f475dcd Translated using Weblate (Catalan)
Currently translated at 51.5% (616 of 1197 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
2020-02-07 11:55:56 +01:00
David Benqué d9f2c90c25 fix color of expiration warning in sheets 2020-02-07 09:40:17 +00:00
yflory 9ba786df4c Fix avatar in notification history 2020-02-06 18:32:05 +01:00
David Benqué 0efbc77370 add max-width to settings 2020-02-06 17:27:16 +00:00
yflory 9e60c8eb93 Show more than 5 entries in the upload table 2020-02-06 17:42:54 +01:00
yflory 331054870f Better sidebar layout for mobile 2020-02-06 16:06:09 +01:00
yflory 12a45377e7 Fix password change issues with read-only pads or from the drive 2020-02-06 15:35:58 +01:00
yflory 086e500b8e Fix hidden hash error with password change 2020-02-06 13:58:27 +01:00
yflory 872896543f Merge branch 'communities-trim' of github.com:xwiki-labs/cryptpad into communities-trim 2020-02-06 12:03:19 +01:00