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

2218 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds b912fa9cac Merge pull request #435 from bhollis/frontmatter 
Frontmatter fixes
 2012-05-19 18:52:29 -07:00
Ben Hollis fc9c5e5fa2 Properly clear frontmatter cache when files change, and calculate frontmatter in the right order so resource_list_manipulators can see it. 2012-05-19 18:47:43 -07:00
Ben Hollis 7ad0f51d1a Always return HashWithIndifferentAccess from frontmatter data 2012-05-19 18:46:58 -07:00
Thomas Reynolds 3356153d55 Merge pull request #434 from bhollis/asset_hash 
Add an option to asset_hash to allow excluding files
 2012-05-19 16:59:09 -07:00
Ben Hollis 9b93bf2498 Add an option to asset_hash to allow excluding files that would otherwise get hashes appended to their filenames. 2012-05-19 15:35:27 -07:00
Thomas Reynolds 8fb4888f8c Merge pull request #433 from bhollis/server 
Remove duplicate server methods and solve webrick logging in a platform-independent way
 2012-05-17 11:36:09 -07:00
Ben Hollis 64a2933161 Remove duplicate server methods and solve webrick logging in a platform-independent way 2012-05-16 21:19:03 -07:00
Thomas Reynolds 8c87bbc757 Handle .htc files [no-ci] 2012-05-12 08:48:03 -07:00
Thomas Reynolds 72cb264e39 Merge pull request #427 from bhollis/windows 
Log to NUL: in Windows
 2012-05-11 07:59:43 -07:00
Ben Hollis 8d101552f3 Log to NUL: in Windows because apparently that's their name for /dev/null. Fixes #421 2012-05-10 22:12:55 -07:00
Thomas Reynolds 024d33c16e Bump cucumber dep [no-ci] 2012-05-10 20:18:18 -07:00
Thomas Reynolds 1022e63cee Avoid bundler on travis 2012-05-10 16:32:43 -07:00
Thomas Reynolds ed50d4326a Try to avoid running bundler in tests on Travis 2012-05-10 16:07:11 -07:00
Thomas Reynolds d4bccd76ab Don't hide bundler output [no-ci] 2012-05-10 15:07:19 -07:00
Thomas Reynolds 190be5f515 Bundler CLI commands 2012-05-10 15:06:06 -07:00
Thomas Reynolds 7c8baee246 Ignore ~ temp files [no-ci] 2012-05-10 14:05:28 -07:00
Thomas Reynolds f0b4e56b80 Require latest execjs to avoid MultiJson warnings 2012-05-10 11:31:35 -07:00
Thomas Reynolds 3f048011ab Stop testing on Rubinius 2012-05-10 11:25:21 -07:00
Thomas Reynolds 162622c453 JSON frontmatter and allowing frontmatter to be located after a encoding value 2012-05-09 13:33:14 -07:00
Thomas Reynolds f17b19d9de Merge pull request #416 from middleman/frontmatter_refactor 
Refactor Sitemap to run on any template file, be more error tolerant and use less code/memory
 2012-05-08 21:11:03 -07:00
Thomas Reynolds 7929ed6c75 Refactor Frontmatter to use sitemap manipulators. Also fixes #422 2012-05-08 21:10:41 -07:00
Thomas Reynolds b486b5a31d Merge pull request #424 from middleman/remove_ruby_autoload 
Remove usage of autoload statement in favor of require
 2012-05-08 16:56:53 -07:00
Thomas Reynolds d55fef62b4 Remove usage of autoload statement in favor of require 2012-05-07 14:41:39 -07:00
Thomas Reynolds 5d8fd93981 loosen compass deps 2012-05-07 13:32:40 -07:00
Thomas Reynolds 557239e0d6 include inflections. closes #418 2012-05-05 19:59:02 -07:00
Thomas Reynolds c01a57db33 Merge pull request #419 from bhollis/gitignore 
Generate a .gitgnore file by default
 2012-05-05 19:53:42 -07:00
Ben Hollis 35d1a67dd1 Generate a .gitgnore file by default. Fixes #375. 2012-05-04 21:11:11 -07:00
Thomas Reynolds cb65916e6d newer listen gem 2012-05-03 19:31:25 -07:00
Thomas Reynolds d1d59ca5ca always test jruby now 2012-05-03 15:41:07 -07:00
Thomas Reynolds 18d5c99f1f Redcarpet is C ruby only 2012-05-02 16:39:56 -07:00
Thomas Reynolds 527c987281 Attempt to avoid redcarpet tests on jruby 2012-05-02 16:28:04 -07:00
Thomas Reynolds 0be82d371e new extension cli 2012-05-02 15:59:36 -07:00
Thomas Reynolds a7adc20b47 still support and test redcarpet 2012-05-02 15:27:47 -07:00
Thomas Reynolds 7fb16a4b1b Merge pull request #413 from bhollis/maruku 
Switch back to maruku
 2012-05-02 15:10:00 -07:00
Thomas Reynolds 7b8457d963 Yard doc cleanup 2 2012-05-02 11:18:16 -07:00
Thomas Reynolds 2965e3709d Yard doc cleanup 2012-05-02 11:13:48 -07:00
Thomas Reynolds 1855745d8e Merge pull request #411 from middleman/request_module 
Split out Request handling into an Extension. Dup the Application when responding
 2012-05-02 11:13:37 -07:00
Thomas Reynolds e7cd4d505b Merge pull request #414 from bhollis/master 
Fix gemspecs for filenames with unicode paths
 2012-05-02 09:14:13 -07:00
Ben Hollis 1c67871d44 Fix gemspecs for filenames with unicode paths 2012-05-01 22:57:56 -07:00
Ben Hollis 49bbc9feaa Switch back to maruku 2012-05-01 22:46:38 -07:00
Thomas Reynolds 342044a01d Split out Request handling into an Extension. Dup the Application (like Sinatra) when responding 2012-05-01 13:11:42 -07:00
Ben Hollis 8d6739b15b I shouldn't code late at night 2012-05-01 00:47:36 -07:00
Ben Hollis 8f861fef06 Un-optional a parameter in hopes of fixing rbx build 2012-05-01 00:37:00 -07:00
Ben Hollis 380dac270d Switch content_type param order for 1.8 2012-05-01 00:22:16 -07:00
Thomas Reynolds 7bd5ed1344 Merge pull request #410 from bhollis/webrick 
Make Middleman somewhat more threadsafe and switch back to webrick
 2012-04-30 22:44:18 -07:00
Ben Hollis 778626c6ec Make Middleman somewhat more threadsafe and switch back to webrick. 2012-04-30 22:38:57 -07:00
Ben Hollis 713350e294 Disable unicode build test for now 2012-04-30 21:29:33 -07:00
Thomas Reynolds 00a7a1969e Merge pull request #408 from bhollis/unicode 
Support Unicode characters in filenames
 2012-04-30 08:31:06 -07:00
Thomas Reynolds 3d129b8523 Merge pull request #409 from bhollis/metadata 
Add Resource#add_metadata for attaching metadata directly to a resource
 2012-04-29 23:08:28 -07:00
Ben Hollis bc435cc2e2 Add Resource#add_metadata for attaching metadata directly to a resource 2012-04-29 22:32:52 -07:00