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

1048 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds baaa3fd148 change little piece of frontmatter logic 2012-02-12 10:10:59 -08:00
Thomas Reynolds 8094af43d4 Merge pull request #268 from pusewicz/fix-cli-bundler 
Fix middleman init MY_PROJECT --bundler
 2012-02-11 09:42:09 -08:00
Piotr Usewicz cf991bfb89 Fix middleman init --bundler 
Closes #265.
 2012-02-11 09:39:45 +00:00
Piotr Usewicz f5edfa75df Fix whitespace 2012-02-11 09:35:49 +00:00
Thomas Reynolds a20570bd28 Merge pull request #267 from bhollis/sitemap 
Remove unused methods from Sitemap::Store
 2012-02-11 00:05:06 -08:00
Ben Hollis 39046ce029 Remove unused methods from Sitemap::Store. If these end up being needed again it'd be better to just filter the #pages list. 2012-02-10 23:36:06 -08:00
Thomas Reynolds 6799606324 Merge pull request #263 from bhollis/master 
Get rid of build_reroute
 2012-02-10 14:37:37 -08:00
Ben Hollis d483d8bc54 Memoize Sitemap::Page#destination_path 2012-02-09 09:39:24 -08:00
Ben Hollis fdbd301a32 Get rid of Middleman::Sitemap::Store#all_paths and #each in favor of #pages. Dealing with page objects all over the place instead of paths provides a lot of opportunities for cleaner code. 2012-02-08 23:00:29 -08:00
Ben Hollis 382107d403 Get rid of build_reroute. The last thing using it was the sprockets extension, though it didn't appear to need it since removing the build_reroute call leaves tests passing, and the test site I tried still generated JS from CoffeeScript just fine. 2012-02-08 22:13:49 -08:00
Ben Hollis 57061a17c0 Update version so path-based Gemfile dependencies work 2012-02-08 22:11:20 -08:00
Thomas Reynolds b82ad07b51 adding json to layoutless list 2012-02-08 08:52:41 -08:00
Thomas Reynolds cdff84b84a continue trying to fix compass issue 2012-02-08 08:49:40 -08:00
Thomas Reynolds 79eeba9d1a switch built-in css compressor 2012-02-08 08:47:34 -08:00
Thomas Reynolds 8286879f36 sprockets-sass was overwriting image-url and breaking relative assets. Fixes #256 2012-02-05 11:43:19 -08:00
Thomas Reynolds c8c6a1938e Merge pull request #261 from bhollis/page 
Callback-based rerouting
 2012-02-05 10:33:25 -08:00
Ben Hollis e136fab77c Use a page_by_destination lookup to make rerouting work both ways, in build and during preview server. 2012-02-04 23:07:02 -08:00
Ben Hollis e27e0cdd44 Directory indexes work completely now, in preview and with dotfiles. 2012-02-03 00:29:07 -08:00
Ben Hollis ca1f3ddf83 Directory indexes now work during build, with the exception of .htaccess files. 2012-02-02 21:47:54 -08:00
Ben Hollis 4ce6913baf The beginnings of refactoring page rerouting. Added methods to Sitemap::Store and Sitemap::Page to collect and execute reroute callbacks, and rework builder to use page methods (simplifying it greatly in the process). All tests that don't involve directory indexes pass - next step is to make the directory index extension register its callbacks with Sitemap::Store#reroute. 2012-01-31 23:43:05 -08:00
Ben Hollis a41bf57f2d Clarify in the documentation what "path" means for Sitemap::Store and Sitemap::Page 2012-01-31 22:57:55 -08:00
Ben Hollis 2eec7e11ba Refactor protected method normalize_path out of Sitemap::Store 2012-01-31 22:38:39 -08:00
Ben Hollis 1fc97d9d7b A minor simplification of Sitemap::Store#path - it can no longer take a block 2012-01-31 22:15:45 -08:00
Thomas Reynolds b72fb23435 Merge branch 'master' of github.com:middleman/middleman 2012-01-31 21:30:58 -08:00
Thomas Reynolds 251a2e0eb3 add failing tests for compass relative assets 2012-01-31 21:30:45 -08:00
Thomas Reynolds 2dd8531eb5 Merge pull request #249 from roryokane/patch-1 
grammar fix; changed erroneous “it's” to “its”
 2012-01-24 11:42:26 -08:00
