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

496 Commits

Author SHA1 Message Date
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
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 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 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 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
ansuz 1d70335228 provide all callbacks before starting 2016-04-20 18:27:20 +02:00
ansuz 9498937b43 add a FIXME to the assert page 
tests were failing (unnecessarily) on Chrome
 2016-04-20 18:15:17 +02:00
ansuz a3787ee4dc Merge branch 'netflux' into beta 2016-04-20 15:25:00 +02:00
ansuz 06b464c524 move sheet/ to .git 2016-04-20 15:04:43 +02:00
ansuz cdf02ac725 remove input pad 2016-04-20 15:00:21 +02:00
ansuz 11961b4f1d export stringifyDOM to REALTIME_MODULE 2016-04-20 14:50:56 +02:00
ansuz 5db487db3f remove old pad entirely 
hyperjson version is considered a strict improvement
 2016-04-20 14:26:56 +02:00
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored. 2016-04-20 14:20:34 +02:00
ansuz 1639c5b099 use hyperscript and hyperjson from common 2016-04-20 14:14:44 +02:00
ansuz 3598c93098 move new hyperjson into common 2016-04-20 14:14:06 +02:00
ansuz 103bb69daa move custom hyperscript into common 2016-04-20 14:13:08 +02:00
ansuz e357549eda push browser fights into an array for inspection 2016-04-20 14:01:21 +02:00
ansuz b83fb7b823 improve brFix logic 
stop exporting functions which we wish to deprecate
 2016-04-20 12:29:16 +02:00
ansuz 1c7954ed51 Grab Fabric off of the window 2016-04-20 12:13:04 +02:00
ansuz 06786b6e02 Remove redundant declaration 2016-04-20 10:37:20 +02:00
ansuz df22c246c4 serialize text nodes correctly 2016-04-20 10:10:26 +02:00
ansuz 7ca5f47d02 remove multitest pad since it offers no significant benefit 2016-04-18 17:31:37 +02:00
ansuz bafdd588dd fix /hack/ to not require sharejs textarea 2016-04-18 17:14:00 +02:00
ansuz f2db6b83eb better sizing for palette options 2016-04-18 16:40:44 +02:00
ansuz 5ce158d2e2 add more colors 2016-04-17 20:21:19 +02:00
ansuz 7c4b334ad3 here's a canvas app! 2016-04-17 20:04:49 +02:00
ansuz 41276fffb5 repair /text/ application, conform to new API 2016-04-17 14:15:34 +02:00
ansuz cb979844f6 implement text patching at application layer 2016-04-17 14:06:30 +02:00
ansuz 4a41575e6d accept onLocal in config 2016-04-17 14:05:33 +02:00
ansuz d3c2c901b6 implement cursor transformation in a common library 2016-04-17 14:02:45 +02:00
ansuz 92d89f6cac start to factor sharejs into two modules 2016-04-15 18:17:45 +02:00
ansuz 13dc77b7f6 remove commented line 2016-04-15 18:16:54 +02:00
ansuz 41e635b2e5 realtime-input.js : turn on logging 2016-04-14 16:27:34 +02:00
Yann Flory 69e8e18283 Remove the pipe character in the hash 2016-04-14 16:10:08 +02:00
ansuz d62e9fc1c9 add a missing semicolon 2016-04-14 15:41:02 +02:00
ansuz 4095201d15 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate 2016-04-14 15:40:37 +02:00
Yann Flory c32045d7d0 Fix an issue with missing characters when several users were typing at the same time 2016-04-14 15:30:42 +02:00
ansuz 822b2bd2b9 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate 2016-04-14 14:47:22 +02:00
Yann Flory be09a1808d Remove old code from realtime-input 2016-04-14 14:46:42 +02:00
ansuz 5a5b9ad718 Merge branch 'netflux' into beta 2016-04-14 12:37:28 +02:00
ansuz 4af987a2a2 point to correct toolbar.js 2016-04-14 12:36:25 +02:00
ansuz 3ade46adc7 Merge branch 'newtests' into beta 2016-04-14 12:33:12 +02:00
Yann Flory 6884b0890a Fix the typong tests not working properly 2016-04-14 12:24:17 +02:00
ansuz b12a01e08f report test results on the page, not in the console 2016-04-14 12:16:10 +02:00
ansuz feaae609ad fix broken path for padrtc 2016-04-14 10:48:25 +02:00
Yann Flory ecc41d14af Use canonical serializer for json serialization 2016-04-13 17:46:41 +02:00
ansuz fc77ef66b3 Merge remote-tracking branch 'origin/sortify' into HEAD 
utilize canonical stringify function

