deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
706 commits 11 branches 271 tags 23 MiB
Commit graph

385 commits

Author SHA1 Message Date
Thomas Reynolds
59a07d4cc0 make data dir configurable 2011-07-06 10:30:24 -07:00
Thomas Reynolds
6a3de0768c Data API test 2011-07-06 10:29:07 -07:00
Thomas Reynolds
c9e4d41533 default extensions 2011-07-06 10:18:02 -07:00
Thomas Reynolds
1a285ae36e feature api, front matter and padrino rendering are core 2011-07-06 10:16:19 -07:00
Thomas Reynolds
397cd0e30b feature api, front matter and padrino rendering are core 2011-07-06 10:15:31 -07:00
Thomas Reynolds
7a35c1f48e split out core extensions from features 2011-07-06 09:50:34 -07:00
Thomas Reynolds
a6ad06f3e6 prep beta 2011-07-01 10:44:19 -07:00
Thomas Reynolds
cbdceb26cc Fix #72 2011-07-01 10:07:50 -07:00
Thomas Reynolds
77353b5adf Finish removing extra libs from front matter 2011-06-28 15:51:25 -07:00
Thomas Reynolds
78e31382e9 Merge branch 'master' of github.com:tdreyno/middleman 2011-06-27 13:11:55 -07:00
Thomas Reynolds
89849b2625 Rely directly on rdiscount, clean up Tilt load errors 2011-06-27 13:10:09 -07:00
Thomas Reynolds
22efdcfa44 re-raise missing template exception in dev 2011-06-27 12:33:21 -07:00
Matthias Döring
44894f9b74 Merge pull request #67 from matt-hh/master 
Tags for blog feature
 2011-06-27 00:09:36 -07:00
