Commit Graph

215 Commits (23788bca67f188dd00d273804a65d4796b86d78c)

Author SHA1 Message Date
ansuz d025d13295 address some jshint complaints 2016-06-23 16:44:20 +02:00
ansuz 12bbf3e8f6 don't drop values onto the window 2016-06-23 16:38:40 +02:00
ansuz ca45e3533d pass loaded file to callback when importing 2016-06-23 16:38:24 +02:00
ansuz 1a5905d9fd more work on highlighting modes in codemirror
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
ansuz 31aa09d6f6 work a bit more on import/export and code highlighting 2016-06-22 20:58:50 +02:00
ansuz 242c9a99e3 implement import and export in /pad/ 2016-06-22 17:00:07 +02:00
ansuz 0a8137e7eb move rememberPad to cryptpad common and simplify it a bit 2016-06-21 18:46:19 +02:00
ansuz c3d2568d3c add file export for codepad
addresses #24
2016-06-17 10:59:45 +02:00
ansuz 2b8c21d292 set styles with setAttribute. fixes style fights 2016-06-16 13:00:48 +02:00
ansuz 1746a4e732 use crypto from bower 2016-06-06 12:35:06 +02:00
ansuz 2a3ff256b9 remove libraries which are now in bower 2016-06-06 12:29:45 +02:00
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 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 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 ff0f7d15dc use json-ot from bower 2016-06-03 16:23:25 +02:00
ansuz 58633af943 listmap can be reused. put it in common/ 2016-06-03 15:47:34 +02:00
ansuz dbf1e2b870 support reusing the netflux network
export more internals from realtime input
2016-06-03 15:30:51 +02:00
ansuz 83696495a8 use chainpad from bower, not local 2016-06-02 16:54:47 +02:00
ansuz 954ee26f4d fix undefined disconnect reason 2016-06-01 12:19:54 +02:00
ansuz 9336c4de5c import latest chainpad 2016-05-31 12:35:01 +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 ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two 2016-05-28 13:15:33 +02:00
ansuz a0c73c95d8 do away with a bit of boilerplate 2016-05-28 13:13:54 +02:00
Caleb James DeLisle da2bfe2de9 Added checkpoints with the new code from ChainPad 2016-05-26 17:09:02 +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 cae750cd75 update padrtc for to use bower libraries 2016-05-13 17:35:17 +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 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 150ebaba7b add ability to force text diffing 2016-04-27 17:58:55 +02:00
ansuz ba17b78f7a restyle name change button 2016-04-27 15:32:58 +02:00
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 2016-04-27 12:17:06 +02:00
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate 2016-04-27 10:51:51 +02:00
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 2016-04-27 10:44:04 +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
Yann Flory 85d5f5c47f Convert netflux to es5 2016-04-25 15:29:39 +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
Yann Flory d3203d1c2a Remove Crypto from the modules loaded with RequireJS in realtime-input
It now has to be passed in the config in the main JS file
2016-04-22 14:26:37 +02:00
Yann Flory 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect
timeout errors
2016-04-22 11:46:27 +02:00
ansuz b140b6429d remove a little bit of dead code 2016-04-22 09:46:06 +02:00