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

2978 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jeremy Green b056f4f1d1 Update the console to the new logger syntax. 2014-01-30 23:26:17 -06:00
Thomas Reynolds f0fcebe169 disable sass cache since it cant marshal the path to the MM instance 2014-01-28 10:46:39 -08:00
Thomas Reynolds c2d85c35f2 prep release 2014-01-27 09:56:48 -08:00
Thomas Reynolds 277721ee1c Merge pull request #1160 from minivan/template-link-fix 
Fix dynamic pages link in the config template
 2014-01-27 09:49:10 -08:00
Thomas Reynolds 4bc9079470 Merge pull request #1161 from nybblr/v3-stable 
Update Uglifier to 1.4.0 in middleman.gemspec
 2014-01-27 09:48:43 -08:00
Ivan Zarea 3993034883 Fix dynamic pages link in the config template 2014-01-27 09:35:30 +02:00
Jonathan Martin 674c3eed0e Update middleman.gemspec 
Bump Uglifier.
 2014-01-24 21:24:45 -05:00
Thomas Reynolds 6ad90766a7 Merge pull request #1156 from yawboakye/alias_console_to_c 
added an alias for `console` command
 2014-01-22 21:57:08 -08:00
Yaw Boakye 5a974ce75a added an alias for console command 
Almost every other command has an alias except `console`. Also the
comment above the class definition wrongly said `console` was a command
for creating new projects. Corrected appropriately
 2014-01-22 02:02:51 +00:00
Thomas Reynolds 6219c95040 Merge pull request #1150 from yawboakye/help_on_middleman_cli_commands 
give information on finding help for each command
 2014-01-16 09:22:55 -08:00
yawboakye 89044396d9 give information on finding help for each command 
At the end of the tasks lists, the new line added gives information on
how to find information on all the possible command that can be ran with
`middleman`. Information include options that can be passed to the
command
 2014-01-16 01:19:55 +00:00
Karl Freeman 164b6bd983 Happy 2014! 2014-01-15 14:54:16 +00:00
Thomas Reynolds 27c596fd35 Merge pull request #1148 from samsymons/master 
Fix a few typos in the documentation.
 2014-01-09 21:08:20 -08:00
Sam Symons df1236412b Corrected a handful of documentation typos. 2014-01-09 19:49:41 -08:00
Thomas Reynolds 1dc9b97a5e better ruby style on some changes 2014-01-04 12:44:20 -08:00
Thomas Reynolds 504a1c2eba remove confusing and broken data.page variable 2014-01-03 16:18:16 -08:00
Thomas Reynolds 98e3c8aa79 remove instance variable and page block support 2014-01-03 15:49:54 -08:00
Thomas Reynolds 614d69dc18 move current_path in to the template context, one less piece of global state 2014-01-03 14:56:16 -08:00
Thomas Reynolds f40903e663 move rendering into specialized File and Template rendering classes. 2014-01-03 13:40:37 -08:00
Thomas Reynolds c06fbcfc93 rely directly on rack-mock 2014-01-02 21:45:42 -08:00
Thomas Reynolds 926ba0036c Merge pull request #1142 from middleman/middleman_cli 
Move CLI into middleman-cli
 2014-01-02 17:24:49 -08:00
Thomas Reynolds bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds 09c7bda6b1 Merge pull request #1138 from middleman/template_jail 
Put template rendering in a jail
 2014-01-02 16:33:05 -08:00
Thomas Reynolds 305d2f99ed Put template rendering in a jail 2014-01-02 16:05:39 -08:00