Commit Graph

4295 Commits (c269929319cc1ee3e638406b0e50d9e09bef06b4)

Author SHA1 Message Date
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
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
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