yflory
a10eac2773
Fix lint errors
2016-12-22 18:16:38 +01:00
ansuz
52a593c2c2
fix jshint complaints
2016-12-22 17:27:56 +01:00
ansuz
25c8ea464b
Merge branch 'soon' into login
2016-12-22 17:22:42 +01:00
ansuz
53a4d4738a
really make sure you're logged out
2016-12-22 17:22:32 +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
ansuz
acfc27f5c5
fix merge conflicts
2016-12-22 16:53:03 +01:00
ansuz
3197b62fbb
latest work
2016-12-22 16:44:49 +01:00
ansuz
29d406b7a9
implement cryptput
2016-12-22 16:00:13 +01:00
ansuz
84d5e4b35d
better tools for playing with template code
2016-12-22 11:03:44 +01:00
yflory
1772cc93c8
Fix the taildoc bug
2016-12-22 11:02:12 +01:00
yflory
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
ansuz
86cda4357b
handle more possible cases
2016-12-21 18:24:48 +01:00
ansuz
1682d23c1c
remove old user prototype
2016-12-21 18:06:05 +01:00
yflory
046220f239
Add info boxes for the different categories
2016-12-21 11:46:49 +01:00
yflory
403ba53980
Fix typo error
2016-12-21 10:22:48 +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
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
f9db7e588e
Fix unused backup in localStorage
2016-12-20 14:37:29 +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
ansuz
bd6992da0a
create a random hash
2016-12-20 11:13:15 +01:00
ansuz
2cd50498c2
add log(in|out) functions to common
2016-12-20 11:11:40 +01:00
ansuz
dfea802c77
better crypto hygeine, start thinking more about ui
2016-12-20 11:09:41 +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
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
ansuz
3698fe8b0e
Merge branch 'soon' into login
2016-12-19 12:51:57 +01:00
ansuz
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
ansuz
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-19 12:37:02 +01:00
yflory
4646d5c866
Add suport for read-only mode in the file manager
2016-12-19 12:35:13 +01:00
ansuz
2a624a0b60
add example usage for cryptget.js
2016-12-19 12:25:36 +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
