Commit Graph

723 Commits (29b1b060d6493e8fd9f9f69b737df2411be30d0c)

Author SHA1 Message Date
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
Caleb James DeLisle e68dd31a53 Fix #19 by adding a lock to level db connector 2016-04-20 14:38:41 +02:00
ansuz 2b9d9ada8b Add a working picture 2016-04-20 14:37:24 +02:00
ansuz 3fb1d0ed2b Write a document detailing system architecture 2016-04-20 14:37:10 +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 7adc7eef22 Merge pull request #18 from xwiki-labs/integrate
Integrate
2016-04-20 14:16:53 +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 302b8c5f04 Merge branch 'master' of github.com:xwiki-labs/cryptpad into integrate 2016-04-20 10:04:07 +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 cc1814544d install fabricjs 2016-04-17 20:05:40 +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 b71f73455d Add a working picture 2016-04-15 18:19:46 +02:00
ansuz fe1daa5caf Write a document detailing system architecture 2016-04-15 18:17:58 +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 c8dabbd6e7 Merge pull request #17 from xwiki-labs/sortify
Merge pull request #16 from xwiki-labs/beta
2016-04-14 11:15:30 +02:00
ansuz 9a33e7cbf0 Merge pull request #16 from xwiki-labs/beta
Beta
2016-04-14 11:14:23 +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