Commit Graph

788 Commits (5131f47ccad09f3b9f34b7e739263f77a22a7ee7)

Author SHA1 Message Date
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
ansuz 491c3644ec Merge branch 'production' 2016-05-12 15:03:54 +02:00
ansuz 2bab22cc1f remove note about jquery sheet 2016-05-12 15:00:09 +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
Yann Flory 619406f868 Send an ACK when someone asks for the history 2016-04-27 12:17:39 +02:00
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 2016-04-27 12:17:06 +02:00