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

2252 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Ben Hollis 04d94d9b60 Merge pull request #1201 from middleman/templates-rejig 
Templates rejig
 2014-03-15 19:59:46 -07:00
Karl Freeman 8e8ddbc301 rejig templates, deprecate 'empty' template and rubocop them 2014-03-15 13:32:11 +00:00
Ben Hollis fc3658bc9d Merge pull request #1199 from middleman/cross-platform-localhost 
Friendlier localhost print
 2014-03-14 15:25:32 -07:00
Thomas Reynolds 5616838007 Merge pull request #1204 from bhollis/lazy 
Avoid loading middleman-core unless needed.
 2014-03-14 09:30:13 -07:00
Karl Freeman 87acf687d5 friendlier localhost print 2014-03-14 06:46:10 +00:00
Ben Hollis 32716f3729 Avoid loading middleman-core unless needed. Fixes #1203. 2014-03-13 20:27:41 -07:00
Karl Freeman 24f7143973 shouldn't be here 2014-03-13 11:18:20 +00:00
Karl Freeman 554577b139 too aggressive with the deletes... 2014-03-13 10:05:30 +00:00
Karl Freeman 9de092ba5f gemfiles are required but lets still keep the convenience of bundling 2014-03-13 09:46:49 +00:00
Thomas Reynolds 323d8d769c Merge pull request #1198 from middleman/move-templates 
middleman-templates
 2014-03-11 08:51:42 -07:00
Karl Freeman 9fb4470248 tidy up logic 
- the extension template already had a gitignore
 2014-03-11 11:08:41 +00:00
Karl Freeman 772de85ce3 move to middleman-templates 2014-03-11 11:07:55 +00:00
Thomas Reynolds 23b1b8464d move livereload init into dev block 2014-03-09 17:51:02 -07:00
Thomas Reynolds 8b20b39b31 Merge pull request #1194 from bhollis/gemfile 
Require Bundler (a Gemfile) for all set up Middleman projects
 2014-03-08 16:05:34 -08:00
Ben Hollis 10f8715bde Whoops, properly implement findup 2014-03-04 22:43:10 -08:00
Thomas Reynolds f2b7e224ee Merge pull request #1193 from bhollis/middleman-more 
Merge middleman-more back into middleman-core
 2014-03-04 13:08:26 -08:00
Ben Hollis 220d1e8948 Require Bundler (a Gemfile) for all set up Middleman projects. We still do extension auto-discovery for "init". Gemfile may now be in any parent directory of 'config.rb', in case the Middleman project is in a subdirectory of a larger project. 2014-03-03 23:47:24 -08:00
Ben Hollis 9e9bed0043 pry-debugger is not available on Ruby 2.1 2014-03-03 23:07:32 -08:00
Ben Hollis 5de4e337c1 Merge middleman-more back into middleman-core 2014-03-03 22:32:12 -08:00
Ben Hollis c9a640a3e2 Merge remote-tracking branch 'origin/v3-stable' 
Conflicts:
	middleman-core/lib/middleman-core/extension.rb
 2014-03-03 22:10:50 -08:00
Thomas Reynolds f5b3720ef8 Merge pull request #1190 from bhollis/middleman-core 
Be quiet about missing extras when middleman-core is used alone
 2014-03-03 10:50:10 -10:00
Thomas Reynolds ca45440ffe Merge pull request #1191 from barraponto/default_no_layout 
Use no layouts for xml, json and txt by default
 2014-03-03 10:42:33 -10:00
Capi Etheriel 81baf8c47c Use no layouts for xml, json and txt by default 2014-03-01 15:21:09 -03:00
Thomas Reynolds f3c4c30853 Merge pull request #1186 from bhollis/catchup 
Merge changes from v3-stable into master
 2014-02-28 11:30:09 -10:00
Ben Hollis 0533bc4209 Be quiet about missing extras when middleman-core is used alone 2014-02-25 22:28:06 -08:00
Ben Hollis 0f9b199bfa Move some requires around 2014-02-22 22:44:28 -08:00
Ben Hollis e662b6433f Reapply changes from 477f87e98a to TemplateRenderer/TemplateContext 2014-02-22 22:44:25 -08:00
Ben Hollis c5b0ba17ea Fix Padrino integration after merge 2014-02-22 20:11:54 -08:00
Ben Hollis 4e545eef27 Break Middleman::Extension into its own file, mirroring the change on master 2014-02-22 18:43:47 -08:00
Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable' 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
 2014-02-22 18:11:37 -08:00
Ben Hollis 12defbc56b Merge pull request #1185 from bhollis/layout_priority 
Prefer loading layouts from `layouts_dir`
 2014-02-21 18:32:02 -08:00
Ben Hollis 477f87e98a Prefer loading layouts from layouts_dir over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176. 2014-02-20 08:50:07 -08:00
Ben Hollis ca50f21fac "middleman init" will create a project in the current directory. Fixes #1181. 2014-02-19 23:13:59 -08:00
Thomas Reynolds 3995ad850c update padrino. 2014-02-18 18:30:29 -08:00
Thomas Reynolds 049866ee2e Merge pull request #1169 from datapimp/before-build-hook 
Adding before build hook
 2014-02-05 09:29:19 -08:00
Jonathan Soeder 8d346e74a5 Adding before build hook 2014-02-04 23:03:24 -06:00
Thomas Reynolds 3b3ed654b7 Merge pull request #1167 from hagenburger/feature/upgrade-hooks-v3 
Feature/upgrade hooks v3
 2014-02-03 15:30:22 -08:00
Thomas Reynolds 7310693b5f Merge pull request #1165 from hagenburger/feature/upgrade-hooks 
Hooks upgrade/use Hooks gem
 2014-02-03 15:27:24 -08:00
Nico Hagenburger 0c3000c799 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem 2014-02-03 23:39:23 +01:00
Nico Hagenburger e5d95944c4 use instance hooks provided by hooks instead of changing the gem’s source 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/extensions.rb
 2014-02-03 23:37:55 +01:00
Nico Hagenburger 732532b72e upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0 
Conflicts:
	middleman-core/lib/middleman-core/application.rb
 2014-02-03 23:34:31 +01:00
Nico Hagenburger d6f9e8c640 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem 2014-02-02 11:18:25 +01:00
Nico Hagenburger 2ad91339bb use instance hooks provided by hooks instead of changing the gem’s source 2014-02-02 11:12:57 +01:00
Nico Hagenburger 247a152d39 upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0 2014-02-01 23:45:46 +01:00
Thomas Reynolds cb87e70a72 Merge pull request #1163 from jagthedrummer/jeremy/console-fix 
Update the console to the new logger syntax.
 2014-01-31 09:19:49 -08:00