Commit Graph
100 Commits
Author SHA1 Message Date
ansuz e86a3567be more minor bugfixes and general improvements
off by one error in deletion loop (and undefined references)
sort listeners by pattern specificity
deletions are changes (for now)
2016-05-28 13:51:24 +02:00
ansuz ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two 2016-05-28 13:15:33 +02:00
ansuz 7c63219add fix some minor bugs 2016-05-28 13:15:06 +02:00
ansuz a0c73c95d8 do away with a bit of boilerplate 2016-05-28 13:13:54 +02:00
ansuz e189092ba8 document/spec the listmap api in its current/intended form 2016-05-28 00:48:52 +02:00
ansuz 55846044e1 rewrite underlying API. implement listeners 2016-05-28 00:48:10 +02:00
ansuz 014dce272b working on better abstractions. still held together with duct tape 2016-05-26 11:55:33 +02:00
ansuz c1bca09cce move list/map functionality into wrapper file 2016-05-25 18:36:44 +02:00
ansuz 8885658431 bump to latest textpatcher 2016-05-25 12:33:31 +02:00
ansuz f61d06fa18 first commit for listmap prototype 2016-05-25 11:56:17 +02:00
ansuz 774d349ec3 ignore hidden elements and submit buttons 2016-05-25 11:55:11 +02:00
ansuz cf85de6113 remove old bencoding code 2016-05-25 11:54:36 +02:00
ansuz d942d999d5 add Proxy polyfill to bower.json 2016-05-25 11:53:52 +02:00
ansuz d99bb8ff84 WIP : fallback to old parsing doesn't work 2016-05-20 17:46:48 +02:00
ansuz f04be53d11 fall back to old parsing if the message is bencoded? 2016-05-20 16:45:25 +02:00
ansuz 976a08cc7a move to chainpad version 2 2016-05-20 16:34:55 +02:00
ansuz 297d8c2d44 reformat code for jshint compliance 2016-05-20 13:39:40 +02:00
ansuz baf523e9a5 add new functionality from xwiki development 2016-05-19 12:20:05 +02:00
ansuz 0c89443c1b fix typo 2016-05-17 17:22:18 +02:00
ansuz ec221e3c0a Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 2016-05-17 16:58:06 +02:00
ansuz 39fcd7dc4c more specific filtering for magicline plugin
to avoid false positives for other things which are non-contenteditable spans
2016-05-17 16:57:50 +02:00
ansuz 9c15a43268 add removeChannel documentation to storage/README 2016-05-14 13:50:25 +02:00
ansuz 62dba6de7b add specific complaints for removeChannel's non-existence 2016-05-14 13:27:15 +02:00
ansuz 2d3ed84f5d don't say you deleted database entries if you didn't 2016-05-14 13:14:55 +02:00
ansuz 1b2c129380 implement channel removal in amnesiadb 2016-05-14 13:05:21 +02:00
ansuz 3232671a6a implement optional channel removal hooks
add configuration variables to the default config
2016-05-14 13:04:05 +02:00
ansuz d59824929d pass config object into NetfluxServer 2016-05-14 12:52:34 +02:00
ansuz 061cffe462 transform and pass through the existing store 2016-05-14 12:51:52 +02:00
ansuz a08efc568b update default config to contain logToStdout 2016-05-14 12:50:03 +02:00
ansuz fe261c34bb set log level via the config file, not via a constant 2016-05-14 12:47:59 +02:00
ansuz cae750cd75 update padrtc for to use bower libraries 2016-05-13 17:35:17 +02:00
ansuz ad3c53c344 use textpatcher from bower for all pads 2016-05-13 17:32:56 +02:00
ansuz 0cd4f85ff0 remove migration notes 2016-05-13 17:00:01 +02:00
ansuz a7cbd8c470 we're pushing json over the wire, so let's use json-ot.validate 2016-05-13 16:42:14 +02:00
ansuz 3ea270acb9 fix cursors in form prototype 2016-05-13 16:41:36 +02:00
ansuz d8a96b38cf use hyperjson 1.2.2 2016-05-12 18:37:37 +02:00
ansuz d2c8fbf1f8 use hyperjson.amd.js, not hyperjson.js 2016-05-12 18:21:01 +02:00
ansuz f5266e2109 use latest release of hyperjson 2016-05-12 18:20:30 +02:00
ansuz 31052e49b8 remove note about jquery sheet 2016-05-12 14:59:45 +02:00
ansuz 663c157e2a expose text patcher to the window via APP 2016-05-12 10:46:17 +02:00
ansuz 1769ca16dc add example for configuring the logLevel in /pad/ 2016-05-10 10:23:22 +02:00
ansuz 7faf57602b implement log level settings from application layer 2016-05-10 09:39:20 +02:00
ansuz 523aff3067 use upstream chainpad.js 2016-05-09 15:50:19 +02:00
ansuz dcd130cd9d use hyperjson from bower in padrtc 2016-05-09 15:27:37 +02:00
ansuz c752e4a6e5 remove sharejs 2016-05-09 14:20:11 +02:00
ansuz 6b2e986789 remove deprecated textsocket library 2016-05-09 11:57:40 +02:00
ansuz d2fa5e8f70 start using hyperjson from bower.io 2016-05-09 11:41:02 +02:00
ansuz 150ebaba7b add ability to force text diffing 2016-04-27 17:58:55 +02:00
ansuz aef6f3a85b lock codemirror editor until chain has synced 2016-04-27 16:21:10 +02:00
ansuz 6736335db2 add 'made with <3' toolbar to code 2016-04-27 15:43:31 +02:00
ansuz 506a703b7d turn off TextPatcher logging on /pad/ 2016-04-27 15:42:27 +02:00
ansuz ba17b78f7a restyle name change button 2016-04-27 15:32:58 +02:00
ansuz d79b3616c9 remove unused files 2016-04-27 15:32:15 +02:00
ansuz 4c84758265 disable textpatcher logging 2016-04-27 15:30:53 +02:00
ansuz a5ae027043 make logging configurable 2016-04-27 15:03:41 +02:00
ansuz b09b73fcc6 remove chainpad server 2016-04-27 14:09:01 +02:00
ansuz 46b009d20f remove last non-netflux pad 2016-04-27 12:30:43 +02:00
ansuz 18e0131d6e Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta 2016-04-27 12:28:24 +02:00
ansuz 32d1807350 import unused functions from /p/, to be integrated later 2016-04-27 12:25:19 +02:00
ansuz 626ecaffcd log browser fights in /pad/ 2016-04-27 11:10:31 +02:00
ansuz afe78dad56 Merge branch 'netflux' into beta 2016-04-27 10:44:32 +02:00
ansuz a735d63306 migrate markdown rendering 'pad' to netflux 2016-04-27 10:38:44 +02:00
ansuz fa6914037c start rewriting codepad to use realtime-input 2016-04-26 17:34:57 +02:00
ansuz 2852c8f594 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta 2016-04-26 17:24:51 +02:00
ansuz 255dc17a5d Merge branch 'beta' into netflux 2016-04-25 16:08:00 +02:00
ansuz f9de1c9e1f Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 2016-04-25 16:07:24 +02:00
ansuz c14b86d84a add missing semicolon 2016-04-25 16:07:02 +02:00
ansuz b3ef2abb84 fix jshint complain 2016-04-25 16:06:10 +02:00
ansuz 22cf18f78c Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 2016-04-23 16:31:35 +02:00
ansuz c509c28c18 realtime form prototype, almost in good condition 2016-04-23 16:31:07 +02:00
ansuz 1a9e7299fc working state 2016-04-23 00:15:39 +02:00
ansuz 69e8f54e8f pass in Crypto to realtime-input 2016-04-22 18:54:24 +02:00
ansuz aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence 2016-04-22 17:35:07 +02:00
ansuz 2c158558f5 use leveldb adaptor by default 2016-04-22 11:05:54 +02:00
ansuz 60eb8b52a9 listen for websockets on the same port as the httpd 2016-04-22 10:55:20 +02:00
ansuz e83e5026ce make amnesiadb compatible with netflux 2016-04-22 10:54:44 +02:00
ansuz be1ef7abe3 migrate canvas to netflux 2016-04-22 10:04:54 +02:00
ansuz d4943511fe move text/ and hack/ to Netflux 2016-04-22 09:47:26 +02:00
ansuz 4c95602347 remove a little bit more dead code 2016-04-22 09:46:41 +02:00
ansuz b140b6429d remove a little bit of dead code 2016-04-22 09:46:06 +02:00
ansuz 2c6cf9883b stop using deleted file 2016-04-22 08:19:58 +02:00
ansuz bbdc9da853 delete duplicated file 2016-04-22 08:19:28 +02:00
ansuz cce50390a0 don't depend on library to set hash 2016-04-21 19:04:15 +02:00
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
2016-04-21 19:03:50 +02:00
ansuz d576fdc886 fix bug where empty channels failed 2016-04-21 19:03:22 +02:00
ansuz 80fb5e1e21 don't rely on RealtimeSocket exporting textPatcher 2016-04-21 17:59:30 +02:00
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket 2016-04-21 17:41:50 +02:00
ansuz 86bbc15017 document modified storage API 2016-04-21 17:14:59 +02:00
ansuz 7a02d85ec5 Netflux server mustn't send a zero message until the history is synced 2016-04-21 17:02:54 +02:00
ansuz ce69062b7c implement callback for getMessages 2016-04-21 17:01:21 +02:00
ansuz a527024a8c start on realtime form prototype 2016-04-21 15:51:04 +02:00
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js
2016-04-21 15:47:07 +02:00
ansuz 04f6299938 reconcile differences with netflux 2016-04-21 15:44:56 +02:00
ansuz 565fb1d186 include small snippets for preventing browser fights 2016-04-21 15:40:29 +02:00
ansuz ffbd428b87 better logging of browser fights 2016-04-21 15:06:03 +02:00
ansuz 4d44661f3b more correct tests 2016-04-21 15:05:41 +02:00
ansuz a18c793f98 use latest hyperjson 2016-04-21 14:53:53 +02:00
ansuz 980ff8a0ca Fix a test that was failing on chrome
it failed for reasons which are irrelevant to our application
2016-04-21 12:16:48 +02:00
ansuz 9efcc443cd add 'format' to TextPatcher's API 2016-04-21 12:16:11 +02:00
ansuz 0769e50414 move TextPatcher to highest application layer 2016-04-20 18:56:18 +02:00