Commit graph

1568 commits

Author SHA1 Message Date
Thomas Reynolds
b23afba42b Merge branch 'master' of github.com:tdreyno/middleman 2011-04-26 12:06:19 -07:00
Thomas Reynolds
1727251be5 Merged pull request #41 from hagenburger/master.
JavaScript minify
2011-04-26 12:05:33 -07:00
Thomas Reynolds
e9960ea594 Fix support for sinatra 1.2 custom layout engines 2011-04-26 11:50:45 -07:00
Nico Hagenburger
ae110a285c the rack interface requires the body to be an array 2011-04-26 16:32:05 +02:00
Thomas Reynolds
16ffd59ef9 tinysrc feature (unfinished) 2011-04-25 13:45:54 -07:00
Thomas Reynolds
ab16d6f2e6 Edited middleman.gemspec via GitHub 2011-04-25 13:18:35 -07:00
Thomas Reynolds
1547281a2c bump a minor version, compass/haml/sass have shipped 2011-04-25 09:32:00 -07:00
Thomas Reynolds
cdd89626d7 holy crap, sass 3.1 is out 2011-04-24 20:13:07 -07:00
Thomas Reynolds
f8b7f410a6 Make custom page/layout rendering handle all possible directory/index permutations. closes #37 2011-04-22 11:48:48 -07:00
Thomas Reynolds
f5a009fe44 Fix error when using relative_assets and automatic_image_sizes. Thanks @zlz. Closes #35 2011-04-20 13:41:38 -07:00
Thomas Reynolds
f237cf014a remove slickmap into own extension 2011-04-20 13:16:12 -07:00
Thomas Reynolds
856d1398c2 Add :relative_assets to default config.rb, allow overriding with --relative from mm-build command 2011-04-19 14:24:21 -07:00
Thomas Reynolds
7b666cb7c2 Pull smusher out into its own gem 2011-04-18 10:56:12 -07:00
Thomas Reynolds
bfcb7cbd36 test gemspec change 2011-04-16 23:55:33 -07:00
Thomas Reynolds
a6d2370fc4 Support custom templates in the user's ~/.middleman directory 2011-04-16 16:23:10 -07:00
Thomas Reynolds
8886a74e89 try requiring json gem directly 2011-04-16 15:44:45 -07:00
Thomas Reynolds
856dc76e92 minor version 2011-04-15 10:09:04 -07:00
Thomas Reynolds
9904c999d0 minor build tweak 2011-04-15 10:08:16 -07:00
Thomas Reynolds
4652de9a1c final 1.1 release 2011-04-15 09:57:45 -07:00
Thomas Reynolds
4ae03e6bbb begin yaml data store 2011-04-14 15:35:41 -07:00
Thomas Reynolds
b29413bcd3 make mm-init templates extensible. closes #18. 2011-04-12 20:32:55 -07:00
Thomas Reynolds
4598e424b8 update to lastest compass, release 2011-04-10 15:29:21 -07:00
Thomas Reynolds
f40c8a56da traverse up directories to find root mm project. closes #19 2011-04-10 15:27:18 -07:00
Thomas Reynolds
62abada7f5 assuming requests missing extension are supposed to be directories. closes #16 2011-04-10 15:01:34 -07:00
Thomas Reynolds
74266e7440 manually handle recursion in mm-build, support symlinks. closes #20 2011-04-10 14:38:06 -07:00
Thomas Reynolds
350d36b018 Handle templates without final file type information by ignoring them 2011-04-09 17:12:05 -07:00
Thomas Reynolds
b9aebb9001 use specific versions with prereleases 2011-04-08 12:01:18 -07:00
Thomas Reynolds
42e7af6ae2 update some gem deps 2011-04-08 11:55:50 -07:00
Thomas Reynolds
4411e65f5f Bump prerelease 2011-04-08 11:50:42 -07:00
Thomas Reynolds
724c480390 Add config.ru to generator to simplify using MM with passenger or pow 2011-04-08 11:50:14 -07:00
Thomas Reynolds
a6a0dfb0f0 Bump gem to work with Sinatra 1.2 2011-04-06 16:37:04 -07:00
tdreyno
fb0fd41e57 Updating to sinatra 1.2.x 2011-03-16 14:20:45 -05:00
Thomas Reynolds
6e3c985265 Keep LiveReload disabled 2011-02-21 13:07:32 -08:00
Travis Tilley
632dc9edc1 Exact gem versions aren't necessary here. Fixes ->
Bundler could not find compatible versions for gem "compass":
  In Gemfile:
    middleman depends on
      compass (= 0.11.beta.2)

    compass (0.11.beta.2.802bc71)
2011-02-21 15:51:54 -05:00
Travis Tilley
5c93bae53b did this get missed somehow? fix activate, add live_reload to autoload 2011-02-21 11:26:20 -05:00
Travis Tilley
08a9f45164 make middleman not be so outright jruby hostile 2011-02-21 10:19:18 -05:00
Thomas Reynolds
1a15147f67 fix rakefile 2011-02-18 16:29:55 -08:00
Thomas Reynolds
48d2956a57 features docs 2011-02-18 16:25:18 -08:00
Thomas Reynolds
c00c47eeb3 custom project templates, html5boilerplate 2011-02-16 09:36:10 -08:00
tdreyno
f08fa84852 Add docs task and setup gh pages 2011-02-12 21:02:00 -08:00
tdreyno
e51d84b2ed Prepping HTML5Boilerplate-based projects 2011-02-11 07:30:49 -08:00
tdreyno
3a333c37be Initial docs 2011-02-10 23:14:33 -08:00
tdreyno
ba7754e7a7 fix js compression. Speed up static asset loading 2011-02-06 10:57:28 -08:00
tdreyno
8bc6714eb1 Let's call this beta 3 2011-02-05 10:32:56 -08:00
tdreyno
173c8aa896 Add Rubygems-test support 2011-02-05 10:32:40 -08:00
tdreyno
260b7c9f1b Init generator on Thor 2011-02-05 10:32:27 -08:00
tdreyno
c6b0723156 Reimplement smusher for thor 2011-01-30 15:11:54 -08:00
tdreyno
d643a8e041 Tests pass, long live Thor 2011-01-30 14:23:29 -08:00
tdreyno
b18584cfd4 thor-based builder 2011-01-30 14:18:49 -08:00
tdreyno
0b23bb28d4 Lorem seems to work 2011-01-22 13:37:05 -08:00