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

1704 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Hollis
bb2f40cc72 Merge branch '3.0-stable' 
Conflicts:
	README.md
 2013-02-05 22:07:05 -08:00
Thomas Reynolds
8996e65fd1 Merge pull request #761 from LeonB/3.0-stable 
Added before_render & after_render hook
 2013-02-02 14:08:10 -08:00
Thomas Reynolds
81acdca5f9 Update README.md 2013-02-01 10:02:43 -08:00
Leon Bogaert
cc988ee302 Added before_render & after_render hook 
Can be used for pre-processing content
 2013-01-31 23:04:49 +01:00
Thomas Reynolds
ec94b3710b Merge pull request #760 from k33l0r/patch-1 
Fixes the Travis CI status image
 2013-01-31 10:50:01 -08:00
Matias Korhonen
80c464a96f Fixes the Travis CI status image 2013-01-31 15:57:19 +02:00
Ben Hollis
aa6564f038 Don't catch Exception when parsing YAML frontmatter 2013-01-27 17:11:54 -08:00
Ben Hollis
5cedd4c37c Merge remote-tracking branch 'origin/3.0-stable' 
Conflicts:
	middleman-core/middleman-core-x86-mingw32.gemspec
 2013-01-26 01:01:01 -08:00
Thomas Reynolds
5f84833fc5 loosening our thor dependency in advance of padrino updating to 0.16. Closes #751 2013-01-25 23:04:52 -08:00
Thomas Reynolds
49cf6c53c6 Merge pull request #752 from bhollis/gemfile 
Update Gemfile to allow bundler to ever complete.
 2013-01-25 22:58:09 -08:00
Ben Hollis
6dbe7f7a5a Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs. 2013-01-25 22:31:40 -08:00
Ben Hollis
c0c14f4eab Merge remote-tracking branch 'origin/3.0-stable' 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/preview_server.rb
	middleman-core/lib/middleman-core/renderers/sass.rb
	middleman-core/lib/middleman-core/sitemap/store.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-more/lib/middleman-more/core_extensions/compass.rb
	middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-more/lib/middleman-more/extensions/asset_hash.rb
 2013-01-25 21:43:30 -08:00
Ben Hollis
7c9c4d03db Make build error message code a bit more compact 2013-01-25 20:22:45 -08:00
Ben Hollis
8f0cc92f1b Merge pull request #750 from sethvargo/better_error_message 
Add quotes and bundle exec to error message
 2013-01-25 20:13:35 -08:00
Seth Vargo
95fa217cec Say middleman build instead of just middleman 2013-01-25 21:23:24 -05:00
Seth Vargo
12753c5759 add quotes and bundle exec to error message 2013-01-24 12:40:24 -05:00
Thomas Reynolds
1af216240a prep 2013-01-22 23:14:35 -08:00
Thomas Reynolds
2d28272396 Merge pull request #736 from bhollis/master 
Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type.
 2013-01-22 23:14:15 -08:00
Ben Hollis
da39484767 Mitigate major perf regression caused by the Middleman::Util#binary? method 2013-01-22 23:13:31 -08:00
Thomas Reynolds
c34b425f45 prep 2013-01-21 11:42:34 -08:00
Steven Sloan
17ad2caf11 also "build" .htpasswd files 2013-01-21 11:21:48 -08:00
Ben Hollis
00581876b5 Merge pull request #740 from stevenosloan/add_htpasswd 
also "build" .htpasswd files
 2013-01-18 19:56:27 -08:00
Steven Sloan
c121c407df also "build" .htpasswd files 2013-01-18 20:13:49 -05:00
Ben Hollis
16b3a729cd Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type. 2013-01-17 19:40:39 -08:00
Thomas Reynolds
cad7f8a0a4 disable cane 2013-01-14 23:33:33 -08:00
Thomas Reynolds
af132f6207 disable cane 2013-01-14 23:33:16 -08:00
Thomas Reynolds
ae9e6e722e bye bye pry 2013-01-14 22:41:11 -08:00
Thomas Reynolds
4e9ec930c4 bye bye pry 2013-01-14 22:40:37 -08:00
Thomas Reynolds
80fb3ff06f merge 2013-01-13 15:25:35 -08:00
Thomas Reynolds
c7e35b95ba use .sass-cache everywhere 2013-01-13 15:22:36 -08:00
Thomas Reynolds
7c1d55cb38 merge 2013-01-13 12:00:25 -08:00
Daniel Bayerlein
e3bb956649 Update installation command for susy-gem. 2013-01-13 11:59:41 -08:00
Thomas Reynolds
1b1a5c086e Add --force-polling flag to server. Closes #730. Closes #644 2013-01-13 11:57:18 -08:00
Thomas Reynolds
d4f5e4db29 Add --force-polling flag to server. Closes #730. Closes #644 2013-01-13 11:56:53 -08:00
Thomas Reynolds
428912850f Merge pull request #729 from danielbayerlein/update-susy-command 
Update installation command for susy-gem.
 2013-01-12 17:38:24 -08:00
Daniel Bayerlein
2dca9e5787 Update installation command for susy-gem. 2013-01-12 16:40:00 +01:00
Thomas Reynolds
277f1b5bb4 merge frontmatter fix 2013-01-11 17:27:24 -08:00
Thomas Reynolds
a76b02a55b Don't look for frontmatter on binary files. Fixes #728 2013-01-11 17:25:45 -08:00
Thomas Reynolds
18da6362ba Allow multi-level i18n files. Fixes #725 2013-01-11 17:23:24 -08:00
Thomas Reynolds
2e2516b95a Don't look for frontmatter on binary files. Fixes #728 2013-01-11 16:58:02 -08:00
Nico Hagenburger
0bedb36f3f added font file types to asset_hash extension 
added svg files to asset_hash extension
 2013-01-09 13:25:04 -08:00
Thomas Reynolds
7231f9dfe2 Merge branch 'master' of github.com:middleman/middleman 2013-01-09 13:24:41 -08:00
Nico Hagenburger
fbb7820ecd added font file types to asset_hash extension 
added svg files to asset_hash extension
 2013-01-09 13:23:56 -08:00
Ben Hollis
df539e2743 Fix error with link_to when options are nil 2013-01-09 13:23:55 -08:00
Thomas Reynolds
aa633a1cd3 make windows rack generic again 2013-01-09 10:28:47 -08:00
Thomas Reynolds
e82aa6cc61 make blksize work on windows. 2013-01-09 09:49:23 -08:00
Ben Hollis
1019c7803c Fix error with link_to when options are nil 2013-01-08 22:53:30 -08:00
Thomas Reynolds
8e7a87e167 Merge pull request #714 from bhollis/link_to 
3.0.8/3.0.9 breaks middleman-blog's `tag_path` method
 2013-01-08 22:53:09 -08:00
Ben Hollis
3d00e91605 Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3) 2013-01-08 22:52:40 -08:00
Thomas Reynolds
3521b7527b Merge pull request #717 from bhollis/rack 
Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3)
 2013-01-08 22:51:31 -08:00