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

1039 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ben Hollis
b01f0f96e8 New (failing) feature describing what it would look like to set some page features through frontmatter. 
This tests the ability to set layout, ignore, and diable directory_index. Pertains to issue #194.
 2012-01-06 23:08:38 -08:00
Ben Hollis
cebb15c9ca Add a new (failing) feature test to show the behavior I think would be good for the "ignore" helper. 
These scenarios show ignoring files by their source paths rather than their output paths,
ignoring globbed paths (including into subdirectories), and ignoring paths that will be transformed
by directory_indexes. These scenarios pertain to issues #229 and #225.
 2012-01-06 22:43:32 -08:00
Thomas Reynolds
8de087ec65 fix manual sitemap updates on ruby 1.9 2012-01-06 00:11:38 -08:00
Thomas Reynolds
3e1814e046 make sure compass sprites get built and copied. closes #228 2012-01-06 00:01:24 -08:00
Thomas Reynolds
92319ebffc support glob page instance vars. fixes #230 2012-01-05 21:18:55 -08:00
Thomas Reynolds
22adf3b516 setup rakefile for windows build 2012-01-05 20:34:24 -08:00
Thomas Reynolds
80a5a25457 prep 3.0 beta windows gem 2012-01-05 20:28:34 -08:00
Thomas Reynolds
96924ad5a1 Merge branch 'master' of github.com:middleman/middleman 2012-01-05 20:22:44 -08:00
Thomas Reynolds
28a9ad50b3 new fssm without 1.9.3 warning. closes #223 2012-01-05 20:22:24 -08:00