Commit Graph

384 Commits

Author SHA1 Message Date
John Bintz f7384d684c It's been fun. Use Karma instead. 2014-05-14 15:34:21 -04:00
John Bintz 1055dc1016 Merge pull request #177 from jeremy-brenner/master
Qt 4.8 fix
2013-03-15 10:59:23 -07:00
Jeremy Brenner c1e786f3c5 Added compiler directive to include getopt.h on qt versions >= 4.8 2013-03-15 11:23:50 -05:00
John Bintz aa1d989a90 message about looking for new maintainer 2012-07-30 11:15:32 -04:00
John Bintz 30e1ff8e51 bump version 2012-04-23 11:08:17 -04:00
John Bintz 9b41a36841 fix a bad commit and fix multijson deprecation warnings 2012-04-23 09:30:56 -04:00
John Bintz 65137186c8 Merge pull request #142 from pungoyal/master
fixing multi_json 1.3.2 issue #140
2012-04-18 08:05:08 -07:00
Puneet Goyal a89682f771 Update vendor/assets/javascripts/intense.coffee 2012-04-18 20:24:20 +05:30
Puneet Goyal 3815a47d07 fixing multi_json 1.3.2 issue 2012-04-18 20:22:14 +05:30
John Bintz 724541a2cb Merge pull request #135 from tddium/master
Sort order in directory globs
2012-04-03 06:50:51 -07:00
William Josephson 1c81ea7286 Most filesystems don't guarantee directory listing order, so sort glob results. 2012-04-02 22:12:45 -04:00
John Bintz 8c6a792960 Merge pull request #132 from doitian/master
Do not populate the global Sprockets environment
2012-03-23 11:48:33 -07:00
Ian Yang 1aac97ea1f do not populate the global Sprockets environment 2012-03-23 22:52:54 +08:00
John Bintz 21590a9a19 Merge pull request #111 from rossta/register_custom_template_hook
Ability to register custom template engines...
2012-03-22 04:17:13 -07:00
John Bintz 68683e4b6c Merge pull request #131 from pmcelhaney/patch-1
Great price and record fast shipping time!!! Would request again. :)
2012-03-20 11:12:14 -07:00
Patrick McElhaney 181f4e286a Removed log messages from spec runner. 2012-03-19 17:05:51 -03:00
John Bintz d572b0d6fe Merge pull request #130 from pmcelhaney/patch-1
Fixed getLastModified callback firing three times
2012-03-19 12:11:28 -07:00
Patrick McElhaney af20af8524 Fixed getLastModified callback firing three times (once for every readyState change). 2012-03-19 15:28:41 -03:00
John Bintz 0064595dea remove the specification of the qmakespec, maybe help fix #59 2012-02-21 09:19:33 -05:00
John Bintz 2e2651d11a may fix #119, file paths on windows 2012-02-21 09:04:00 -05:00
John Bintz c96cbd4aac move sprockets gem finding to separate gem that enforces rubygems version, implements #116 in a different way 2012-02-08 09:07:54 -05:00
John Bintz 4f11cba073 some fixes for bad things. i'm sad 2012-02-03 15:12:28 -05:00
John Bintz bad6839760 rc version bump 2012-01-27 09:19:44 -05:00
John Bintz 453f439271 forgot a change 2012-01-24 14:47:31 -05:00
John Bintz 142a0c974b make sure src_files can also be loaded from other asset paths, should fix problem found by @christiannelson 2012-01-24 14:38:10 -05:00
Ross Kaffenberger 75dce5b66b Ability to register custom template engines via Jasmine::Headless.register_engine hook 2012-01-22 18:40:13 -05:00
John Bintz 0d4550524f crazy crazy changes for server running and outside browser usage and other *magic* 2012-01-18 18:04:36 -05:00
John Bintz 47b8d10d56 server runner updated 2012-01-17 13:32:57 -05:00
John Bintz d3c3e7bd7d don't reinvent the wheel 2012-01-13 07:45:27 -05:00
John Bintz f51f041b85 webrick seems to need log write locations or things get weird 2012-01-12 18:40:25 -05:00
John Bintz 8de1bd8cf0 clean up some fixes 2012-01-12 18:07:08 -05:00
John Bintz 09842c0539 fix a few verbose reporter bugs 2012-01-12 16:47:36 -05:00
John Bintz 5d43eb2193 let's run with a server, like all the cool kids do nowadays\! 2012-01-12 15:02:32 -05:00
John Bintz ed4590ee44 ensure assets with same logical_path but different pathnames are included, fixes #110 2012-01-12 14:16:16 -05:00
John Bintz b7553062bd rearrange js 2012-01-11 15:41:27 -05:00
John Bintz ed76916205 more cleanup 2012-01-11 14:24:09 -05:00
John Bintz b9b4648a24 update reporter 2012-01-11 11:37:25 -05:00
John Bintz 282ed40264 merge 2012-01-11 09:58:47 -05:00
John Bintz 1f56031d8b -q to silence some noisy things, fixes #97 2012-01-11 08:44:28 -05:00
John Bintz da59a48025 add verbose reporter 2012-01-10 17:14:37 -05:00
John Bintz 81f561282a make sure window.promot doesn't get called, fixes #106 2012-01-09 13:20:58 -05:00
John Bintz dfe1bece2c make sure window.promot doesn't get called, fixes #106 2012-01-09 11:09:34 -05:00
John Bintz 7587381e1e qt 4.8 webkit doesn't use working dir to resolve local file urls anymore, fixes #101 2012-01-03 10:47:18 -05:00
John Bintz df83a61cb5 add help options 2011-12-30 15:33:06 -05:00
John Bintz d5b2239d0f more clean up work, break things apart for manageability/testing 2011-12-30 11:34:30 -05:00
John Bintz d31f628d91 clean up how reporting is done somoe more 2011-12-30 10:47:08 -05:00
John Bintz 0adf3a41b6 a whole ton of reporters work 2011-12-29 18:37:23 -05:00
John Bintz 09f4df94de merge 2011-12-29 09:38:24 -05:00
John Bintz 9dafb83892 things in a weird state... 2011-12-29 09:32:27 -05:00
John Bintz 9ff0dca191 Merge branch 'master' of github.com:johnbintz/jasmine-headless-webkit 2011-12-24 10:12:44 -05:00