1212 Commits

Author SHA1 Message Date
ansuz
46024853ec restrict cryptpad styles to descendants of .cp 2016-12-27 14:30:27 +01:00
ansuz
e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
ansuz
5a4ec358b3 Merge branch 'soon' into staging 2016-12-27 13:36:23 +01:00
ansuz
71488e6651 add link to markdown tutorial 2016-12-27 13:36:02 +01:00
ansuz
bc49e143b8 give alertify popups their own bg var 2016-12-27 12:34:31 +01:00
ansuz
db12b5e896 move text for login page into translation file 2016-12-27 12:31:16 +01:00
ansuz
f9da200381 resolve merge conflicts in translations 2016-12-26 14:25:02 +01:00
ansuz
4476fd4006 s/readOnly/readonly 2016-12-22 18:15:18 +01:00
ansuz
25c8ea464b Merge branch 'soon' into login 2016-12-22 17:22:42 +01:00
ansuz
63cd5c16ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 17:20:30 +01:00
yflory
81259fc25f Refresh unsorted and templates when files data changes 2016-12-22 17:20:05 +01:00
ansuz
5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 16:54:51 +01:00
ansuz
21360801de change a few english keys 2016-12-22 16:54:17 +01:00
yflory
9b6c9e3891 Add support for templates in the file manager 2016-12-22 16:53:38 +01:00
yflory
1772cc93c8 Fix the taildoc bug 2016-12-22 11:02:12 +01:00
Pierre BONDOERFFER
3b10217fb0 fixed buttons breaking responsive layout 2016-12-22 04:54:28 +01:00
Pierre BONDOERFFER
f5e7a6f0c8 Fixed up Spanish translation 🇪🇸 2016-12-22 03:34:31 +01:00
Pierre BONDOERFFER
87582d41a9 Added alt tags to English translation 2016-12-22 03:34:12 +01:00
yflory
87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
yflory
046220f239 Add info boxes for the different categories 2016-12-21 11:46:49 +01:00
yflory
e9418af88b Add an info box in the file manager 2016-12-20 18:59:50 +01:00
ansuz
1f762ce55b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 17:27:59 +01:00
yflory
c359c27997 Use user object as default store in file manager 2016-12-20 17:27:45 +01:00
ansuz
820537f7e3 rebuild css 2016-12-20 16:54:53 +01:00
ansuz
4991bfab92 rebuild css 2016-12-20 16:54:36 +01:00
ansuz
280a6c462a implement white image correctly 2016-12-20 16:42:14 +01:00
ansuz
5c46fa7c65 implement white image correctly 2016-12-20 16:41:05 +01:00
yflory
4aed585574 Fix style issues in the toolbar 2016-12-20 14:40:00 +01:00
yflory
959983cc8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 11:31:06 +01:00
yflory
c7e63f63fd Use the user object in file manager if it exists 2016-12-20 11:30:04 +01:00
ansuz
9dbe583f4b Merge branch 'soon' into staging 2016-12-20 11:27:26 +01:00
ansuz
835c33113e Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon 2016-12-20 11:25:09 +01:00
ansuz
6778a7062d Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 11:23:54 +01:00
ansuz
5a39caf95a new messages for login 2016-12-20 11:16:49 +01:00
Gustavo H M Silva
fc19626ead Revised TOD for better comprehension
Whoa, when reading the translation on live pages, it's easy to see how some things may be better presented in plain text form. 

I've just finished the TOS and should deliver a better version of the Privacy Policy soon!
2016-12-19 16:43:02 -02:00
yflory
e3f484d876 File manager in the home page, lint 2016-12-19 17:53:03 +01:00
gustavohmsilva
88dcd2ecc3 FP correction & revision for better comprehension
I've fixed some minor errors and revised some texts in order to provide better sense for the text. 
Beside that, I've reduced the text (keeping it's meaning of course) of the buttons close to the bottom of the front page, since on Firefox, Chrome and Safari, the buttons seems to not be adaptive oriented as the main text divs.
2016-12-19 13:23:45 -02:00
ansuz
5a14db9f07 Merge branch 'test-filemanager' into login 2016-12-19 12:37:28 +01:00
ansuz
5de926493a Merge branch 'soon' into login 2016-12-19 12:11:18 +01:00
Valentin Lorentz
df9f408823 Improve French translation of index.html 2016-12-19 11:51:21 +01:00
ansuz
e8f27ba7a0 Merge branch 'review-french-translation' of github.com:ProgVal/cryptpad into francais 2016-12-19 11:39:49 +01:00
ansuz
3dd5748f7f integrate brazilian portuguese translation 2016-12-19 11:32:15 +01:00
ansuz
d6229e31a4 Merge branch 'master' of github.com:gustavohmsilva/cryptpad into merge-ptbr 2016-12-19 11:20:05 +01:00
mateon1
481f3a42f7 Apply corrections to the Polish translation 2016-12-16 23:18:00 +01:00
gustavohmsilva
98bbe678e9 Finished translation to Brazilian Portuguese
Added header with contributor name and contact for future inquires regarding pt-br translation.
Legal stuff, bottom and header translated, links comments translated whenever possible.
Please inform me if new translating keys get's added, so I can maintain this translation updated.

Translation done with love from Brazil.
2016-12-16 17:56:45 -02:00
gustavohmsilva
270fda6243 About 60% translated already to Brazilian Portuguese
lines 1 to 186
2016-12-16 16:10:58 -02:00
yflory
5bc7766f44 Use a consistent toolbar across all apps 2016-12-16 18:35:49 +01:00
ansuz
8a7fda6341 Merge branch 'soon' into login 2016-12-16 18:10:35 +01:00
ansuz
d09983ac92 s/kenntnisfreier/zero knowledge 2016-12-16 17:54:50 +01:00
ansuz
2ee2ffcfac resolve conflicts in german PR 2016-12-16 17:38:53 +01:00