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 |
|
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 |
|
ansuz
|
6dabded135
|
correct path for having renamed _socket
|
2016-04-13 16:21:17 +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
|
2fdb4c1255
|
ignore external files and anything relying on es6
merge differences from netflux
Conflicts:
.jshintignore
|
2016-04-12 15:39:28 +02:00 |
|