ansuz
|
83696495a8
|
use chainpad from bower, not local
|
2016-06-02 16:54:47 +02:00 |
|
ansuz
|
954ee26f4d
|
fix undefined disconnect reason
|
2016-06-01 12:19:54 +02:00 |
|
ansuz
|
9336c4de5c
|
import latest chainpad
|
2016-05-31 12:35:01 +02:00 |
|
ansuz
|
058548b95a
|
revert my reversion
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f.
|
2016-05-30 14:58:20 +02:00 |
|
ansuz
|
6e2e8bf21f
|
Revert "Added checkpoints with the new code from ChainPad"
This reverts commit da2bfe2de9.
|
2016-05-30 10:20:08 +02:00 |
|
ansuz
|
ce99bd9ba3
|
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
|
2016-05-28 13:15:33 +02:00 |
|
ansuz
|
a0c73c95d8
|
do away with a bit of boilerplate
|
2016-05-28 13:13:54 +02:00 |
|
Caleb James DeLisle
|
da2bfe2de9
|
Added checkpoints with the new code from ChainPad
|
2016-05-26 17:09:02 +02:00 |
|
ansuz
|
cf85de6113
|
remove old bencoding code
|
2016-05-25 11:54:36 +02:00 |
|
ansuz
|
d99bb8ff84
|
WIP : fallback to old parsing doesn't work
|
2016-05-20 17:46:48 +02:00 |
|
ansuz
|
f04be53d11
|
fall back to old parsing if the message is bencoded?
|
2016-05-20 16:45:25 +02:00 |
|
ansuz
|
976a08cc7a
|
move to chainpad version 2
|
2016-05-20 16:34:55 +02:00 |
|
ansuz
|
cae750cd75
|
update padrtc for to use bower libraries
|
2016-05-13 17:35:17 +02:00 |
|
ansuz
|
7faf57602b
|
implement log level settings from application layer
|
2016-05-10 09:39:20 +02:00 |
|
ansuz
|
523aff3067
|
use upstream chainpad.js
|
2016-05-09 15:50:19 +02:00 |
|
ansuz
|
c752e4a6e5
|
remove sharejs
|
2016-05-09 14:20:11 +02:00 |
|
ansuz
|
6b2e986789
|
remove deprecated textsocket library
|
2016-05-09 11:57:40 +02:00 |
|
ansuz
|
150ebaba7b
|
add ability to force text diffing
|
2016-04-27 17:58:55 +02:00 |
|
ansuz
|
ba17b78f7a
|
restyle name change button
|
2016-04-27 15:32:58 +02:00 |
|
Yann Flory
|
492054a938
|
Fix the cursor position when a remote patch is applied
|
2016-04-27 12:17:06 +02:00 |
|
Yann Flory
|
5bb2e12db2
|
Merge branch 'beta' into migrate
|
2016-04-27 10:51:51 +02:00 |
|
Yann Flory
|
cc51e6d6ed
|
Update CodeMirror pad to work with Netflux
|
2016-04-27 10:44:04 +02:00 |
|
Caleb James DeLisle
|
3b6fe44378
|
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-26 14:31:57 +02:00 |
|
Yann Flory
|
85d5f5c47f
|
Convert netflux to es5
|
2016-04-25 15:29:39 +02:00 |
|
Caleb James DeLisle
|
5f16ad4a58
|
Update to most recent chainpad
|
2016-04-22 18:17:00 +02:00 |
|
ansuz
|
aa07dd31ee
|
have json-ot initialize its own debug module, instead of relying on a window variable's existence
|
2016-04-22 17:35:07 +02:00 |
|
Yann Flory
|
d3203d1c2a
|
Remove Crypto from the modules loaded with RequireJS in realtime-input
It now has to be passed in the config in the main JS file
|
2016-04-22 14:26:37 +02:00 |
|
Yann Flory
|
8ac69ca262
|
Add a missing "time" property in the netflux client causing incorrect
timeout errors
|
2016-04-22 11:46:27 +02:00 |
|
ansuz
|
b140b6429d
|
remove a little bit of dead code
|
2016-04-22 09:46:06 +02:00 |
|
ansuz
|
bbdc9da853
|
delete duplicated file
|
2016-04-22 08:19:28 +02:00 |
|
ansuz
|
5f4825f3a0
|
don't change the hash from realtime input
let applications handle that logic
|
2016-04-21 19:03:50 +02:00 |
|
ansuz
|
4f426651ad
|
remove TextPatcher from RealtimeTextSocket
|
2016-04-21 17:41:50 +02:00 |
|
ansuz
|
02ff1a63a4
|
Merge branch 'netflux' into beta
Conflicts:
www/assert/main.js
|
2016-04-21 15:47:07 +02:00 |
|
ansuz
|
a18c793f98
|
use latest hyperjson
|
2016-04-21 14:53:53 +02:00 |
|
ansuz
|
9efcc443cd
|
add 'format' to TextPatcher's API
|
2016-04-21 12:16:11 +02:00 |
|
ansuz
|
0769e50414
|
move TextPatcher to highest application layer
|
2016-04-20 18:56:18 +02:00 |
|
ansuz
|
1d70335228
|
provide all callbacks before starting
|
2016-04-20 18:27:20 +02:00 |
|
ansuz
|
a3787ee4dc
|
Merge branch 'netflux' into beta
|
2016-04-20 15:25:00 +02:00 |
|
ansuz
|
010566d3c3
|
pushDelta was mistakenly deprecated. restored.
|
2016-04-20 14:20:34 +02:00 |
|
ansuz
|
3598c93098
|
move new hyperjson into common
|
2016-04-20 14:14:06 +02:00 |
|
ansuz
|
103bb69daa
|
move custom hyperscript into common
|
2016-04-20 14:13:08 +02:00 |
|
ansuz
|
b83fb7b823
|
improve brFix logic
stop exporting functions which we wish to deprecate
|
2016-04-20 12:29:16 +02:00 |
|
ansuz
|
cb979844f6
|
implement text patching at application layer
|
2016-04-17 14:06:30 +02:00 |
|
ansuz
|
4a41575e6d
|
accept onLocal in config
|
2016-04-17 14:05:33 +02:00 |
|
ansuz
|
d3c2c901b6
|
implement cursor transformation in a common library
|
2016-04-17 14:02:45 +02:00 |
|
ansuz
|
92d89f6cac
|
start to factor sharejs into two modules
|
2016-04-15 18:17:45 +02:00 |
|
ansuz
|
13dc77b7f6
|
remove commented line
|
2016-04-15 18:16:54 +02:00 |
|
ansuz
|
41e635b2e5
|
realtime-input.js : turn on logging
|
2016-04-14 16:27:34 +02:00 |
|
Yann Flory
|
69e8e18283
|
Remove the pipe character in the hash
|
2016-04-14 16:10:08 +02:00 |
|
ansuz
|
d62e9fc1c9
|
add a missing semicolon
|
2016-04-14 15:41:02 +02:00 |