Commit graph

7356 commits

Author SHA1 Message Date
ansuz
0fbbb51f7f drop this useless line 2016-02-12 11:19:36 +01:00
ansuz
d1dd497457 html-patcher.js : add missing semicolon 2016-02-12 11:17:10 +01:00
ansuz
62ea172ff4 errorbox.js : add missing semicolon so jshint doesn't complain 2016-02-12 11:15:59 +01:00
Caleb James DeLisle
c87bb2ec2d Merge branch 'patch-1' of https://github.com/monperrus/cryptpad 2016-02-12 11:14:34 +01:00
ansuz
3b5c932252 jshint ignore eval line 2016-02-12 11:10:59 +01:00
Caleb James DeLisle
babef5d6ac mv travis.yml ./.travis.yml 2016-02-12 10:46:52 +01:00
Caleb James DeLisle
591323a62e travis.yml 2016-02-12 10:46:10 +01:00
ansuz
71f13fc60c Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect 2016-02-12 10:44:03 +01:00
Caleb James DeLisle
ff6e1e6fc0 Added travisci branch diffdom 2016-02-12 10:43:33 +01:00
Caleb James DeLisle
778ef85fee Added travis.yml 2016-02-12 10:41:42 +01:00
Caleb James DeLisle
ad1c7edc31 Added travis.yml 2016-02-12 10:38:47 +01:00
Caleb James DeLisle
d5125f875d Added jshint 2016-02-12 10:33:09 +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
7553ccff68 Remove a log line which was leftover after debugging 2016-02-12 08:24:46 +01:00
Caleb James DeLisle
13360c335b I'm an idiot - killer off-by-one ate the storage 2016-02-11 16:55:26 +01:00
Caleb James DeLisle
943a291903 Do not blow up if the error is that a chain cannot be found 2016-02-11 16:42:21 +01:00
Caleb James DeLisle
a7da21ccba Remove the cursor treatment 2016-02-11 16:22:59 +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
Caleb James DeLisle
e16299b5c4 Revert "restub OT until it's verified"
This reverts commit 350c9e6c76.
2016-02-11 12:33:12 +01:00
Caleb James DeLisle
dff8143fad Fix the lvl storage 2016-02-11 12:28:05 +01:00
ansuz
c22269e36e cursor.js : make the console a little less noisy 2016-02-11 10:02:47 +01:00
ansuz
350c9e6c76 restub OT until it's verified 2016-02-11 09:44: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
1aea11bb30 describe all the prototypes which are available 2016-02-10 16:50:00 +01:00
ansuz
9b13fd8f34 pull cursor correction code out of main.js
put it in cursor.js
2016-02-10 11:38:53 +01:00
ansuz
3b0ac3af4c More sensible styles
respond to viewport size
don't use gigantic font
2016-02-10 10:53:56 +01:00
ansuz
b43674eb53 switch back to two-panel layout 2016-02-10 10:52:46 +01:00
ansuz
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
2016-02-10 10:47:33 +01:00
ansuz
019750bea8 realtime-input.js : callback onInit if exists 2016-02-10 10:40:52 +01:00
ansuz
61fbf81dcd factor out rainbow stuff into rainbow.js 2016-02-05 11:55:37 +01:00
ansuz
7102a0a164 make rainbows 2016-02-05 11:48:34 +01:00
ansuz
aa3880f442 up to date 2016-02-03 16:48:49 +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
150c9a300d scale viewport so mobile is readable 2016-02-03 12:50:36 +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
e43b9715e8 remove /md/ prototype
use /text/ and /render/ instead.
2016-02-03 11:52:23 +01:00
ansuz
64cc177a60 remove vmd directory
it was only a prototype, and only contained code which was no longer useful
2016-02-03 11:46:11 +01:00
ansuz
dc9dd25256 added README for writing additional storage adaptors 2016-02-02 11:49:20 +01:00
ansuz
e220113e98 fix the 'crapstorm' bug 2016-02-01 19:41:55 +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
08fb010627 give 'onChange' a name 2016-02-01 14:27:43 +01:00
ansuz
b52327be49 restyle /text/ page 2016-02-01 14:14:48 +01:00
ansuz
266e5eccce change styles for rendered page 2016-02-01 14:14:32 +01:00