77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
9 years ago
06e5c84702
Clean some code
9 years ago
29033f344c
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
9 years ago
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
9 years ago
c576241104
Add a Chainpad adapter to make Chainpad know the userList
9 years ago
fb0e82931d
correct malformed json
9 years ago
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
9 years ago
3a7af63c54
correct malformed json
9 years ago
b7885eb539
Fix channel history
9 years ago
136e2d8cf2
pass in missing textarea argument so textpad starts working again
9 years ago
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
9 years ago
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
9 years ago
c536ecbc1c
Temp commit
9 years ago
870b2dbb7e
Add the WebRTC server in Cryptpad
9 years ago
c4f62fb812
First try with WebRTC
9 years ago
09a06a8bc5
Replace the chainpad server by the netflux server
9 years ago
60c3aceb0d
Add chatflux server
9 years ago
deb2084fc5
Add the socket connection checker
9 years ago
d3e2a2f52e
make verbose logging switchable via a conditional
9 years ago
1c54af69a1
update minor editors to use new realtime-input api
9 years ago
9b228eea6b
modify vdom main.js to adhere to new realtime-input api
9 years ago
fefb904261
realtime input changes
9 years ago
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
9 years ago
62ba579d4a
Add Netflux API with WebSocket service V1
9 years ago
53d3e475f7
ui hints for hackpad
9 years ago
d2f4fbcee9
fail the toolbar from the application layer
9 years ago
d7b34cf6be
don't call toolbar from within realtime-input.js
9 years ago
e8469ae1bb
test out extended realtime-input api
9 years ago
5e1566eaec
fix incomplete 'onAbort' block
9 years ago
52fe892bae
invert logical relationship with flag
...
otherwise updates don't actually propogate
9 years ago
938df2b92f
lock the editor until the chain has synced
...
add 'onAbort' hook. lock the editor if the connection fails.
9 years ago
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
9 years ago
e5bef52850
reintroduce the toolbar
9 years ago
6ff5b10486
remove local diffDOM version
9 years ago
93fb944e1f
remove broken functions from convert module
9 years ago
7d65540123
fix undefined reference
9 years ago
c246adc57b
Lock contenteditable until chain is done syncing.
...
Don't bother patching the dom until the chain has synced
9 years ago
1c0074258c
go back to using diffDOM from bower
...
The latest version is required. You'll need to update.
9 years ago
79bd82a62e
main.js : integrate with patched diffDOM
9 years ago
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
9 years ago
f5a8727254
remove some unused functions from cursor.js
9 years ago
db1515c445
cursor.js : commit before cleaning up
9 years ago
7e367e770e
resize vdom debug panel to 30% width
9 years ago
91ada5ce7a
export Operation from chainpad. for use with OT
9 years ago
5425699f43
check if possible parent exists before checking if it contains another element
9 years ago
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
9 years ago
e87a4599a4
main.js : tiny patch until things are working correctly.
9 years ago
9ce59c985f
only do stuff with the cursor when a remote edit takes place
9 years ago
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
9 years ago
de46be85ba
add better helpers for finding and resetting the cursor
9 years ago
7e7f1fee76
include abstracted json-ot, add comments, start to use cursor stuff
9 years ago
c09036bd29
snapshot cursor.js, as some things are working quite well now
9 years ago
4eee1f5210
add orderOfNodes function to tree library
9 years ago
7689151fc0
pull json validation for OT into its own module for reuse
9 years ago
fbb9163e42
main.js : clean up and commit before making big-ish changes for cursor fixing
9 years ago
2c8a2406c6
cursor.js : snapshot before code deletion
9 years ago
1beb3f5355
snapshot of treesome.js before deletion
9 years ago
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
9 years ago
3cb94b8d80
jshint compliance
9 years ago
d1885fbab6
better jshint compliance for common files
9 years ago
539cc3a2fa
remove unused files from common directory
9 years ago
afa2811472
remove local version of marked.js, prefer bower version
9 years ago
587f95b6d7
don't overflow
9 years ago
a01331cb9a
hide styling textarea no matter what
9 years ago
a600ece5c5
fix jshint complaints in common directory
9 years ago
4a05a859e6
fix initialization routines
9 years ago
f1915d3b7c
fix jshint complaints in pad directory
9 years ago
fe3917c0f1
fix jshint complaints in codemirror directory
9 years ago
2c5a2b6023
remove unused code, add todos, fix minor errors
9 years ago
c5ab5dfe26
realtime style editor with lorum ipsum
9 years ago
967d636df9
address more jshint complaints
9 years ago
f6c848385f
hyperjson.js : jshint complains about var index in for loop
9 years ago
0fbbb51f7f
drop this useless line
9 years ago
d1dd497457
html-patcher.js : add missing semicolon
9 years ago
62ea172ff4
errorbox.js : add missing semicolon so jshint doesn't complain
9 years ago
3b5c932252
jshint ignore eval line
9 years ago
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
a7da21ccba
Remove the cursor treatment
9 years ago
86c4a69a97
Switch to patching with DiffDOM for testing :D
9 years ago
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
2031191261
testing=false
9 years ago
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
9 years ago
e16299b5c4
Revert "restub OT until it's verified"
...
This reverts commit 350c9e6c76
9 years ago
c22269e36e
cursor.js : make the console a little less noisy
9 years ago
350c9e6c76
restub OT until it's verified
9 years ago
99a23154b7
files for unstubbing OT
9 years ago
c740c0ec92
add stuff for walking the tree
9 years ago
ad184b1114
add stuff to recover the cursor
9 years ago
1aea11bb30
describe all the prototypes which are available
9 years ago
9b13fd8f34
pull cursor correction code out of main.js
...
put it in cursor.js
9 years ago
3b0ac3af4c
More sensible styles
...
respond to viewport size
don't use gigantic font
9 years ago
b43674eb53
switch back to two-panel layout
9 years ago
f33e061c9a
visit /hack/ to see what this is
...
I'll leave it up to the users to decide
whether XSS is a bug or a feature
9 years ago
019750bea8
realtime-input.js : callback onInit if exists
9 years ago
61fbf81dcd
factor out rainbow stuff into rainbow.js
9 years ago
7102a0a164
make rainbows
9 years ago
aa3880f442
up to date
9 years ago
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
9 years ago
150c9a300d
scale viewport so mobile is readable
9 years ago
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.
9 years ago
e43b9715e8
remove /md/ prototype
...
use /text/ and /render/ instead.
9 years ago
64cc177a60
remove vmd directory
...
it was only a prototype, and only contained code which was no longer useful
9 years ago
e220113e98
fix the 'crapstorm' bug
9 years ago
ed03a48092
minor patches that make things a bit more reliable, still some bugs
9 years ago
ac0f7852fc
committing latest changes for review
9 years ago
2016550e01
virtual-dom.js : identify problem area?
9 years ago
08fb010627
give 'onChange' a name
9 years ago
b52327be49
restyle /text/ page
9 years ago
266e5eccce
change styles for rendered page
9 years ago
2adfeaaaaa
test having multiple textareas in one page
9 years ago
3cffdc982f
remove unused functions from render/main.js
...
better comments
9 years ago
317abf36f3
make rendered images sort of responsive
9 years ago
388c6de64a
minor style tweaks for /render/
9 years ago
ec172b6d21
rendered html should be scrollable
9 years ago
a484b920e3
disallow resizing of textarea
9 years ago
d9d4abb9a5
don't let the textarea overflow the body
9 years ago
dcbbeea734
solarized dark color scheme in /text/
9 years ago
c2eb29b75e
fix typo
9 years ago
fd1e5d5735
better styling on render page
...
now solarized dark
9 years ago
a718f89e08
make a new pad that doesn't allow input.
...
It simply renders markdown that's being written in the same channel
but in another editor that allows input.
9 years ago
2e3b424a1a
sanitize markdown before rendering to prevent XSS
...
draw rainbox borders on element redraws in vdom method.
This lets us see what being redrawn, as the vdom.diff method
is breaking a few things.
9 years ago
13f5371199
remove duplicated files
9 years ago
aa6bbabc62
prototype a vdom-based markdown editor
...
avoid unnecessary redraws.
discover a bug, apparently vdom replaces all child elements after an
element which was modified.
As such, changing b in [a, b, c, d] causes b, c, and d to be redrawn.
This is undesirable.
9 years ago
d14e42fedd
start on a vdom-based wysiwyg realtime
...
There are still a few conditions that cause it to 'explode'
when different browsers disagree on element semantics.
Overall it's a much cleaner approach, but it will require
extensive tuning to improve performance, as there are still
many complete dom traversals which will not scale for large documents
9 years ago
1f7f90165f
Slap marked.js onto a textarea
...
Multiple people can now edit markdown and see the results in realtime.
9 years ago
d5a1629a93
A really basic shared text area with encryption.
...
...and not much else. If you want to hack on something
this is a great place to start.
9 years ago
50121c8ab6
a really basic collaborative input
...
type="text" is typically slower than the same code
when used to sync a textarea.
WATCH OUT!
9 years ago
b18dfef656
sharejs textarea is used by realtime-input.js
9 years ago
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
9 years ago
40b8c0efe8
drop in chjj's marked.js for a cool demo
9 years ago
2d8ffdf31c
Merge branch 'master' of github.com:ansuz/cryptpad
9 years ago
0c2e057f9d
export component APIs from convert
9 years ago
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
9 years ago
4cf2a8a0bd
rtwiki.js : catch some typeErrors
9 years ago
84c0ea6d26
refactor: pass in ifrw.CodeMirror into andThen()
9 years ago
663e987345
fix race condition in codemirror initialization
...
over slow connections, iframes don't load fast enough to be ready for code
which depends on certain features existing.
wait until they're ready, then initialize.
9 years ago
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
9 years ago
c71b060dc2
main.js : wait until your editor is defined before trying to reference it. addresses a race condition that caused ckeditor to fail half the time.
9 years ago
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
9 years ago
9fc44cdf0c
add notes to clientside js files
9 years ago
af80bed07b
XWR-190: Make CryptPad version with rtwiki/CodeMirror
9 years ago
9626dfc365
XWR-190: Make CryptPad version with rtwiki/CodeMirror
9 years ago
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
9 years ago
32f44161a7
Patch Realtime into CodeMirror in CryptPad
9 years ago
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
10 years ago
51544db9a2
Completed adding of customization system and bottom infobar
10 years ago
84164123b6
not quite finished
10 years ago
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
10 years ago
e039e90a24
upgrade to most recent chainpad
10 years ago
c13bfe978a
Switched cryptpad to use common/toolbar.js which is shared with cryptsheet
10 years ago
Yann Flory