Conflicts:
	www/_socket/main.js
 2016-04-13 17:36:05 +02:00
Caleb James DeLisle 319f5b95f7 Use canonical serializer for json serialization 2016-04-13 16:54:34 +02:00
Yann Flory 9683fd9aec Always serialize the DOM in one way. 2016-04-13 16:46:31 +02:00
Caleb James DeLisle 698338b49a Use canonical serializer for json serialization 2016-04-13 16:43:59 +02:00
Yann Flory e207d8b579 Merge branch 'diffdom' into netflux 2016-04-13 16:19:56 +02:00
ansuz 468827dadd newest tests 2016-04-13 16:10:38 +02:00
ansuz c867ab04ab rename /_socket/ app to /p/ 2016-04-13 16:01:45 +02:00
ansuz a1fe941f69 Always serialize the DOM in one way. 2016-04-13 15:00:19 +02:00
ansuz f4c5b2a996 Add sane defaults to TextPatcher diffs 2016-04-13 14:51:15 +02:00
ansuz 259772dd62 Turn on TextPatcher logging for _socket 2016-04-13 13:54:25 +02:00
ansuz 0537c28919 Add switchable logging to TextPatcher.js 2016-04-13 13:53:20 +02:00
Caleb James DeLisle 8a36963582 Enable ChainPad PARANOIA mode but remove the part which causes most slowness 2016-04-13 13:51:01 +02:00
ansuz 284da6a4e9 minor improvements I made to the /hack/ pad last night 2016-04-13 10:16:44 +02:00
ansuz 9f0cc4ed64 update hack with a slightly better UI 2016-04-12 18:51:03 +02:00
ansuz 71c0a06c3b Merge branch 'hack' into diffdom 2016-04-12 18:17:01 +02:00
ansuz 19cd991dba trim dead code, comment, very minor optimizations 2016-04-12 17:29:20 +02:00
ansuz f75c246029 remove dead code from pad/main.js 2016-04-12 17:17:14 +02:00
ansuz 9f45ccb2d9 use console.error for stack traces 2016-04-12 16:47:30 +02:00
ansuz d705b947ab Merge branch 'diffdom' into netflux 
basic cleanup while performing a larger merge between two prototypes
 2016-04-12 15:56:43 +02:00
ansuz 2ffa69dc15 remove checks for a non-existent race condition 2016-04-12 15:55:03 +02:00
ansuz 368d72b337 add missing semicolons to TextPatcher.js 2016-04-12 15:39:53 +02:00
ansuz 851ccfbdb6 detect falsey operations in OT and ignore them 2016-04-12 15:37:47 +02:00
ansuz 400f6efde1 json-ot.js : jshint compliance 2016-04-12 15:37:47 +02:00
ansuz a0999d1d2b add a comment about why hashes are being stubbed 2016-04-12 15:36:03 +02:00
ansuz ca94d30386 detect falsey operations in OT and ignore them 2016-04-12 15:35:07 +02:00
ansuz 9f9cd8d8cd realtime-input.js : fixes for jshint compliance 2016-04-12 15:07:05 +02:00
ansuz 793149a608 json-ot.js : jshint compliance 2016-04-12 15:00:46 +02:00
ansuz 06a3b63923 jshint compliance for toolbar.js 2016-04-12 14:58:24 +02:00
ansuz 3b8238ef3b add missing semicolons to pad/main.js 
jshint compliance
 2016-04-12 14:51:32 +02:00
ansuz 5cead3fad3 add missing semicolons to TextPatcher.js 2016-04-12 14:51:06 +02:00
ansuz e6ab03164c import TypingTests.js and expose at the console 
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
 2016-04-12 14:34:47 +02:00
ansuz 94e57e4a26 update location of text-patcher.js 2016-04-12 14:21:31 +02:00
ansuz b37dab1f49 Merge branch 'diffdom' into netflux 
Simple cleanup and unit tests
 2016-04-12 14:15:04 +02:00
ansuz a07774e81a Implement tests for serialization 
ensure that complex DOM elements can serialize and deserialize without modifications

RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
 2016-04-12 14:12:44 +02:00
ansuz 6bb37aed44 main.js : support tab insertion in /hack/ pad 2016-04-12 14:05:56 +02:00
ansuz 6b9d982d40 stabilize _socket/realtime-input.js 
...as common/RealtimeTextSocket.js
 2016-04-12 13:10:57 +02:00
ansuz 1a22592afa remove unused modules from realtime-input.js 2016-04-12 13:06:52 +02:00