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 |
|
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 |
|
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
|
a25152d1b6
|
ignore external files and anything relying on es6
|
2016-04-12 15:07:31 +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
|
07fdeebe17
|
LogStore.js : JSHint compliance and slight reformat
|
2016-04-12 14:50:32 +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 |
|