1101 Commits

Author SHA1 Message Date
ansuz
820537f7e3 rebuild css 2016-12-20 16:54:53 +01:00
ansuz
280a6c462a implement white image correctly 2016-12-20 16:42:14 +01:00
ansuz
835c33113e Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon 2016-12-20 11:25:09 +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
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
2a624a0b60 add example usage for cryptget.js 2016-12-19 12:25:36 +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
ansuz
2a06b8137e Merge pull request #68 from mateon1/soon
Apply corrections to the Polish translation
2016-12-19 11:17:55 +01:00
ansuz
6b9529b121 implement ajax-like functionality for zk docs 2016-12-19 10:59:18 +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
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
ansuz
a220742f68 fix reversed color settings 2016-12-16 15:31:22 +01:00
ansuz
af2d9cb5b1 Merge branch 'merge-polish' into soon 2016-12-16 15:29:24 +01:00
ansuz
308db7fa79 fix uncolored /pad/ content in IE 2016-12-16 15:25:06 +01:00
Michael Achmann
1f82a44f95 Merge branch 'master' of github.com:xwiki-labs/cryptpad
German Translation Added.
2016-12-13 20:18:18 +01:00
Michael Achmann
3ee7f4e96b Added German translation 2016-12-13 20:14:22 +01:00
Valentin Lorentz
118085b809 Review French translation. 2016-12-07 19:42:07 +01:00
ansuz
ab5a4007ba Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish 2016-12-07 12:23:26 +01:00
pojebunny
5979b03794 Shortened translation for Create New buttons 2016-12-07 12:20:31 +01:00
ansuz
7a13993e9a Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish 2016-12-07 12:00:42 +01:00
pojebunny
f6f1bc09bb Added options to choose Polish language 2016-12-06 18:02:43 +01:00
pojebunny
0b459890fd Added polish translation 2016-12-06 18:01:41 +01:00
ansuz
4cd9bd5534 strip listeners 2016-12-06 16:21:11 +01:00
ansuz
b79618c94a don't allow listeners in /slide/ 2016-12-06 16:00:38 +01:00
ansuz
ebff304602 turn off some unwanted behaviour 2016-12-06 15:16:43 +01:00
Michael Achmann
6eb29a6962 Added German Translation 2016-11-19 01:24:23 +01:00
Michael Achmann
5fecfb99a5 Added German Translation 2016-11-19 01:23:59 +01:00
ansuz
4c5cb79c20 Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
2016-11-07 15:08:49 +01:00
ansuz
c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz
3ce5b615d9 Merge pull request #57 from xwiki-labs/order-buttons
display buttons according to their order in application_config.js
2016-11-07 14:53:38 +01:00
ansuz
0e2140dc13 Merge branch 'soon' 2016-11-07 12:30:16 +01:00
ansuz
d009b7400c fall back to default title if one is not suggested 2016-11-07 12:29:57 +01:00
ansuz
e77ad4e909 better fixes for export 2016-11-07 12:26:48 +01:00
ansuz
65bc6f1a20 Merge pull request #56 from xwiki-labs/soon
Soon
2016-11-07 12:11:34 +01:00
ansuz
75dd4a5926 slightly better test for variable 2016-11-07 12:11:01 +01:00
ansuz
b7d9998b9b fix reference to undefined variable 2016-11-07 12:10:00 +01:00
ansuz
e90ab105aa display buttons according to the order in application_config.js 2016-11-07 11:43:49 +01:00
ansuz
303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +01:00
ansuz
67bf41627d comment out dead code so CI doesn't complain 2016-11-04 17:09:13 +01:00
ansuz
86bad46f48 comment out dead code so CI doesn't complain 2016-11-04 17:08:46 +01:00
ansuz
d8ca7963dc Merge branch 'soon' 2016-11-04 16:18:21 +01:00
ansuz
002e22ee9a turn off unwanted behaviour until we can do it correctly 2016-11-04 16:17:59 +01:00
ansuz
ef37dcd7e4 add note about how missing keys are treated 2016-11-04 16:11:33 +01:00
ansuz
d3ca9aa56d Merge branch 'soon' 2016-11-04 14:55:01 +01:00