infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
7,642 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

7642 Commits (10eed5c46dc6dc63a9348be73e8f3ce112074cb8)

Author SHA1 Message Date
yflory 50886b81da Update orgmode regex in codemirror #466 2019-11-27 11:31:49 +01:00
ansuz 1523a3107e update changelog to include 3.6.0 (GoldenFrog) 2019-11-26 17:35:26 -05:00
yflory 580731d560 Merge branch 'staging' into ooPassword 2019-11-26 16:13:41 +01:00
yflory 851437a05b Fix onlyoffice password change 2019-11-26 16:13:21 +01:00
David Benqué 66073804ee remove rounded corners on avatars 2019-11-26 11:50:34 +00:00
David Benqué 8fc08538a1 open share modal on ready 2019-11-26 11:21:58 +00:00
ansuz b246fc73a7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 20:59:42 -05:00
ansuz b5a05c1de3 clean up some dead code and do a quick optimizing pass 2019-11-25 20:37:04 -05:00
David Benqué 01d7d21754 Merge branch 'staging' into design_dialogs_usergrid 2019-11-25 17:05:00 +00:00
yflory 77ee1b02dc Add missing margin in usergrid 2019-11-25 17:58:33 +01:00
yflory 09fdfa2ad2 Fix usergrid UI issues 2019-11-25 17:54:22 +01:00
yflory 28308cb629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:44:01 +01:00
yflory bf6681c5e6 Better spacing between items in usergrid 2019-11-25 17:43:55 +01:00
yflory 89cff3c541 Remove invisible title in usergrid 2019-11-25 17:33:56 +01:00
ansuz 27793c6755 remove XXX 2019-11-25 11:09:54 -05:00
yflory c1c000149b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:07:26 +01:00
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
yflory c414bf1d5c Merge branch 'staging' into ooPassword 2019-11-25 16:51:06 +01:00
yflory 0dc0df8aa1 Remove XXX 2019-11-25 16:50:38 +01: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