dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
678 Commits 73 Branches 132 Tags 560 MiB
Commit Graph

496 Commits

Author SHA1 Message Date
ansuz f72cb24fc5 rm LORIA 2016-06-06 12:27:42 +02:00
ansuz 2c3de49922 remove realtime-input, since it's in bower now 2016-06-06 12:15:00 +02:00
ansuz beba78d7f8 update prototype dependencies 2016-06-06 12:14:07 +02:00
ansuz 2798d1b1f9 all of the list/map api's dependencies are now on bower 2016-06-06 11:54:37 +02:00
ansuz 58c968b319 minor cleanup in realtime-input 2016-06-03 18:55:32 +02:00
ansuz 288b4d5b66 depend on main passing in the crypto module for now 2016-06-03 18:52:35 +02:00
ansuz f76dc615c0 use chainpad-crypto from bower and pass it into the listmap api 2016-06-03 18:51:31 +02:00
ansuz 85dbd5cb6e pass in websocketURL from main 2016-06-03 17:27:01 +02:00
ansuz d9a4f2f22c missed one 2016-06-03 16:44:15 +02:00
ansuz cf2866baa7 use json-ot from bower for tests 2016-06-03 16:35:54 +02:00
ansuz 5bb77bd50c add UI.add and UI.remove methods. 
also use json-ot from bower
 2016-06-03 16:24:41 +02:00
ansuz ff0f7d15dc use json-ot from bower 2016-06-03 16:23:25 +02:00
ansuz dccf5e8dcf use listmap api from common/ 2016-06-03 15:51:54 +02:00
ansuz 58633af943 listmap can be reused. put it in common/ 2016-06-03 15:47:34 +02:00
ansuz f80e9772a8 merge api.js and deep-proxy.js into one file 2016-06-03 15:45:58 +02:00
ansuz dbf1e2b870 support reusing the netflux network 
export more internals from realtime input
 2016-06-03 15:30:51 +02:00
ansuz 6f7543e9cc demonstrate chaining of 'on' directives 2016-06-02 17:50:55 +02:00
ansuz e44446f71e proper recursive proxy initialization 2016-06-02 17:49:27 +02:00
ansuz 68cec2348a don't prompt the user with a crypto hash for their name 2016-06-02 16:56:01 +02:00
ansuz 83696495a8 use chainpad from bower, not local 2016-06-02 16:54:47 +02:00
ansuz 2b9ac14cb1 restructure main to take advantage of new callback infrastructure 2016-06-01 12:36:26 +02:00
ansuz fea74782a2 remove a little more dead code that I missed 2016-06-01 12:35:42 +02:00
ansuz a58d6c745a implement remaining listeners and factor 
* 'isProxyable' helper
* 'find' helper
* 'lengthDescending' helper (for sorting change/remove events by path length)
* implement recursive proxy creation
* implement recursive proxy removal
* implement 'bubbling' prevention (via return false)
* implement create, ready, and disconnect event handlers
* return 'this' from 'on'
* trim dead code
 2016-06-01 12:28:25 +02:00
ansuz 4222c0b516 simplify api 
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
 2016-06-01 12:25:16 +02:00
ansuz 954ee26f4d fix undefined disconnect reason 2016-06-01 12:19:54 +02:00
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 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
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 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 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 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 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 d2c8fbf1f8 use hyperjson.amd.js, not hyperjson.js 2016-05-12 18:21:01 +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 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 492054a938 Fix the cursor position when a remote patch is applied 2016-04-27 12:17:06 +02:00
ansuz 626ecaffcd log browser fights in /pad/ 2016-04-27 11:10:31 +02:00
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate 2016-04-27 10:51:51 +02:00
ansuz afe78dad56 Merge branch 'netflux' into beta 2016-04-27 10:44:32 +02:00
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 2016-04-27 10:44:04 +02:00
ansuz a735d63306 migrate markdown rendering 'pad' to netflux 2016-04-27 10:38:44 +02:00
Yann Flory f5f8f6e1eb Remove the delay between a change and its propagation to chainpad 2016-04-26 17:50:54 +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
Yann Flory fe3bb4da27 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux 2016-04-26 17:18:31 +02:00
Yann Flory 53b2644b64 Fix a issue with fights over usernames 2016-04-26 17:16:58 +02:00
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 2016-04-26 14:31:57 +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
Yann Flory 85d5f5c47f Convert netflux to es5 2016-04-25 15:29:39 +02:00
Yann Flory c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc 2016-04-25 15:29:09 +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
Caleb James DeLisle 5f16ad4a58 Update to most recent chainpad 2016-04-22 18:17:00 +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