Thomas Reynolds
a66a0bb5a8 another release 2011-06-24 12:06:45 -07:00
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
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
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
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
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
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
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
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
Matthias Döring
36698f1aba fix for static files 2011-06-02 12:05:09 +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
Matthias Döring
bb0ced8741 public -> views 2011-06-01 01:09:00 +02:00
Thomas Reynolds
993be281c7 First pass at combining views and public folders 2011-05-30 22:33:11 -07: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
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
Thomas Reynolds
baef07f7cf don't globally replace build in output files, just the first duplicate directory 2011-05-07 21:49:23 -07:00
Thomas Reynolds
796ff20939 Initial proxy impl 2011-05-06 14:31:15 -07:00
Thomas Reynolds
6a4c1fb43d fix issue with single extensions in public folder 2011-04-29 22:00:22 -07:00
Thomas Reynolds
358752272d rename old default template to xhtml, update new default to lean html5 2011-04-29 17:00:25 -07:00
Thomas Reynolds
f62283a02b release for sass fix 2011-04-29 12:25:14 -07:00
Thomas Reynolds
c410e9dc65 output css errors from sass. closes #43 2011-04-29 12:24:40 -07:00
Thomas Reynolds
e205ae4e24 bump version 2011-04-29 12:03:34 -07:00
Thomas Reynolds
78f8245c20 remote data sources and indifferent access. closes #44 2011-04-29 11:58:07 -07:00
Thomas Reynolds
7ea1704a64 remove explicit less.rb support. Switch to uglifyJS for compression. 2011-04-26 23:03:25 -07:00
Thomas Reynolds
6a86f66010 new release containing sinatra custom layout support and Rack minification fix 2011-04-26 12:10:27 -07:00
Thomas Reynolds
b23afba42b Merge branch 'master' of github.com:tdreyno/middleman 2011-04-26 12:06:19 -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
1547281a2c bump a minor version, compass/haml/sass have shipped 2011-04-25 09:32:00 -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
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
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
Thomas Reynolds
6e3c985265 Keep LiveReload disabled 2011-02-21 13:07:32 -08: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
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
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
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
Thomas Reynolds
a99c5f13dc possibly broken support for lorem generator 2011-01-18 15:01:17 -08:00
Thomas Reynolds
835a0d8a3e track compass beta 2011-01-10 10:20:57 -08:00
Thomas Reynolds
9ea7da07cb bump 2011-01-05 16:04:00 -08:00
Thomas Reynolds
d93951990f edge support 2011-01-05 16:03:18 -08:00
Thomas Reynolds
a9773eb582 Merge sass layout fix, bump for release 2011-01-05 10:55:04 -08:00
Nico Hagenburger
3e767a2795 allow to include own file extentions (create list after running config.rb) 2011-01-01 23:07:37 +01:00
Nico Hagenburger
d4eb42f27f fixed loading of layouts for js and css 2011-01-01 23:00:09 +01:00
tdreyno
4face08dac use bundler for packaging 2010-12-23 17:18:15 -08:00
Thomas Reynolds
83d9542b77 Fix slickmap loading bug 2010-10-20 09:28:57 -07:00
tdreyno
5a161a21a0 prep 1.0 2010-09-24 20:44:53 -07:00
Thomas Reynolds
e1f8aba315 minor updates 2010-09-24 15:56:04 -07:00
tdreyno
a3b276d489 coderay support 2010-09-21 18:30:17 -07:00
tdreyno
4089f50b10 coffee_script supported in tilt 1.1 now 2010-09-11 09:39:09 -07:00
tdreyno
4d0567cf40 Now riding on Sinatra extensions and using Padrino rendering 2010-09-06 18:48:46 -07:00
tdreyno
4ba90bf1c7 remove rspec, convert everything to cucumber 2010-09-06 10:59:51 -07:00
tdreyno
d638fe8ce2 fix auto image sizes, make default helpers first feature 2010-09-05 19:33:57 -07:00
tdreyno
8b00e830f9 fix slickmap, change to config.rb, rename Base to Server 2010-09-05 19:28:38 -07:00
tdreyno
a81d300532 Removed Sprockets support. I suggest using a client-side tool like StealJS or RequireJS 2010-09-04 23:45:19 -07:00
tdreyno
5523a10d9b Rewritten core which makes better use of Tilt. Support for SCSS, Coffee and Less. 2010-09-04 20:26:48 -07:00
Thomas Reynolds
8d2c070104 enable less and builder support 2010-08-06 09:59:38 -07:00
tdreyno
2647c1da80 new compass, updated specs 2010-08-03 20:56:50 -07:00
tdreyno
071e65b921 tweaks and erb 2010-04-28 14:26:20 -07:00
tdreyno
25ce57017b autoload 2010-04-28 14:03:09 -07:00
tdreyno
65925fc0e5 works now 2010-04-28 14:03:09 -07:00
tdreyno
ccbc3cf46f better rack 2010-04-28 14:03:08 -07:00
tdreyno
e16cf25be5 mild fixes 2010-04-18 12:08:08 -07:00
tdreyno
7878c5a1ba firesass support 2010-03-22 20:48:06 -07:00
tdreyno
a0cce524a8 remove vendored gems 2010-02-15 13:02:20 -08:00
tdreyno
7ee181f2f0 fix broken specs 2010-02-02 17:11:09 -08:00
tdreyno
af8f1c4f26 Sinatra 1.0 based prerelease 2010-02-02 17:06:37 -08:00
tdreyno
ce6deb4c9f Update to sinatra 1.0a 2010-01-29 22:48:34 -08:00
tdreyno
854bd73b46 ruby 1.9 gems 2010-01-20 15:31:50 -08:00
tdreyno
5e94e17529 gem updates 2010-01-20 15:22:40 -08:00
tdreyno
137b7dfe73 spec ups 2009-12-29 21:00:16 -08:00
tdreyno
01d182062a gem bundle up 2009-12-28 12:03:38 -08:00
tdreyno
97397489c9 ready for relase 2009-12-13 12:02:24 -08:00
tdreyno
262fb3cc46 bundler up 2009-12-07 15:42:56 -08:00
tdreyno
420286ed45 bundle update 2009-12-03 13:34:20 -08:00
tdreyno
6172790a79 pass specs again 2009-11-30 11:32:02 -08:00
tdreyno
d770a60d19 more changes 2009-11-24 14:24:20 -08:00
tdreyno
b872dad760 more cucumber stuff 2009-11-22 15:37:11 -08:00
tdreyno
b49f9fda6b move vendor dir 2009-11-22 14:16:20 -08:00
tdreyno
9b050883e1 make cache buster more robust 2009-11-17 15:52:28 -08:00
tdreyno
4692ceff07 a fully-bundled middleman 2009-11-17 15:26:23 -08:00
tdreyno
2020646909 move yui into rack 2009-11-17 12:24:10 -08:00
tdreyno
dce4860f91 fix cache_buster specs 2009-11-17 11:38:10 -08:00
tdreyno
ed83154945 add smusher dep 2009-11-17 11:13:32 -08:00
tdreyno
9880f0f6dc fix css minify 2009-11-17 11:02:31 -08:00
tdreyno
b245da5d1b try to fix runcoderun 2009-11-16 22:21:36 -08:00
tdreyno
7daff4494a hheey 2009-11-16 16:17:45 -08:00
tdreyno
3ec6b7536f correct relative asset error 2009-11-16 16:14:51 -08:00
tdreyno
84c47f3ced page method and with_layout block 2009-11-16 11:32:55 -08:00
tdreyno
aa5a3d5918 runcoderun 2009-11-13 12:25:16 -08:00
tdreyno
1e02f6d55f fix cache buster 2009-11-11 16:22:26 -08:00
tdreyno
033e906a32 apparently newlines don't work with ruby 1.8 2009-11-11 14:11:16 -08:00
tdreyno
5476bc05f7 apparently newlines don't work with ruby 1.8 2009-11-11 14:10:07 -08:00
tdreyno
2ecf558232 default xhtml strict doctype 2009-11-10 11:41:17 -08:00
tdreyno
91bc86640a get relative_assets working with a specified http_path 2009-11-06 16:23:33 -08:00
tdreyno
191e972c44 more helper tests 2009-11-03 12:49:54 -08:00
tdreyno
ecce56d6ae new helpers and some specs 2009-11-03 12:34:57 -08:00
tdreyno
79d411e625 better default sass 2009-11-02 16:50:00 -08:00
tdreyno
c0349f742e better feature defaults 2009-11-02 16:41:28 -08:00
tdreyno
6a9870ed1c better default project and test for layout working 2009-11-02 16:11:24 -08:00
tdreyno
d8286c2dd7 fix layout filename 2009-11-02 14:15:23 -08:00
tdreyno
33195c84a9 keep cache busting in a single file 2009-10-29 09:43:08 -07:00
tdreyno
81a8192d14 enable smush cache 2009-10-29 09:17:15 -07:00
tdreyno
de6a4679a6 fix auto image sizes 2009-10-28 14:54:25 -07:00
tdreyno
d99ddec85b fix cache buster 2009-10-28 10:51:25 -07:00
tdreyno
75c5825ec2 tests pass, added autosize and relative tests 2009-10-27 18:13:19 -07:00
tdreyno
fb17900ed2 merge 2009-10-26 15:46:16 -07:00
tdreyno
fcc4169b1d home changes 2009-10-26 15:42:06 -07:00
tdreyno
8fcb1d0133 automatic image size calculations 2009-10-26 15:08:21 -07:00
tdreyno
9e40e36b2c automatic image size calculations 2009-10-26 15:07:21 -07:00
tdreyno
cf39b2e2cb Revert "update docs" 
This reverts commit 43ac01af5c.
 2009-10-26 09:33:38 -07:00
