ansuz
|
478ccbf984
|
revert changes to chainpad
|
2016-03-29 11:04:34 +02:00 |
|
ansuz
|
e3b78e20de
|
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
|
2016-03-25 18:01:51 +01:00 |
|
ansuz
|
e26246178f
|
start to clean up and give things more sensible names.
get rid of the textarea entirely
|
2016-03-25 18:01:23 +01:00 |
|
Caleb James DeLisle
|
b372b0b77c
|
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
|
2016-03-25 17:35:07 +01:00 |
|
Caleb James DeLisle
|
f3fb674504
|
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
|
2016-03-25 16:50:17 +01:00 |
|
Caleb James DeLisle
|
98c85cef8b
|
xxx
|
2016-03-25 16:49:27 +01:00 |
|
ansuz
|
12dcbc9121
|
fix quick red fox and make test.cancel work again
|
2016-03-25 16:14:17 +01:00 |
|
Caleb James DeLisle
|
62eabbc7ae
|
If a message does not match parent hash, don't delete it from storage
|
2016-03-25 15:23:19 +01:00 |
|
Caleb James DeLisle
|
dbf31798d5
|
json-ot triggering PARANOIA errors in ChainPad
|
2016-03-25 15:01:17 +01:00 |
|
Caleb James DeLisle
|
03932d0169
|
small changes to chainpad for testing
|
2016-03-25 14:52:44 +01:00 |
|
Caleb James DeLisle
|
669bcc1935
|
If there is a difference in the hjson then send a message back
|
2016-03-25 14:26:31 +01:00 |
|
Caleb James DeLisle
|
f62ec85a4c
|
Shuffled around some assertions and logs
|
2016-03-25 14:14:19 +01:00 |
|
Caleb James DeLisle
|
420a7098a6
|
more testing and crap
|
2016-03-25 12:45:51 +01:00 |
|
ansuz
|
4b35a145e3
|
Push WIP
|
2016-03-25 11:04:27 +01:00 |
|
ansuz
|
0d33af773f
|
implement optional filtering in hyperjson
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
|
2016-03-24 12:11:31 +01:00 |
|
ansuz
|
1bd5cb9e27
|
hyperjson.js : used split instead of filter... oops
|
2016-03-23 12:31:16 +01:00 |
|
ansuz
|
b2753ef7b7
|
fix string manipulation off-by-one
|
2016-03-22 19:29:58 +01:00 |
|
ansuz
|
0c6222b5f9
|
better error reporting when the operational transform fails to parse JSON
|
2016-03-22 10:19:13 +01:00 |
|
ansuz
|
79a9998b13
|
implement better serialization of class names
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
|
2016-03-22 10:16:14 +01:00 |
|
ansuz
|
bd24821c6c
|
Don't attempt to use the cursor selection when it has length 0
RTWYSIWYG-20
RTWYSIWYG-24
|
2016-03-22 10:06:42 +01:00 |
|
ansuz
|
5cd118bdb0
|
ignore netflux since it's ecma6 and not our code
|
2016-03-10 12:00:36 +01:00 |
|
ansuz
|
3a7af63c54
|
correct malformed json
|
2016-03-10 11:58:23 +01:00 |
|
ansuz
|
136e2d8cf2
|
pass in missing textarea argument so textpad starts working again
|
2016-03-09 11:02:12 +01:00 |
|
ansuz
|
8258018c1d
|
Revert "fix undefined reference"
This reverts commit 7d65540123.
To restore functionality in convert.js
|
2016-03-09 10:32:57 +01:00 |
|
ansuz
|
c67451bc1a
|
Revert "remove broken functions from convert module"
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f.
|
2016-03-09 10:29:51 +01:00 |
|
ansuz
|
d3e2a2f52e
|
make verbose logging switchable via a conditional
|
2016-03-07 11:59:36 +01:00 |
|
ansuz
|
1c54af69a1
|
update minor editors to use new realtime-input api
|
2016-03-07 11:52:18 +01:00 |
|
ansuz
|
9b228eea6b
|
modify vdom main.js to adhere to new realtime-input api
|
2016-03-07 11:36:33 +01:00 |
|
ansuz
|
fefb904261
|
realtime input changes
|
2016-03-07 11:34:16 +01:00 |
|
ansuz
|
fd99dba4a3
|
modify realtime-input api to take a single object as configuration. merge netflux API
|
2016-03-07 11:33:46 +01:00 |
|
Yann Flory
|
62ba579d4a
|
Add Netflux API with WebSocket service V1
|
2016-03-07 11:07:37 +01:00 |
|
ansuz
|
53d3e475f7
|
ui hints for hackpad
|
2016-03-04 16:47:59 +01:00 |
|
ansuz
|
d2f4fbcee9
|
fail the toolbar from the application layer
|
2016-03-04 16:46:18 +01:00 |
|
ansuz
|
d7b34cf6be
|
don't call toolbar from within realtime-input.js
|
2016-03-04 16:45:11 +01:00 |
|
ansuz
|
e8469ae1bb
|
test out extended realtime-input api
|
2016-03-04 16:41:34 +01:00 |
|
ansuz
|
3539c71c07
|
howto maintain your cryptpad instance
|
2016-03-04 12:14:40 +01:00 |
|
ansuz
|
0327fbc874
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
Conflicts:
.travis.yml
|
2016-03-04 11:28:27 +01:00 |
|
ansuz
|
5e1566eaec
|
fix incomplete 'onAbort' block
|
2016-03-04 11:07:12 +01:00 |
|
ansuz
|
52fe892bae
|
invert logical relationship with flag
otherwise updates don't actually propogate
|
2016-03-04 11:05:58 +01:00 |
|
ansuz
|
938df2b92f
|
lock the editor until the chain has synced
add 'onAbort' hook. lock the editor if the connection fails.
|
2016-03-03 18:05:05 +01:00 |
|
ansuz
|
1d6ccc99a1
|
add 'onAbort' hook to realtime-input.js
|
2016-03-03 18:04:14 +01:00 |
|
ansuz
|
e5bef52850
|
reintroduce the toolbar
|
2016-03-03 16:05:07 +01:00 |
|
ansuz
|
6ff5b10486
|
remove local diffDOM version
|
2016-03-03 16:04:08 +01:00 |
|
ansuz
|
93fb944e1f
|
remove broken functions from convert module
|
2016-03-03 15:18:05 +01:00 |
|
ansuz
|
7d65540123
|
fix undefined reference
|
2016-03-03 15:12:43 +01:00 |
|
ansuz
|
c246adc57b
|
Lock contenteditable until chain is done syncing.
Don't bother patching the dom until the chain has synced
|
2016-03-03 14:38:07 +01:00 |
|
ansuz
|
4067e1caa8
|
https is more reliable than git for bower, it seems
|
2016-03-03 11:21:52 +01:00 |
|
ansuz
|
1c0074258c
|
go back to using diffDOM from bower
The latest version is required. You'll need to update.
|
2016-03-03 10:49:59 +01:00 |
|
ansuz
|
5d9ee650c5
|
Point bower.json to github for diffDOM
since they haven't pushed to bower.io since merging my PR.
You'll need to update to get things to work.
|
2016-03-03 10:42:28 +01:00 |
|
ansuz
|
46417441ae
|
ignore local diffDOM.js until out PR gets merged
|
2016-03-01 10:45:49 +01:00 |
|