Commit graph

1208 commits

Author SHA1 Message Date
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
303953a431 Merge branch 'soon' into login 2016-12-19 11:04:46 +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
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
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
ansuz
2ee5ef2289 add english translations for login 2016-12-16 15:21:37 +01:00
ansuz
f13eb28252 add support for translating placeholders 2016-12-16 15:20:01 +01:00
ansuz
67baf30d65 basic outline of logins 2016-12-16 15:19:17 +01:00
ansuz
2968488278 convert uint8 arrays to hex 2016-12-16 15:18:06 +01:00
yflory
d95a3ac92e Fix an issue when deleting a key from the proxy 2016-12-16 11:41:45 +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
yflory
82f3d5f852 Open the file manager of someone else 2016-12-13 18:59:04 +01:00
ansuz
c0d96fb10d Merge branch 'login' into test-filemanager 2016-12-13 11:21:18 +01:00
yflory
c3e3aa69c3 Merge branch 'fileManager' into fmIndex 2016-12-12 18:27:19 +01:00
ansuz
5d335ba796 Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:25:07 +01:00
yflory
8e6830d080 Fix file manager with a chosen hash 2016-12-12 18:24:45 +01:00
yflory
2b077a8e95 add the file manager in the main page 2016-12-12 18:03:06 +01:00
ansuz
f36d15d0db Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:03:00 +01:00
yflory
b7f2ef97c7 Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager 2016-12-12 12:05:31 +01:00
yflory
91833f72a1 Merge branch 'fileManagerMerge' into fileManager 2016-12-12 12:04:05 +01:00
yflory
fdb5c2ddb5 Fix UI issues with rename and delete actions 2016-12-12 12:03:54 +01:00
yflory
319ce5d8c8 Fix the code app 2016-12-12 10:35:28 +01:00
yflory
ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory
43ccd11adc Merge branch 'infiniteSpinner' into fileManagerMerge 2016-12-08 16:03:18 +01:00
yflory
407152f061 Merge branch 'infiniteSpinner' into fileManager 2016-12-08 16:01:59 +01:00
yflory
05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
yflory
5cd7d8ec84 Fix undefined userid in new poll 2016-12-08 10:19:23 +01:00
Valentin Lorentz
118085b809 Review French translation. 2016-12-07 19:42:07 +01:00
yflory
cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 2016-12-07 16:59:43 +01:00
yflory
9b3719e0ae Merge branch 'soon' into fileManagerMerge 2016-12-07 16:59:32 +01:00
yflory
b7b4a034a3 Merge branch 'soon' into newpoll 2016-12-07 16:58:28 +01:00
ansuz
ab5a4007ba Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish 2016-12-07 12:23:26 +01:00
yflory
ddc99cecb1 Fix lint errors 2016-12-07 12:22:27 +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
yflory
f26cdb1a21 Fix UI issues, unclickable user column, add confirm dialog 2016-12-07 11:44:09 +01:00
yflory
6feb8548b3 Prevent the proxy handlers from being called on the parents 2016-12-07 11:12:35 +01:00