Commit graph

2231 commits

Author SHA1 Message Date
Ben Hollis aa6b0482ae No longer initialize the app twice when starting preview server 2012-09-15 22:38:49 -07:00
Ben Hollis e35ce52803 Stop messing with load path in middleman executable 2012-09-15 18:45:14 -07:00
Thomas Reynolds 0327e2067f Merge pull request #596 from bhollis/cli
Please create a "--skip-bundle" flag for middleman init
2012-09-15 18:09:53 -07:00
Ben Hollis e0b88d91be Add skip-gemfile, skip-bundle, and skip-git options to middleman init, aligning with rails options. 2012-09-14 23:32:46 -07:00
Thomas Reynolds 493d782875 bump 3.0.4 2012-09-13 10:52:11 -07:00
Thomas Reynolds 77be952d41 Trying to return from a block is a bad idea 2012-09-13 10:51:31 -07:00
Thomas Reynolds 06578c61fa prep 3.0.3 2012-09-13 10:25:49 -07:00
Thomas Reynolds 345e7787b5 reloading fixes 2012-09-13 10:13:57 -07:00
Brad Dielman + Joe Fiorini 04f29139cb Add README files for each directory 2012-09-11 11:01:55 -04:00
Joe Fiorini f1038eb566 Make sure we keep the empty directories 2012-09-11 11:01:54 -04:00
Brad Dielman + Joe Fiorini 8f49e41422 Refactor structure into folders 2012-09-11 11:01:54 -04:00
Ben Hollis 09ba0049d4 Fix asset_hashing assets affected by Rack middleware or mounted apps (like sprockets). Fixes #558 2012-09-11 00:08:58 -07:00
Adam Luikart 4076666c19 Add test for asset_hashing rack-filtered items. 2012-09-11 00:08:57 -07:00
Thomas Reynolds 266e24e03e 3.0.2 2012-09-05 16:24:43 -07:00
Thomas Reynolds fcd36f587b Merge pull request #585 from adamesque/master
Fix failing CLI test.
2012-09-05 16:12:08 -07:00
Adam Luikart c2f7303041 h5bp 4.0 renames script.js to main.js. Fixes failing cli_init test. 2012-09-05 15:42:49 -05:00
Thomas Reynolds a96a41004c Logger has no such method .warning. Closes #582 2012-09-05 10:21:02 -07:00
Thomas Reynolds 4b085ea79f HTML5 Boilerplate 4.0 2012-09-04 09:48:52 -07:00
Thomas Reynolds 851652bb6c prep 3.0.1 2012-09-04 09:42:52 -07:00
Thomas Reynolds 05834ad386 Test relative_assets with i18n 2012-09-02 10:04:43 -07:00
Thomas Reynolds 56c6327aed fix windows gem name 2012-09-01 15:02:49 -07:00
Thomas Reynolds 1d8319b45b merge 2012-09-01 12:27:55 -07:00
Thomas Reynolds 0e75df16aa Lets try pre instead 2012-09-01 12:26:41 -07:00
Thomas Reynolds 971e38dc33 Lets try pre instead 2012-09-01 12:22:34 -07:00
Thomas Reynolds 4bbc225559 Prep 3.0.1 2012-09-01 08:45:43 -07:00
Thomas Reynolds 9b9146b437 The return of the windows gem, for wdm and speedier file watching support 2012-09-01 08:44:02 -07:00
Thomas Reynolds a5d8ab08ff Merge branch 'master' of github.com:middleman/middleman 2012-08-28 16:08:43 -07:00
Thomas Reynolds 1998668a87 Disable buggy color-compression in built-in Rainpress CSS minification. Fixes #576 2012-08-28 16:08:34 -07:00
Thomas Reynolds fea92e29cc Merge pull request #572 from tvaughan/patch-1
Update middleman-core/lib/middleman-core/templates/extension/Rakefile
2012-08-22 20:17:51 -07:00
Tom Vaughan 4c48baeee6 Update middleman-core/lib/middleman-core/templates/extension/Rakefile
A default target is required by travis-ci.org. Another option is to provide a .travis.yml that looks like:

    script: "bundle exec rake test"
2012-08-22 12:19:45 -07:00
Thomas Reynolds 1c32c5fd74 missing gitignore 2012-08-22 11:03:14 -07:00
Thomas Reynolds 193f32b9fb Add test gems to extension and a gitignore. Closes #570 2012-08-20 19:37:10 -07:00
Thomas Reynolds f7fc041034 Check whether a Pathname exists before calling realpath in build. Closes #569 2012-08-20 19:28:43 -07:00
Thomas Reynolds 5a88184769 lock therubyrhino gem dep 2012-08-16 13:56:25 -07:00
Thomas Reynolds 54c055ea5e Hack a way to pass Middleman context into Slim filters 2012-08-16 13:48:34 -07:00
Thomas Reynolds 8e7041994f Wire-up and document smacss template 2012-08-14 13:52:07 -07:00
Thomas Reynolds b3fd8629d3 Merge pull request #562 from nsteiner/smacss
adding smacss submodule
2012-08-14 13:43:57 -07:00
Thomas Reynolds 446aa6a4ba Clean up whitespace, play with cane for testing style quality and code complexity 2012-08-13 15:41:07 -07:00
Thomas Reynolds 955c66a54f Setup Less paths for imports 2012-08-10 12:29:15 -07:00
Nate Steiner 7fb6766d4d adding smacss as files instead of a submodule 2012-08-10 14:19:20 -04:00
Nate Steiner 893b7baafd removing smacss submodule 2012-08-10 14:17:10 -04:00
Nate Steiner e29dfa4ab7 adding smacss submodule 2012-08-10 11:29:19 -04:00
Thomas Reynolds 80e36b7c53 Given file-based metadata precedence over config/path metadata. Fixes #552 2012-07-29 10:22:57 -07:00
Thomas Reynolds 0625d96e43 Merge pull request #552 from cwebbdesign/master
Adding tests for setting layout in frontmatter on pages already defined in config.rb
2012-07-29 10:12:06 -07:00
cwebbdesign d0a36f0879 Adding tests for using front matter to override layout set in config 2012-07-27 10:57:48 +02:00
cwebbdesign a0c11df4cc Adding tests for overriding layouts using frontmatter 2012-07-27 10:55:30 +02:00
Thomas Reynolds 4410d858f2 Merge pull request #550 from rumpuslabs/instance_vars_fix
Fix instance variables in dynamic pages
2012-07-26 13:46:56 -07:00
Thomas Reynolds f1eae1e0c8 Correct path in sass-assets-path test 2012-07-25 12:05:43 -07:00
Thomas Reynolds 1c9810483b Ruby 1.8-friendly markdown image test 2012-07-25 11:39:17 -07:00
Thomas Reynolds 6ccf5e2db0 Don't catch CoffeeScript errors when in build mode. Fixes #551 2012-07-25 11:22:29 -07:00