tdreyno
58d6fc94ea Revert "update docs" 
This reverts commit 43ac01af5c.
 2009-10-22 17:25:15 -07:00
tdreyno
43ac01af5c update docs 2009-10-22 16:26:33 -07:00
tdreyno
65b4620f77 merge 2009-10-22 16:22:00 -07:00
tdreyno
7e5221f1fc new http_images_path variable 2009-10-22 16:20:41 -07:00
tdreyno
bed5705841 handful of fixes 2009-10-22 10:14:47 -07:00
tdreyno
ac11d6dbd2 try to fix deactivation 2009-10-21 22:34:44 -07:00
tdreyno
216ebed109 minor tweaks 2009-10-16 09:54:43 -07:00
tdreyno
16b8ba89a8 more tweaking, better rack 2009-10-15 16:31:05 -07:00
tdreyno
b1d300718f tests passing 2009-10-15 14:24:00 -07:00
tdreyno
2400c670b4 riding shotgun 2009-10-15 11:07:08 -07:00
tdreyno
cb7aed7b1a templates with includes 2009-10-14 14:16:15 -07:00
tdreyno
23864d43d7 always compile files which could include other files (css & js) 2009-10-12 14:13:28 -07:00
tdreyno
85f336f65d remove markaby, enable maruku 2009-10-08 11:53:37 -07:00
tdreyno
d979c56b69 init builder after features are enabled 2009-10-08 11:24:19 -07:00
tdreyno
1ed7414de3 slickmap include 2009-10-08 11:11:34 -07:00
tdreyno
6e0f12f3a5 split out monkey patching 2009-10-08 11:05:53 -07:00
tdreyno
abeb9095ae split out monkey patching 2009-10-08 11:04:41 -07:00
tdreyno
2b085b886c spec fixes, reorg builder 2009-10-08 10:49:23 -07:00
tdreyno
847377653e make mime method static 2009-10-07 11:20:22 -07:00
tdreyno
8874e97608 minor rdoc tweaks 2009-10-06 16:51:34 -07:00
tdreyno
332a0be737 enable slickmap 2009-10-06 16:29:51 -07:00
tdreyno
d40111d67e more tweaks, rdoc 2009-10-06 13:56:24 -07:00
tdreyno
fbd922a36d fix init template 2009-10-01 15:41:00 -07:00
tdreyno
628825183a fix init template 2009-10-01 15:36:16 -07:00
tdreyno
dbe067ee15 relative assets working better 2009-10-01 14:26:39 -07:00
tdreyno
087f48c98d better helper logic 2009-10-01 11:44:21 -07:00
tdreyno
b35f026aba a little testing 2009-10-01 11:26:46 -07:00
tdreyno
b91d13c0cd enable partials 2009-09-29 15:04:41 -07:00
tdreyno
a3f4e73f61 prepare pre-1.0 release 2009-09-29 14:30:01 -07:00
tdreyno
1a975efa61 test pass 2009-09-29 10:10:47 -07:00
tdreyno
4f11920bba rewrite and decouple 2009-09-28 19:43:08 -07:00