Commit graph

2732 commits

Author SHA1 Message Date
Thomas Reynolds f977d284fc Use spork for forked cucumber tests, build images first to appease Compass 2011-06-24 12:06:28 -07:00
Matthias Döring 5a467d4258 Merge remote branch 'upstream/master' 2011-06-24 20:56:11 +02:00
Thomas Reynolds b585e0775b prep new beta 2011-06-24 11:05:26 -07:00
Thomas Reynolds a3b96dba19 add rake to dep gems 2011-06-24 11:04:26 -07:00
Thomas Reynolds 02158cb96a Merge in pull 65 2011-06-24 11:04:16 -07:00
Matthias Döring 352f8ec816 tags for blog entries 2011-06-24 19:03:10 +02:00
Matthias Döring 3dbfe05409 Merge remote branch 'upstream/master' 2011-06-24 09:24:49 +02:00
David Siegel 3836b1d90c Add empty files! 2011-06-23 20:46:21 -07:00
Thomas Reynolds 5861a1bd7f Don't double list sass. Ignore leftover build folder in git 2011-06-23 18:05:25 -07:00
David Siegel fe9a5ece32 Take a bit more care when checking if a view file exists. 2011-06-23 09:41:43 -07:00
David Siegel 621825b36c Ignore swapfiles (used by vim) 2011-06-23 09:32:05 -07:00
David Siegel bfa5332c98 Add auto_javascript_include_tag that behaves similarly to auto_stylesheet_link_tag.
Includes new features/fixtures.
2011-06-22 16:54:38 -07:00
Thomas Reynolds 38ed58070d new beta 2011-06-14 14:02:46 -07:00
Thomas Reynolds 5cecbec455 specific compass 2011-06-14 14:02:33 -07:00
Thomas Reynolds d17fa7b71b fix esoteric image path bug 2011-06-14 13:54:59 -07:00
Thomas Reynolds d2e7dde496 new release 2011-06-13 18:34:14 -07:00
Thomas Reynolds f7a567d2d3 always rely on frontmatter 2011-06-13 18:33:50 -07:00
Thomas Reynolds a4a9075e54 Use Susy instead of Blueprint 2011-06-12 11:45:11 -07:00
Matthias Döring a4686eee9a Merge remote branch 'upstream/master' 2011-06-10 11:20:36 +02:00
Thomas Reynolds 704b434230 no sprockets 2011-06-09 23:27:41 -07:00
Thomas Reynolds a139b4cae9 use webrick, remove thin/kirk requirements 2011-06-09 22:48:35 -07:00
Thomas Reynolds 6c5d75aca9 working implementation, dogfooding on my own blog 2011-06-08 20:53:46 -07:00
Thomas Reynolds 746ddcc519 blog feature 2011-06-07 21:44:10 -07:00
Thomas Reynolds 9849e2aa2f more robust frontmatter impl, still need to tie into Tilt 2011-06-06 11:39:57 -07:00
Matthias Döring 80e120060b fix for #58 2011-06-07 01:35:01 +08:00
Matthias Döring 1f259be206 fix for #58 2011-06-06 12:40:14 +02:00
Thomas Reynolds 5ded17c775 Simple YAML front-matter implementation. Needs tests and to teach Tilt to ignore the YAML 2011-06-05 18:59:04 -07:00
Thomas Reynolds 89ccb10452 convore 2011-06-05 13:42:32 -07:00
Thomas Reynolds 56b3a176fb Fix preview mode status/mime issues for static files 2011-06-05 12:54:18 -07:00
Thomas Reynolds 3a7d30164d play with fixing live reload 2011-06-05 12:44:57 -07:00
Thomas Reynolds f3bd7bd3d1 Add support for slim templating language (because I love it) 2011-06-02 10:48:56 -07:00
Thomas Reynolds 93f919f309 Merge pull request #56 from matt-hh/coffee-filter
coffee filter + minify inline javascript
2011-06-02 10:37:16 -07:00
Matthias Döring 36698f1aba fix for static files 2011-06-02 12:05:09 +02:00
Matthias Döring a53983e56d moving test file to source 2011-06-02 11:43:15 +02:00
Matthias Döring 06dc9f6875 Merge branch 'coffee-filter' of github.com:matt-hh/middleman into coffee-filter 2011-06-02 11:40:07 +02:00
Matthias Döring 57c80f00e7 minifiy inline js 2011-06-02 11:37:58 +02:00
Matthias Döring cc73d4c2c6 adding :coffeescript haml filter 2011-06-02 11:37:58 +02:00
Thomas Reynolds ec1bdd2fb3 require newer tilt 2011-06-01 12:33:03 -07:00
Thomas Reynolds 8d6e7cdedb Merge commit 'bb0ced8741d0da28076aa045e372cd08e8bbf82b' 2011-06-01 09:06:36 -07:00
Matthias Döring 757ff53062 adding before hook 2011-06-01 09:06:13 -07:00
Matthias Döring bb0ced8741 public -> views 2011-06-01 01:09:00 +02:00
Matthias Döring 9d4303e102 minifiy inline js 2011-05-31 11:45:32 +02:00
Thomas Reynolds 993be281c7 First pass at combining views and public folders 2011-05-30 22:33:11 -07:00
Matthias Döring bf2741ffc7 adding :coffeescript haml filter 2011-05-23 14:37:43 +02:00
Thomas Reynolds ba2cbb0ceb release fixes #52 2011-05-22 14:08:53 -07:00
Thomas Reynolds 739e668008 rely on sass/plugin like tilt 2011-05-22 14:08:33 -07:00
Thomas Reynolds 468c9561f0 Prep windows fix release. Fixes #49 2011-05-19 10:37:20 -07:00
Thomas Reynolds 63b24a33ca Only trap the TSTP unix event on unix 2011-05-19 10:36:46 -07:00
Thomas Reynolds 397a545b8c Don't depend on therubyracer, let uglifier figure out it's own deps. Fixes #50 2011-05-18 15:22:19 -07:00
Thomas Reynolds c38d542a4a fix issue with in-template sass filters 2011-05-12 12:18:17 -07:00