Yann Flory
|
ae8f6f7f2c
|
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
|
2016-03-10 14:03:31 +01:00 |
|
Yann Flory
|
b7885eb539
|
Fix channel history
|
2016-03-09 18:35:39 +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 |
|
Yann Flory
|
c536ecbc1c
|
Temp commit
|
2016-03-08 15:13:57 +01:00 |
|
Yann Flory
|
870b2dbb7e
|
Add the WebRTC server in Cryptpad
|
2016-03-08 11:45:03 +01:00 |
|
Yann Flory
|
c4f62fb812
|
First try with WebRTC
|
2016-03-08 11:25:37 +01:00 |
|
Yann Flory
|
09a06a8bc5
|
Replace the chainpad server by the netflux server
|
2016-03-07 17:35:31 +01:00 |
|
Yann Flory
|
60c3aceb0d
|
Add chatflux server
|
2016-03-07 17:18:47 +01:00 |
|
Yann Flory
|
deb2084fc5
|
Add the socket connection checker
|
2016-03-07 12:00:45 +01:00 |
|
ansuz
|
d3e2a2f52e
|
make verbose logging switchable via a conditional
|
2016-03-07 11:59:36 +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
|
d7b34cf6be
|
don't call toolbar from within realtime-input.js
|
2016-03-04 16:45:11 +01:00 |
|
ansuz
|
5e1566eaec
|
fix incomplete 'onAbort' block
|
2016-03-04 11:07:12 +01:00 |
|
ansuz
|
1d6ccc99a1
|
add 'onAbort' hook to realtime-input.js
|
2016-03-03 18:04:14 +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
|
6884fabda9
|
Use local diffDOM instead of bower_components
At least until the PR gets accepted
|
2016-02-29 17:05:04 +01:00 |
|
ansuz
|
f5a8727254
|
remove some unused functions from cursor.js
|
2016-02-29 16:52:07 +01:00 |
|
ansuz
|
db1515c445
|
cursor.js : commit before cleaning up
|
2016-02-29 16:27:55 +01:00 |
|
ansuz
|
91ada5ce7a
|
export Operation from chainpad. for use with OT
|
2016-02-29 15:28:32 +01:00 |
|
ansuz
|
5425699f43
|
check if possible parent exists before checking if it contains another element
|
2016-02-29 15:27:11 +01:00 |
|
ansuz
|
67bdb8a65a
|
fix a bad regex that occasionally threw an error
'nothing to repeat'
|
2016-02-25 12:35:11 +01:00 |
|
ansuz
|
39f56d4fd1
|
throw error when checking for the index of a node that has no parent.
it probably isn't in the dom if this is the case.
Check if it's there before using this function
|
2016-02-23 15:53:58 +01:00 |
|
ansuz
|
de46be85ba
|
add better helpers for finding and resetting the cursor
|
2016-02-23 15:52:58 +01:00 |
|
ansuz
|
c09036bd29
|
snapshot cursor.js, as some things are working quite well now
|
2016-02-22 18:00:46 +01:00 |
|
ansuz
|
4eee1f5210
|
add orderOfNodes function to tree library
|
2016-02-22 17:56:17 +01:00 |
|
ansuz
|
7689151fc0
|
pull json validation for OT into its own module for reuse
|
2016-02-22 17:54:59 +01:00 |
|
ansuz
|
2c8a2406c6
|
cursor.js : snapshot before code deletion
|
2016-02-19 14:07:43 +01:00 |
|
ansuz
|
1beb3f5355
|
snapshot of treesome.js before deletion
|
2016-02-19 14:07:16 +01:00 |
|
ansuz
|
8ead5ca129
|
realtime-input.js : add notes regarding integration of the netflux api
|
2016-02-16 15:14:38 +01:00 |
|
ansuz
|
d1885fbab6
|
better jshint compliance for common files
|
2016-02-15 15:42:08 +01:00 |
|
ansuz
|
539cc3a2fa
|
remove unused files from common directory
|
2016-02-15 15:41:36 +01:00 |
|
ansuz
|
afa2811472
|
remove local version of marked.js, prefer bower version
|
2016-02-15 11:49:47 +01:00 |
|
ansuz
|
a600ece5c5
|
fix jshint complaints in common directory
|
2016-02-12 16:22:20 +01:00 |
|
ansuz
|
2c5a2b6023
|
remove unused code, add todos, fix minor errors
|
2016-02-12 12:03:15 +01:00 |
|
ansuz
|
967d636df9
|
address more jshint complaints
|
2016-02-12 11:39:37 +01:00 |
|
ansuz
|
f6c848385f
|
hyperjson.js : jshint complains about var index in for loop
|
2016-02-12 11:21:33 +01:00 |
|
ansuz
|
7f92abc7bf
|
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
|
2016-02-12 10:24:11 +01:00 |
|
Caleb James DeLisle
|
86c4a69a97
|
Switch to patching with DiffDOM for testing :D
|
2016-02-11 16:10:44 +01:00 |
|
ansuz
|
653ba33b65
|
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
|
2016-02-11 13:15:57 +01:00 |
|
Caleb James DeLisle
|
2031191261
|
testing=false
|
2016-02-11 13:13:58 +01:00 |
|
Caleb James DeLisle
|
37db31b09e
|
Attempt an operational transformation and if the result is not valid JSON then fail
|
2016-02-11 12:34:06 +01:00 |
|
ansuz
|
c22269e36e
|
cursor.js : make the console a little less noisy
|
2016-02-11 10:02:47 +01:00 |
|
ansuz
|
99a23154b7
|
files for unstubbing OT
|
2016-02-11 09:38:58 +01:00 |
|
ansuz
|
c740c0ec92
|
add stuff for walking the tree
|
2016-02-11 09:32:58 +01:00 |
|
ansuz
|
ad184b1114
|
add stuff to recover the cursor
|
2016-02-11 09:32:41 +01:00 |
|
ansuz
|
019750bea8
|
realtime-input.js : callback onInit if exists
|
2016-02-10 10:40:52 +01:00 |
|
ansuz
|
7102a0a164
|
make rainbows
|
2016-02-05 11:48:34 +01:00 |
|
ansuz
|
d2f6c63d8a
|
realtime-input.js : changed the api and left an undefined reference. fixed
|
2016-02-03 12:58:54 +01:00 |
|
ansuz
|
d96124229b
|
clean up realtime-input.js, break API
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
|
2016-02-03 12:45:45 +01:00 |
|
ansuz
|
ed03a48092
|
minor patches that make things a bit more reliable, still some bugs
|
2016-02-01 19:41:13 +01:00 |
|
ansuz
|
ac0f7852fc
|
committing latest changes for review
|
2016-02-01 15:28:33 +01:00 |
|
ansuz
|
2016550e01
|
virtual-dom.js : identify problem area?
|
2016-02-01 14:28:13 +01:00 |
|
ansuz
|
fd1e5d5735
|
better styling on render page
now solarized dark
|
2016-01-30 14:18:20 +01:00 |
|
ansuz
|
b18dfef656
|
sharejs textarea is used by realtime-input.js
|
2016-01-29 12:27:29 +01:00 |
|
ansuz
|
997ce1147f
|
realtime input wraps up basic realtime stuff
so we don't have to rewrite the realtime api for every application.
starting to move towards a portable api :D
|
2016-01-29 12:26:49 +01:00 |
|
ansuz
|
40b8c0efe8
|
drop in chjj's marked.js for a cool demo
|
2016-01-29 12:26:27 +01:00 |
|
ansuz
|
0c2e057f9d
|
export component APIs from convert
|
2016-01-27 10:10:47 +01:00 |
|
ansuz
|
b958caebdd
|
dom, vdom, hyperjson, and an api which provides a matrix of conversions
|
2016-01-26 17:26:33 +01:00 |
|
ansuz
|
2ed9f0867a
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
|
2016-01-15 11:24:21 -05:00 |
|
ansuz
|
ff52f050e5
|
chainpad.js : pull in upstream changes to chainpad.js. new APIs
|
2016-01-13 09:47:11 -05:00 |
|
ansuz
|
9fc44cdf0c
|
add notes to clientside js files
|
2016-01-13 05:43:58 -05:00 |
|
Yann Flory
|
9a932a3f56
|
Patch Realtime into CodeMirror in CryptPad
|
2015-11-25 10:09:23 +01:00 |
|
Caleb James DeLisle
|
88fb6772e8
|
Cleaned up the front page and added a little piece of code to show recent pads
|
2015-02-02 17:53:10 +01:00 |
|
Caleb James DeLisle
|
51544db9a2
|
Completed adding of customization system and bottom infobar
|
2015-02-02 16:01:33 +01:00 |
|
Caleb James DeLisle
|
0e44b10aeb
|
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
|
2015-01-30 16:52:23 +01:00 |
|
Caleb James DeLisle
|
e039e90a24
|
upgrade to most recent chainpad
|
2015-01-30 16:41:01 +01:00 |
|
Caleb James DeLisle
|
50c10f818e
|
Added cryptsheet to cryptpad suite!
|
2015-01-29 17:55:18 +01:00 |
|