Commit Graph

15979 Commits

Author SHA1 Message Date
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 c89f97202e jshint ignore external code 2016-02-15 16:51:54 +01:00
ansuz 278c4ab32f even more jshint compliance 2016-02-15 16:47:53 +01:00
ansuz 3cb94b8d80 jshint compliance 2016-02-15 16:07:46 +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 77d85a777e stricter jshint complaints 2016-02-15 11:50:12 +01:00
ansuz afa2811472 remove local version of marked.js, prefer bower version 2016-02-15 11:49:47 +01:00
ansuz 587f95b6d7 don't overflow 2016-02-14 12:01:05 +01:00
ansuz a01331cb9a hide styling textarea no matter what 2016-02-12 16:44:54 +01:00
ansuz bffd19d76f ignore customization directory 2016-02-12 16:26:44 +01:00
ansuz b8e4ad6568 note that kademlia lib should not be used 2016-02-12 16:22:38 +01:00
ansuz a600ece5c5 fix jshint complaints in common directory 2016-02-12 16:22:20 +01:00
ansuz 4a05a859e6 fix initialization routines 2016-02-12 16:21:52 +01:00
ansuz f1915d3b7c fix jshint complaints in pad directory 2016-02-12 16:21:17 +01:00
ansuz fe3917c0f1 fix jshint complaints in codemirror directory 2016-02-12 16:20:55 +01:00
ansuz 2c5a2b6023 remove unused code, add todos, fix minor errors 2016-02-12 12:03:15 +01:00
ansuz 8ba1f5dfc9 Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect 2016-02-12 11:46:40 +01:00
ansuz c5ab5dfe26 realtime style editor with lorum ipsum 2016-02-12 11:45:40 +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 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