Commit graph

13 commits

Author SHA1 Message Date
tobisek eda75fbfd5 added default chrome path for Mac OS X 2015-11-15 15:03:43 +02:00
Ryan Cavanaugh e630ce247b Fix merge problems from master 2015-11-09 12:49:36 -08:00
Ryan Cavanaugh 7dd1bf487d Merge branch 'master' into javaScriptModules
# Conflicts:
#	lib/lib.es6.d.ts
#	lib/tsc.js
#	lib/tsserver.js
#	lib/typescript.d.ts
#	lib/typescript.js
#	lib/typescriptServices.d.ts
#	lib/typescriptServices.js
#	src/compiler/binder.ts
#	src/compiler/checker.ts
#	src/compiler/parser.ts
#	src/compiler/program.ts
#	src/harness/fourslash.ts
2015-11-06 16:49:09 -08:00
Ryan Cavanaugh 3f4e5a4552 Merge branch 'master' into javaScriptModules
# Conflicts:
#	tests/webTestServer.ts
2015-11-06 16:34:38 -08:00
Vladimir Matveev d2a11b55dc merge with master 2015-10-27 10:41:21 -07:00
Vladimir Matveev 0834a29b15 pick default chrome location based on platform 2015-10-21 17:04:18 -07:00
Ryan Cavanaugh 1a36fce4c2 JavaScript LS scaffolding + JS module inference 2015-10-14 17:36:03 -07:00
Vladimir Matveev f0f5a0d71e updated command line options, accepted baselines 2015-10-03 00:20:15 -07:00
Dick van den Brink 4c16b239be Fixed jake runtests-browser on node 0.12 2015-03-07 01:38:42 +01:00
Mohamed Hegazy 1f2a2d2ae3 Simple fixes for the tests 2014-09-11 09:23:29 -07:00
Dick van den Brink 4635215209 Fix browser tests not working when not cloned in TypeScript directory 2014-07-22 00:13:48 +02:00
Dan Quirk 58067891f1 Fix web test server for new repo 2014-07-17 15:35:09 -07:00
Mohamed Hegazy 214df64e28 Add snapshot of compiler sources 2014-07-12 17:30:19 -07:00