Commit Graph

23 Commits

Author SHA1 Message Date
Jarrod Overson
b881dfa40a Merge branch 'master' of https://github.com/gruntjs/grunt-contrib-jasmine
Conflicts:
	package.json
2013-01-08 09:57:55 -08:00
Jarrod Overson
54f2212485 updated deps 2012-12-13 09:08:18 -08:00
Jarrod Overson
00c02b6ecf updated deps 2012-12-13 08:51:25 -08:00
Tyler Kellen
9daaa18b69 update deps 2012-12-13 10:48:23 -06:00
Tyler Kellen
e8b8565d53 Update CHANGELOG
use list format for multiple changes
2012-12-04 13:34:44 -06:00
Jarrod Overson
f1ff456c73 generalized configuration for requirejs template, updated jasmine, added loader plugin closing #5, #6, #7 2012-12-03 00:33:32 -08:00
Jarrod Overson
843a391f50 updated test config 2012-11-28 15:24:45 -08:00
Tyler Kellen
e3e225cdb9 html5 templates 2012-11-28 10:52:22 -06:00
Jarrod Overson
e1fc9c1c07 updated for new grunt/grunt-contrib apis, updated docs, updated dependencies 2012-11-24 15:44:00 -08:00
Tyler Kellen
9b3bd27e7d remove expandFiles, grunt does it for us now 2012-11-19 15:55:53 -05:00
Tyler Kellen
8d1bd5cf87 use local grunt-cli for npm test 2012-11-19 15:55:33 -05:00
Jarrod Overson
0649427e83 updated documentation order, added link to example application 2012-11-08 16:57:30 -08:00
Jarrod Overson
6fa3714fae Fixed 404, updated travis config, reverted test command 2012-11-07 13:14:09 -08:00
Jarrod Overson
1a1af9aa73 removed debug flags from test 2012-11-07 11:24:06 -08:00
Jarrod Overson
e151a8725f merge 2012-11-07 11:24:04 -08:00
Jarrod Overson
f5ba79756c Updated travis config, fixed race condition with RequireJS template 2012-11-07 11:02:54 -08:00
Jarrod Overson
d44d81448b Fixed race condition with requirejs template 2012-11-07 10:56:19 -08:00
Jarrod Overson
047631fcf5 updated changelog, built docs 2012-11-07 09:29:03 -08:00
Jarrod Overson
05700df04e updated editorconfig and inlined option definitions 2012-11-07 09:19:26 -08:00
Jarrod Overson
a3eb0b4f5f Ported the entirety of grunt-jasmine-runner/grunt-jasmine-task to grunt-contrib-jasmine
with changes necessary to conform to contrib standards and grunt 0.4.0 best practices

Squashed 53 commits
2012-11-06 17:09:13 -08:00
Jarrod Overson
ce94d0d33a merge 2012-11-01 22:04:58 -07:00
Jarrod Overson
9a71d179ea initial commit 2012-11-01 22:03:09 -07:00
Jarrod Overson
79f312721b updated base readme for current task status 2012-11-01 21:24:49 -07:00