Commit graph

625 commits

Author SHA1 Message Date
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
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
Caleb James DeLisle
2cab588d06 Remove the request to SauceLab's broken rest API which seems to explode when you hit it while a job is ongoing 2016-04-20 20:37:48 +02:00
Caleb James DeLisle
e8eb677b0b debugging on the CI 2016-04-20 20:25:30 +02:00
Caleb James DeLisle
eadca92e98 don't repeat travis calling npm install but do use https for https urls 2016-04-20 20:20:29 +02:00
Caleb James DeLisle
2d7309b04f minor refactoring and hopefully we will be able to get the actual links to the tests on SauceLabs 2016-04-20 20:16:51 +02:00
Caleb James DeLisle
8709311a7e Lets try running with multiple types of browsers 2016-04-20 19:18:31 +02:00
Caleb James DeLisle
2a0b3a007d Added testing and auto-testing with selenium 2016-04-20 18:58:02 +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
Caleb James DeLisle
b16e53505f It's good to say where the target of your copy command is 2016-04-20 18:13:55 +02:00
Caleb James DeLisle
cf4601281b make .travis.yml look valid 2016-04-20 18:10:20 +02:00
Caleb James DeLisle
a9fba2cbab Ok lets try some automated testing! 2016-04-20 18:08:01 +02:00