 ansuz
|
b09b73fcc6
|
remove chainpad server
|
2016-04-27 14:09:01 +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 |
|
|
ansuz
|
626ecaffcd
|
log browser fights in /pad/
|
2016-04-27 11:10:31 +02:00 |
|
|
ansuz
|
afe78dad56
|
Merge branch 'netflux' into beta
|
2016-04-27 10:44:32 +02:00 |
|
|
ansuz
|
a735d63306
|
migrate markdown rendering 'pad' to netflux
|
2016-04-27 10:38:44 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
ansuz
|
2c158558f5
|
use leveldb adaptor by default
|
2016-04-22 11:05:54 +02:00 |
|
|
ansuz
|
60eb8b52a9
|
listen for websockets on the same port as the httpd
|
2016-04-22 10:55:20 +02:00 |
|
|
ansuz
|
e83e5026ce
|
make amnesiadb compatible with netflux
|
2016-04-22 10:54:44 +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
|
d576fdc886
|
fix bug where empty channels failed
|
2016-04-21 19:03:22 +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
|
86bbc15017
|
document modified storage API
|
2016-04-21 17:14:59 +02:00 |
|
|
ansuz
|
7a02d85ec5
|
Netflux server mustn't send a zero message until the history is synced
|
2016-04-21 17:02:54 +02:00 |
|
|
ansuz
|
ce69062b7c
|
implement callback for getMessages
|
2016-04-21 17:01:21 +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
|
ae039b0551
|
remove NetFlux server prototype
|
2016-04-20 16:00:28 +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
|
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
|
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 |
|
|
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 |
|
|
ansuz
|
822b2bd2b9
|
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
|
2016-04-14 14:47:22 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|