 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
|
8b034a9554
|
better flow and animations for login page
|
2016-12-27 12:32:20 +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
|
5e1d8292c5
|
guard against trying to parse special fragments
|
2016-12-26 14:23:17 +01:00 |
|
|
ansuz
|
51067430f9
|
more restructuring of user app
|
2016-12-26 14:19:29 +01:00 |
|
|
ansuz
|
a4ed2388e2
|
use 'box' class
|
2016-12-26 14:19:02 +01:00 |
|
|
ansuz
|
eb620bee77
|
restructure user application
|
2016-12-26 14:17:39 +01:00 |
|
|
ansuz
|
4476fd4006
|
s/readOnly/readonly
|
2016-12-22 18:15:18 +01:00 |
|
|
ansuz
|
a4690239d3
|
Merge branch 'master' of github.com:pbondoer/cryptpad into espanol
|
2016-12-22 18:09:29 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
ansuz
|
1f762ce55b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2016-12-20 17:27:59 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
ansuz
|
c0d96fb10d
|
Merge branch 'login' into test-filemanager
|
2016-12-13 11:21:18 +01:00 |
|
|
ansuz
|
5d335ba796
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
2016-12-12 18:25:07 +01:00 |
|
|
ansuz
|
f36d15d0db
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
2016-12-12 18:03:00 +01:00 |
|
|
ansuz
|
ab5a4007ba
|
Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish
|
2016-12-07 12:23:26 +01:00 |
|
|
ansuz
|
7a13993e9a
|
Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish
|
2016-12-07 12:00:42 +01:00 |
|
|
ansuz
|
94fbc2dca4
|
prototype cryptographic login
|
2016-12-06 17:34:24 +01:00 |
|
|
ansuz
|
a23b3d3517
|
use new ot in code too
|
2016-12-06 16:22:58 +01:00 |
|
|
ansuz
|
de0863e232
|
use new ot
|
2016-12-06 16:22:42 +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 |
|
|
ansuz
|
bdb8a2ec59
|
additional styles for newpoll
|
2016-11-25 12:04:22 +01:00 |
|
|
ansuz
|
4a4d4a0474
|
most recent work
|
2016-11-25 12:02:58 +01:00 |
|
|
ansuz
|
e5ff7020fb
|
move buttons out of form
|
2016-11-25 12:02:37 +01:00 |
|
|
ansuz
|
eb50177201
|
do a bit of work to preserve cursors
|
2016-11-14 18:03:17 +01:00 |
|
|
ansuz
|
ac43f4cb1f
|
new prototype poll
|
2016-11-14 15:56:49 +01:00 |
|
|
ansuz
|
c2770a7a74
|
set correct hash even if browser does not implement replaceState
|
2016-11-07 15:03:17 +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
|
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 |
|
|
ansuz
|
5fc44a6e4b
|
Merge branch 'soon' into fixpolls
|
2016-11-04 14:23:07 +01:00 |
|
|
ansuz
|
6366e95dd8
|
remove unnecessary translation key
|
2016-11-04 14:21:05 +01:00 |
|
|
ansuz
|
933831a2a8
|
add a comment about _languageName
|
2016-11-04 14:11:00 +01:00 |
|
|
ansuz
|
439a9981cc
|
add documentation for submitting a translation
|
2016-11-04 14:10:32 +01:00 |
|
|
ansuz
|
72f284bb53
|
add comments so translators don't get completely lost
|
2016-11-04 11:51:52 +01:00 |
|
|
ansuz
|
fda0f7d2e7
|
let javascript add language keys intead of html
|
2016-11-04 11:49:43 +01:00 |
|
|
ansuz
|
7b63decfee
|
eliminate one step from the translation process by auto-adding languages to selector
|
2016-11-04 11:46:59 +01:00 |
|
|
ansuz
|
779b3914f9
|
fix spanish pluralization and update howitworks
|
2016-11-04 10:32:20 +01:00 |
|
|
ansuz
|
e52450fdc7
|
update english and french translations to include link to bitcoin.pdf
|
2016-11-04 10:31:35 +01:00 |
|
|
ansuz
|
e997e619bb
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2016-11-03 18:38:21 +01:00 |
|
|
ansuz
|
f1bb63f915
|
translate missing keys to spanish using google translate
|
2016-11-03 16:05:37 +01:00 |
|
|
ansuz
|
8064b1d196
|
merge changes from soon
|
2016-11-03 16:05:02 +01:00 |
|