5c46fa7c65
implement white image correctly
2016-12-20 16:41:05 +01:00
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
f9db7e588e
Fix unused backup in localStorage
2016-12-20 14:37:29 +01:00
959983cc8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:31:06 +01:00
c7e63f63fd
Use the user object in file manager if it exists
2016-12-20 11:30:04 +01:00
9dbe583f4b
Merge branch 'soon' into staging
2016-12-20 11:27:26 +01:00
835c33113e
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon
2016-12-20 11:25:09 +01:00
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:23:54 +01:00
5a39caf95a
new messages for login
2016-12-20 11:16:49 +01:00
bd6992da0a
create a random hash
2016-12-20 11:13:15 +01:00
2cd50498c2
add log(in|out) functions to common
2016-12-20 11:11:40 +01:00
dfea802c77
better crypto hygeine, start thinking more about ui
2016-12-20 11:09:41 +01:00
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
e3f484d876
File manager in the home page, lint
2016-12-19 17:53:03 +01:00
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
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
3698fe8b0e
Merge branch 'soon' into login
2016-12-19 12:51:57 +01:00
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-19 12:37:02 +01:00
4646d5c866
Add suport for read-only mode in the file manager
2016-12-19 12:35:13 +01:00
2a624a0b60
add example usage for cryptget.js
2016-12-19 12:25:36 +01:00
5de926493a
Merge branch 'soon' into login
2016-12-19 12:11:18 +01:00
df9f408823
Improve French translation of index.html
2016-12-19 11:51:21 +01:00
e8f27ba7a0
Merge branch 'review-french-translation' of github.com:ProgVal/cryptpad into francais
2016-12-19 11:39:49 +01:00
3dd5748f7f
integrate brazilian portuguese translation
2016-12-19 11:32:15 +01:00
d6229e31a4
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into merge-ptbr
2016-12-19 11:20:05 +01:00
2a06b8137e
Merge pull request #68 from mateon1/soon
...
Apply corrections to the Polish translation
2016-12-19 11:17:55 +01:00
303953a431
Merge branch 'soon' into login
2016-12-19 11:04:46 +01:00
6b9529b121
implement ajax-like functionality for zk docs
2016-12-19 10:59:18 +01:00
481f3a42f7
Apply corrections to the Polish translation
2016-12-16 23:18:00 +01:00
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
270fda6243
About 60% translated already to Brazilian Portuguese
...
lines 1 to 186
2016-12-16 16:10:58 -02:00
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
d09983ac92
s/kenntnisfreier/zero knowledge
2016-12-16 17:54:50 +01:00
2ee2ffcfac
resolve conflicts in german PR
2016-12-16 17:38:53 +01:00
a220742f68
fix reversed color settings
2016-12-16 15:31:22 +01:00
af2d9cb5b1
Merge branch 'merge-polish' into soon
2016-12-16 15:29:24 +01:00
308db7fa79
fix uncolored /pad/ content in IE
2016-12-16 15:25:06 +01:00
2ee5ef2289
add english translations for login
2016-12-16 15:21:37 +01:00
f13eb28252
add support for translating placeholders
2016-12-16 15:20:01 +01:00
67baf30d65
basic outline of logins
2016-12-16 15:19:17 +01:00
2968488278
convert uint8 arrays to hex
2016-12-16 15:18:06 +01:00
d95a3ac92e
Fix an issue when deleting a key from the proxy
2016-12-16 11:41:45 +01:00
1f82a44f95
Merge branch 'master' of github.com:xwiki-labs/cryptpad
...
German Translation Added.
2016-12-13 20:18:18 +01:00
3ee7f4e96b
Added German translation
2016-12-13 20:14:22 +01:00
82f3d5f852
Open the file manager of someone else
2016-12-13 18:59:04 +01:00
c0d96fb10d
Merge branch 'login' into test-filemanager
2016-12-13 11:21:18 +01:00
c3e3aa69c3
Merge branch 'fileManager' into fmIndex
2016-12-12 18:27:19 +01:00
5d335ba796
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:25:07 +01:00
ansuz