Thomas Reynolds
|
b3a61a299f
|
Merge branch 'master' of github.com:tdreyno/middleman
|
2011-11-03 10:50:41 -07:00 |
|
|
Thomas Reynolds
|
b7382d80f2
|
prep another pre
|
2011-11-03 10:50:36 -07:00 |
|
Thomas Reynolds
|
f3f770bbfa
|
Merge pull request #151 from dznz/tweak-init-usage-message
Minor tweak to make explicit order of arguments to middleman init
|
2011-10-30 21:49:03 -07:00 |
|
dznz
|
1174876c7a
|
Minor tweak to make explicit order of arguments to middleman init
|
2011-10-31 17:03:22 +13:00 |
|
|
Thomas Reynolds
|
08593fddff
|
watch app/assets as well
|
2011-10-27 23:36:19 -07:00 |
|
|
Thomas Reynolds
|
87035b2ae5
|
watch app/assets too
|
2011-10-27 23:32:45 -07:00 |
|
|
Thomas Reynolds
|
80546aea75
|
make erb engine configurable
|
2011-10-27 09:25:00 -07:00 |
|
|
Thomas Reynolds
|
190c563d3e
|
add rbx and jruby to travis
|
2011-10-26 17:02:50 -07:00 |
|
|
Thomas Reynolds
|
efd598d913
|
more sprockets tests
|
2011-10-26 09:38:47 -07:00 |
|
|
Thomas Reynolds
|
b927d7203f
|
Merge pull request #144 from mikemee/master
change comment to point to convore user gp instead of google
|
2011-10-25 09:43:32 -07:00 |
|
mikeag
|
528f895bf4
|
Trivial but useful: update comments to point to convore users group instead of google group
|
2011-10-24 21:59:24 -07:00 |
|
|
Thomas Reynolds
|
5685af3166
|
finally moving to the current guard version
|
2011-10-24 14:50:47 -07:00 |
|
|
Thomas Reynolds
|
01407102b3
|
up eventmachine dep
|
2011-10-24 11:36:33 -07:00 |
|
|
Thomas Reynolds
|
8aa4765524
|
try to test sprockets vendored css
|
2011-10-19 20:45:11 -07:00 |
|
|
Thomas Reynolds
|
61744661ff
|
system-wide css compression using Sprockets and CSSMin. fixes #102
|
2011-10-19 16:59:30 -07:00 |
|
|
Thomas Reynolds
|
6ae709fa83
|
changelog
|
2011-10-19 16:24:31 -07:00 |
|
|
Thomas Reynolds
|
e1fa93eb21
|
prep pre
|
2011-10-19 16:23:04 -07:00 |
|
|
Thomas Reynolds
|
42e834269e
|
Merge branch 'master' of github.com:tdreyno/middleman
|
2011-10-19 16:22:07 -07:00 |
|
|
Thomas Reynolds
|
5cc96210ce
|
Compass support in Sprockets
|
2011-10-19 16:21:46 -07:00 |
|
|
Thomas Reynolds
|
03f17ff551
|
build clean should ignore dotfiles
|
2011-10-18 22:03:13 -07:00 |
|
|
Thomas Reynolds
|
12ca8f0caf
|
prep release
|
2011-10-18 21:46:01 -07:00 |
|
|
Thomas Reynolds
|
7d6386fdc0
|
Merge pull request #138 from arronmabrey/fix/gem-scoping-issue
Fixing: a Gem scoping bug.
|
2011-10-18 15:40:53 -07:00 |
|
Arron Mabrey
|
e4cc5c1dde
|
Fixing: a Gem scoping bug.
|
2011-10-18 17:24:24 -04:00 |
|
|
Thomas Reynolds
|
a769ddec2f
|
update some deps
|
2011-10-18 12:10:41 -07:00 |
|
|
Thomas Reynolds
|
2bde2d199f
|
update some deps
|
2011-10-18 12:09:57 -07:00 |
|
|
Thomas Reynolds
|
5079064329
|
Merge pull request #134 from arronmabrey/feature/cli-clean-option
Fixing: cli-clean-option.
|
2011-10-16 11:20:56 -07:00 |
|
|
Arron Mabrey
|
6b47ca9ba8
|
Fixing: cli-clean-option.
|
2011-10-15 21:24:19 -04:00 |
|
|
Thomas Reynolds
|
11022cc175
|
moar padrino
|
2011-10-15 14:15:33 -07:00 |
|
|
Thomas Reynolds
|
e4bbed33c5
|
add some build cleaning tests
|
2011-10-15 11:21:56 -07:00 |
|
|
Thomas Reynolds
|
1d21cc4c5b
|
Merge pull request #133 from arronmabrey/feature/cli-clean-option
Adding: CLI -C --clean build option. closes #132
|
2011-10-15 10:59:37 -07:00 |
|
|
Thomas Reynolds
|
2b90e0f8b6
|
use new rake
|
2011-10-14 13:15:57 -07:00 |
|
|
Thomas Reynolds
|
18018bd248
|
add flag to disable guard
|
2011-10-14 13:13:21 -07:00 |
|
|
Thomas Reynolds
|
38c21cc82b
|
start testing 1.9.3
|
2011-10-14 13:03:23 -07:00 |
|
|
Arron Mabrey
|
2d41468ad4
|
Adding: CLI -C --clean build option.
|
2011-10-14 14:36:46 -04:00 |
|
|
Thomas Reynolds
|
62e27a7a08
|
Merge branch 'master' of github.com:tdreyno/middleman
|
2011-10-13 13:57:16 -07:00 |
|
|
Thomas Reynolds
|
df3f28b53a
|
prep release
|
2011-10-13 13:56:56 -07:00 |
|
|
Thomas Reynolds
|
2c85b8fbb6
|
Merge pull request #131 from arronmabrey/patch-1
Build handels files prefixed with 2 consecutive underscores
|
2011-10-13 09:25:33 -07:00 |
|
|
Arron Mabrey
|
81188aed7f
|
Skip partials prefixed with an underscore while still handling files prefixed with 2 consecutive underscores
|
2011-10-12 23:12:13 -03:00 |
|
|
Thomas Reynolds
|
eba7b0faa0
|
prep pre for new sinatra
|
2011-10-12 16:26:43 -07:00 |
|
|
Thomas Reynolds
|
27e1dfe7c0
|
require specific execjs to fix UTF8 issue in Sprockets
|
2011-10-11 15:10:38 -07:00 |
|
|
Thomas Reynolds
|
545d573c7b
|
test ignore and proxy
|
2011-10-07 12:40:59 -07:00 |
|
|
Thomas Reynolds
|
9bcf8f8ec6
|
bump sinatra supporting version
|
2011-10-05 08:30:45 -07:00 |
|
|
Thomas Reynolds
|
06d96d8497
|
prep pre
|
2011-10-04 11:24:43 -07:00 |
|
|
Thomas Reynolds
|
54953d14bf
|
sinatra 1.3.0
|
2011-10-03 17:09:27 -07:00 |
|
|
Thomas Reynolds
|
c814677f44
|
fix front_matter load order. fixes #122
|
2011-09-27 12:10:37 -07:00 |
|
|
Thomas Reynolds
|
3c0cddc936
|
html5boilerplate mobile 2
|
2011-09-23 13:06:44 -07:00 |
|
|
Thomas Reynolds
|
21cb23ff0c
|
prep release
|
2011-09-22 21:56:54 -07:00 |
|
|
Thomas Reynolds
|
553eb3a402
|
prep hopefully final pre
|
2011-09-20 18:29:18 -07:00 |
|
|
Thomas Reynolds
|
bfc32ee0ef
|
fix relative assets test
|
2011-09-20 10:21:38 -07:00 |
|
|
Thomas Reynolds
|
91e00e5289
|
return octet stream for unmatched extensions, instead of nil
|
2011-09-20 09:58:53 -07:00 |
|