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

3022 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds 07aa2113b9 merge activesupport update 2014-04-09 16:14:10 -07:00
Thomas Reynolds dc3d4f9fd5 bump activesupport 2014-04-09 16:12:57 -07:00
Thomas Reynolds 4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds a5c2386853 match masters new logger ref 2014-04-07 16:47:06 -07:00
Thomas Reynolds 6a34bf544a Merge pull request #1253 from adamesque/patch-1 
Don't hang on to the first Logger instance you see
 2014-04-07 16:44:12 -07:00
Adam Luikart d4d1391bbb Don't hang on to the first Logger instance you see 
If the main app instance hangs on to the logger that ::Middleman::Logger.singleton returns, then subsequent calls to re-init the logger won't have any effect (for instance, when setting up the preview server's logger based on CLI params).

Redefining logger to be a pass-through to ::Middleman::Logger.singleton instead of an ivar seems more in keeping with the sprit of a singleton, anyways.

This fixes an issue where running `middleman server --verbose` doesn't output any debug info.
 2014-04-07 17:34:26 -05:00
Thomas Reynolds bbd9913372 Update changelog [ci skip] 2014-04-07 11:03:13 -07:00
Thomas Reynolds 69c6e87b31 bump 2014-04-07 09:56:15 -07:00
Thomas Reynolds 1b3b785c2b Merge pull request #1248 from Arcovion/patch-1 
Mobile friendly host & windows fix
 2014-04-07 09:49:36 -07:00
Thomas Reynolds 4c9af0e07d Merge pull request #1251 from railsbros-dirk/fix-middleman-init-command 
CLI: Always require 'middleman-core/version'
 2014-04-07 09:48:48 -07:00
Thomas Reynolds fcbf9f1568 avoid running Sass compilation twice 2014-04-07 09:38:00 -07:00
Dirk Breuer ae451608b3 CLI: Always require 'middleman-core/version' 
The `init` command will fail if the `VERSION` was not required because
it is needed for the Gemfile generation. Unfortunately this was not
catched by the specs because the specs require the version and the child
process is not correctly reset.

I was not able to change this easily :-(
 2014-04-07 16:15:50 +02:00
Eliott Appleford e3946a06d9 Print correct IP and mobile testing support 
Address `0.0.0.0` wasn't valid on windows, use localhost instead
Finds a local IP that will also allow the development server to run on mobiles
 2014-04-05 21:55:01 +01:00
Thomas Reynolds a40ef1a734 bump to include sass fix 2014-04-05 13:38:45 -07:00
Thomas Reynolds 7ae4c4d14e use compass-import-once 2014-04-04 17:02:22 -07:00
Thomas Reynolds f95da2a1da arbua jruby support 2014-04-04 10:56:47 -07:00
Thomas Reynolds 3cb320abdf Add Karl to authors list 2014-04-04 10:50:35 -07:00
Thomas Reynolds f3edabfb7e bump execjs dep 2014-04-04 10:48:08 -07:00
Thomas Reynolds dae133949d bump copyright 2014-04-04 10:42:11 -07:00
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