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

2553 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds 80256ec3c5 revert back to sass 3.2 and stable compass 2014-04-04 10:38:50 -07:00
Thomas Reynolds bf62454dc2 bump uglifier dep 2014-04-04 10:31:11 -07:00
Thomas Reynolds 638e2e64b7 Unvendor padrino 2014-04-04 10:22:34 -07:00
Thomas Reynolds 28e39933e8 Notify slack 2014-04-03 14:48:30 -07:00
Thomas Reynolds fac4928d50 Update haml and sass deps 
Conflicts:
	Gemfile
	middleman/middleman.gemspec
 2014-04-03 10:01:18 -07:00
Thomas Reynolds f800a51fb2 Update haml and sass deps 2014-04-03 09:53:33 -07:00
Thomas Reynolds 6d2f8cd50c Add options hash to asset methods to allow special options to be passed through from extensions 2014-03-31 14:15:46 -07:00
Thomas Reynolds 1c37cc6a34 Merge pull request #1238 from bhollis/asciidoc 
Remove Asciidoc support in favor of a middleman-asciidoc extension
 2014-03-30 10:52:40 -07:00
Thomas Reynolds f99e333f30 Merge pull request #1237 from bhollis/ext 
Clean up extensions a bit
 2014-03-30 10:52:30 -07:00
Ben Hollis 5ce8549f03 Remove Asciidoc support in favor of a middleman-asciidoc extension. 2014-03-29 19:24:51 -07:00
Ben Hollis c1f7299cfd Fix some references to extensions[:frontmatter] 2014-03-29 17:21:49 -07:00
Ben Hollis abeee38126 Remove yet another way to register extensions and register/activate FrontMatter like a normal extension. 2014-03-29 17:17:00 -07:00
Ben Hollis a6c37f3dd3 Clean up extensions a bit. Removes newest form of registering extensions, more consistently sets and uses an extension's ext_name, and makes a lot of things errors instead of just log messages in hopes that people can't get too far with a messed-up config. 2014-03-29 14:29:42 -07:00
Thomas Reynolds 142d1b1871 Merge pull request #1234 from kaleworsley/more_details_in_the_instrumentation_payload 
Include the destination_path in the instrumentation payload.
 2014-03-28 10:33:50 -07:00
Kale Worsley 6f38416c15 Include the destination_path in the instrumentation payload. 2014-03-28 09:10:33 -07:00
Ben Hollis 299263c7e5 Merge pull request #1232 from lolmaus/patch-1 
Webrick should not do reverse DNS lookups
 2014-03-27 09:18:04 -07:00
Andrey 'lolmaus' Mikhaylov db59447e82 Webrick should not do reverse DNS lookups 
This prevents Middleman server from being terribly slow over network. Closes #1118.
 2014-03-27 11:58:31 +03:00
Thomas Reynolds dd9c05f433 Merge pull request #1229 from bhollis/metadata 
Improvements to the /__middleman/ metadata pages
 2014-03-26 09:05:23 -07:00
Ben Hollis 4605ffc398 Improvements to the /__middleman/ metadata pages. 
Includes formatting/styling changes to clarify the data being presented as well as align styling with middlemanapp.com. Also adds features and fixes to the sitemap view to show ignored files differently, hide redundant information, print data/options as a hash instead of as array pairs, and to list out available locals defined on a page.
 2014-03-26 00:12:10 -07:00
Ben Hollis 10eca91311 Fix docs for HashWithIndifferentAccess 2014-03-25 22:43:43 -07:00
Ben Hollis 97e7427641 Ignore .cache by default in .gitignore 2014-03-25 22:39:52 -07:00
Ben Hollis 60f712e6ba Merge branch 'v3-stable' 
Conflicts:
	.travis.yml
	Gemfile
	middleman-cli/lib/middleman-cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
	middleman-core/lib/middleman-core/templates.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core.gemspec
 2014-03-25 22:35:19 -07:00
