Commit graph

8200 commits

Author SHA1 Message Date
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
yflory
5d77857012 Merge branch 'staging' into communities-trim 2020-02-06 12:01:48 +01:00
yflory
753fdbdc12 Display error for pad history trim 2020-02-06 12:01:35 +01:00
yflory
8d01711244 Disable trim history is nothing to remove 2020-02-06 12:00:12 +01:00
yflory
b8ee120b49 lint compliance 2020-02-06 11:58:11 +01:00
yflory
9c6ab86e4d Fix syntax error 2020-02-06 11:57:50 +01:00
yflory
fd095644a2 Merge branch 'staging' into communities-trim 2020-02-06 11:55:07 +01:00
yflory
64c0f3a90d Add missing RPC command 2020-02-06 11:54:46 +01:00
yflory
d8199b8274 Update UI for trim history 2020-02-06 11:34:52 +01:00
yflory
9a857ea058 Merge branch 'staging' into communities-trim 2020-02-06 10:55:12 +01:00
yflory
b96079cd44 Remove hidden hash XXX 2020-02-06 10:49:11 +01:00
ansuz
b4172676f3 lint compliance 2020-02-05 18:12:09 -05:00
ansuz
3e06c4bfe3 resolve conflict and lint compliance 2020-02-05 18:10:05 -05:00
ansuz
3ab83826e6 WIP changelog 2020-02-05 18:06:40 -05:00
ansuz
342aea705a not about a history-keeper anti-pattern 2020-02-05 18:06:18 -05:00
ansuz
f17d14fd99 simpler limit updates 2020-02-05 18:01:48 -05:00
ansuz
bde17a62a1 continue refactoring rpc 2020-02-05 17:31:44 -05:00
ansuz
d17e180420 add a short delay in the rpc test to give the server time to write metadata to the disk before checking it 2020-02-05 13:41:46 -05:00
ansuz
fa525817ba fix broken removePins RPC 2020-02-05 13:05:06 -05:00