Commit graph

7373 commits

Author SHA1 Message Date
ansuz
9efceb2234
Merge pull request #470 from xwiki-labs/design_dialogs_props
remove // XXX
2019-11-25 11:06:10 -05:00
David Benqué
53b29ced05 Merge branch 'design_dialogs' into design_dialogs_usergrid 2019-11-25 15:58:36 +00:00
David Benqué
ea79593444 Merge branch 'design_dialogs_props' into design_dialogs_usergrid 2019-11-25 15:58:27 +00:00
David Benqué
5be70f7673 remove // XXX 2019-11-25 15:56:39 +00:00
yflory
ff6de41bec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 16:54:55 +01:00
ansuz
79013b27fe
Merge pull request #469 from xwiki-labs/design_dialogs
remove // XXX
2019-11-25 10:54:49 -05:00
yflory
b9be93101e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 16:53:52 +01:00
yflory
d8df3fd034 Remove XXX 2019-11-25 16:53:47 +01:00
ansuz
a1f25d937c bump version to 3.6.0 (GoldenFrog) 2019-11-25 10:51:46 -05:00
David Benqué
f826e6aa3b align filter input and buttons 2019-11-25 15:42:26 +00:00
David Benqué
8b3cea9ad9 remove // XXX 2019-11-25 15:11:49 +00:00
David Benqué
ef857dbe75 Merge branch 'design_dialogs_props' into design_dialogs_usergrid 2019-11-25 13:14:40 +00:00
yflory
12f6e3b1d4 Merge branch 'design_dialogs_props' of github.com:xwiki-labs/cryptpad into design_dialogs_props 2019-11-25 13:26:46 +01:00
David Benqué
06434e576e change size message 2019-11-25 11:22:07 +00:00
yflory
5de5bb603d Merge branch 'staging' into design_dialogs_props 2019-11-25 12:17:03 +01:00
David Benqué
9a3c4c4350 remove hard-coded punctuation 2019-11-25 11:13:04 +00:00
yflory
6ee98cac5b Fix premium account detection 2019-11-25 11:47:52 +01:00
yflory
7895d93704 Merge branch 'master' into staging 2019-11-25 11:03:13 +01:00
yflory
b73e195408 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 10:59:35 +01:00
yflory
bfd2ca85b5 Merge branch 'design_dialogs' into staging 2019-11-25 10:59:10 +01:00
David Benqué
baf911c3c2 lint 2019-11-25 09:49:14 +00:00
David Benqué
5d7886325d style secondary and cancel buttons 2019-11-25 09:48:08 +00:00
Weblate
9e9099f6d8 Translated using Weblate (German)
Currently translated at 100.0% (1148 of 1148 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-11-25 09:45:33 +00:00
yflory
9a8604dfb4 Fix debug app restore history 2019-11-22 18:02:33 +01:00
yflory
a6589d0d06 Ability to restore an old version from the debug app 2019-11-22 17:58:21 +01:00
David Benqué
09a162c6be XXX problem 2019-11-22 16:48:09 +00:00
Weblate
552a7d53e7 Translated using Weblate (French)
Currently translated at 100.0% (1148 of 1148 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-11-22 16:39:17 +00:00
Weblate
ce08b5234c Translated using Weblate (English)
Currently translated at 100.0% (1148 of 1148 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1148 of 1148 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-11-22 16:39:17 +00:00
Weblate
2940366d70 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
c36038a0b2 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
4dae892a46 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
4220787366 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
5f3fd9858a Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
b58fe94170 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
8f00077df2 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
1193933509 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
0eb5c3e5b5 Translated using Weblate (French)
Currently translated at 100.0% (1147 of 1147 strings)

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

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:46 +00:00
Weblate
47342dd1c0 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-11-22 16:32:45 +00:00
yflory
7e45f597c9 Merge branch 'design_dialogs' into staging 2019-11-22 17:26:53 +01:00
David Benqué
09b07de6f2 lint 2019-11-22 16:10:24 +00:00
David Benqué
9a67537080 Merge branch 'design_dialogs' into design_dialogs_props 2019-11-22 16:09:09 +00:00
David Benqué
0429859c26 Merge remote-tracking branch 'origin/design_dialogs' into design_dialogs 2019-11-22 16:03:50 +00:00
David Benqué
754fa9dab2 review and lint 2019-11-22 16:03:17 +00:00
yflory
82bb710060 Don't close the share modal when clicking Preview 2019-11-22 16:40:20 +01:00
yflory
be7b184d97 Fix space bar shortcut to dselect a radio input 2019-11-22 16:02:05 +01:00
David Benqué
1703186ebf correct readonly selector 2019-11-22 14:58:22 +00:00
yflory
65585f6ce8 lint compliance 2019-11-22 15:52:30 +01:00
yflory
a573255072 Word count integration 2019-11-22 15:50:32 +01:00
David Benqué
57ba4e0bcd address XXX issues 2019-11-22 11:34:13 +00:00
yflory
9f903b645a ckeditor wordcount 2019-11-22 12:20:07 +01:00