Thomas Reynolds 91675c4588 move sprockets init 2014-03-25 17:00:17 -07:00
Thomas Reynolds 8bc2fddb9d Remove static serving of non-Middleman folders 2014-03-25 16:57:57 -07:00
Thomas Reynolds 1b6af9a4c1 Expose asset_path on the main Application object (Sprockets needed it) 2014-03-25 11:01:35 -07:00
Thomas Reynolds 37a8caf3fa Bring back extension block register syntax. Closes #1192 2014-03-25 11:00:43 -07:00
Karl Freeman d3e9108f12 already ignored [ci skip] 2014-03-25 13:19:31 +00:00
Karl Freeman 6c84ed4674 whitespace [ci skip] 2014-03-25 13:13:36 +00:00
Karl Freeman 04d9ecbb5a ignore tempts from Rubocop 2014-03-25 13:09:54 +00:00
Karl Freeman f4bcfc885a lose the empty files, keep the directory 2014-03-25 13:09:38 +00:00
Karl Freeman 5a38827b01 middleman-templates has no executable [ci skip] 2014-03-25 12:06:31 +00:00
Karl Freeman 174c04d5c8 consistency with other gems [ci skip] 2014-03-25 10:09:51 +00:00
Karl Freeman 57534b6e7c rubocop'd Gemfile 
- add rubocop as a development dependency
 2014-03-25 10:08:59 +00:00
Karl Freeman 283583629e svg badges [ci skip] 2014-03-25 09:53:21 +00:00
Karl Freeman 1de871a57b not needed 2014-03-25 09:07:27 +00:00
Karl Freeman ce83e502f6 more consistency across all gems 
- rubocop'd for cosmetics
 2014-03-25 08:50:28 +00:00
Karl Freeman c5609dc889 up to date 2014-03-25 08:46:03 +00:00
Karl Freeman c1ef5fc2bf refresh travis 
- indicate that we're keen on caching
- test against a larger variety of ruby interpreters however, lets allow some failures
- not allow 2.1 to fail?
 2014-03-25 08:35:33 +00:00
Karl Freeman 845d529a50 don't load local templates if no HOME is set 2014-03-25 08:21:53 +00:00
Karl Freeman ad14766278 Although equivalent, clearer for non-*nix based systems 2014-03-24 10:39:25 +00:00
Ben Hollis bb5b4054ff Don't bother processing asset hash on ignored resources. On a large project with a lot of Sprockets dependencies that were mostly ignored, this brought the build down from 30 minutes to 1 minute 2014-03-23 23:35:12 -07:00
Ben Hollis 0a6c80d223 Don't attempt to load local templates if HOME is not set 2014-03-23 16:49:22 -07:00
Thomas Reynolds ce7636ad18 remove Implied Extensions feature. Closes #1211 2014-03-20 17:12:41 -07:00
Thomas Reynolds 1721dff4c7 add node_modules to filewatcher ignore 2014-03-20 10:03:44 -07:00
Thomas Reynolds fde93ffed4 add node_modules to filewatcher ignore 2014-03-20 10:02:18 -07:00
Thomas Reynolds ae1edd482f upgrade to newest activesupport 2014-03-20 09:53:01 -07:00
Thomas Reynolds 515c91e826 Merge pull request #1219 from bhollis/windows 
Add tzinfo-data for Windows users
 2014-03-19 15:40:33 -07:00
Thomas Reynolds 4efefedb6f Merge pull request #1218 from bhollis/ignore 
Prevent the file watcher from recursively enumerating into paths that it should ignore
 2014-03-19 15:40:27 -07:00
Ben Hollis f71a0951ef Add tzinfo-data for Windows users 2014-03-18 22:42:31 -07:00
Ben Hollis 67689e60d2 Prevent the file watcher from recursively enumerating into paths that it should ignore. This should fix the issue in #1197 as well as provide a performance boost when starting 'middleman server'. 2014-03-18 21:17:50 -07:00