Commit Graph

4163 Commits (3ff0eb116bbbd9ef0b45252de472c11887e558fe)

Author SHA1 Message Date
ansuz a0ec5eada8 better fix for magicline filter 2016-05-31 12:51:04 +02:00
ansuz 9336c4de5c import latest chainpad 2016-05-31 12:35:01 +02:00
ansuz d0b553d198 port Yann's multiple-select implementation to cryptpad 2016-05-31 12:27:28 +02:00
ansuz e3b8a10959 fix magicline filter 2016-05-30 17:33:24 +02:00
ansuz da42e00344 Merge branch 'checkpoints' into two 2016-05-30 14:58:33 +02:00
ansuz 058548b95a revert my reversion
Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f.
2016-05-30 14:58:20 +02:00
Caleb James DeLisle ba4dba24dd If there are no checkpoints, the document fails to sync 2016-05-30 12:29:58 +02:00
ansuz 6e2e8bf21f Revert "Added checkpoints with the new code from ChainPad"
This reverts commit da2bfe2de9.
2016-05-30 10:20:08 +02:00
ansuz 599f5aeec8 add sample listeners for debugging 2016-05-30 10:18:08 +02:00
ansuz 3afd144562 don't make noise when adding a listener 2016-05-30 10:17:46 +02:00
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
Caleb James DeLisle da2bfe2de9 Added checkpoints with the new code from ChainPad 2016-05-26 17:09:02 +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 bce89b325f Merge pull request #21 from xwiki-labs/remove-channels
Remove empty channels
2016-05-17 14:41:43 +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