Rory O’Kane fad23a7024 grammar fix; changed erroneous “it's” to “its” 
“its own collection” is the collection belonging to it (the community). The old “it's” meant “it is own collection”.
 2012-01-24 13:48:54 -05:00
Thomas Reynolds 599ea94f5e Merge branch 'master' of github.com:middleman/middleman 2012-01-16 20:36:10 -08:00
Thomas Reynolds 73bcd4c12f rearrange some watcher stuff 2012-01-16 20:35:28 -08:00
Thomas Reynolds 5a5ebdc37f Merge pull request #241 from audionerd/master 
Clarify the documentation of a page's "eponymous" directory
 2012-01-16 18:08:50 -08:00
Thomas Reynolds 2c42cb4930 make sure logging works, more file watcher ignores 2012-01-16 15:02:38 -08:00
Thomas Reynolds d1f0e6f616 fix errant MM bootup during CLI. Make an autodiscoverable tasks/ directory 2012-01-16 14:55:08 -08:00
Eric Skogen 071acadb93 clarify the documentation regarding a page's "eponymous" directory 2012-01-16 16:29:02 -06:00
Thomas Reynolds aeb9d10b25 automatically load helper modules from helpers/. closes #238 2012-01-15 13:44:00 -08:00
Thomas Reynolds 3e0ed70c69 rename event watch binary 2012-01-15 09:15:22 -08:00
Thomas Reynolds ad0164ac76 include fsevent binary 2012-01-15 09:11:22 -08:00
Thomas Reynolds e3b15366cb ignore globs, mostly working, except with directory indexes 2012-01-14 14:09:20 -08:00
Thomas Reynolds be6f6944ca docs complete. closes #187 on a mother fucking cop. 2012-01-14 12:52:19 -08:00
Thomas Reynolds 5cc204e848 more docs 2012-01-14 12:46:22 -08:00
Thomas Reynolds 3ef11f3add more ignore variation tests 2012-01-14 12:21:35 -08:00
Thomas Reynolds 309f8dd966 Merge pull request #231 from bhollis/ignore 
Scenarios to test proposed "ignore" behavior
 2012-01-14 12:19:07 -08:00
Thomas Reynolds 06cfb2b24c Merge branch 'master' of github.com:middleman/middleman 2012-01-14 12:19:00 -08:00
Thomas Reynolds 1aa1eedc10 docs 2012-01-14 12:18:39 -08:00
Ben Hollis a70a6d5507 Fix a bad variable reference when logging is turned on 2012-01-08 20:47:05 -08:00
Thomas Reynolds d0dd60fb4b left some debug messages in 2012-01-07 23:48:22 -08:00
Thomas Reynolds 34e40cbe01 Also test frontmatter options in preview mode (exposed proxy bug, which was fixed 2012-01-07 18:11:56 -08:00
Thomas Reynolds 7282475350 Builder and DirectoryIndexes now check frontmatter options. 2012-01-07 17:59:23 -08:00
Thomas Reynolds c473181167 frontmatter can control whether a page is ignored 2012-01-07 17:21:26 -08:00
Thomas Reynolds 0ac9c0b662 document sitemap, make ignore accept paths, regexps and blocks 2012-01-07 16:57:50 -08:00
Thomas Reynolds 56e0c1755c Merge pull request #232 from bhollis/frontmatter_page 
Feature test for setting page setting through frontmatter
 2012-01-07 15:38:03 -08:00