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

691 commits

Author SHA1 Message Date
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
Karl Freeman
87acf687d5 friendlier localhost print 2014-03-14 06:46:10 +00: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
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
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
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
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
Jonathan Soeder
8d346e74a5 Adding before build hook 2014-02-04 23:03:24 -06: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
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
Ivan Zarea
3993034883 Fix dynamic pages link in the config template 2014-01-27 09:35:30 +02: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
bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds
305d2f99ed Put template rendering in a jail 2014-01-02 16:05:39 -08:00
Thomas Reynolds
9798f152ca silence slim warnings 2014-01-02 14:59:14 -08:00
Thomas Reynolds
d77ef04774 upgrade to newest activesupport 2014-01-02 14:38:18 -08:00
Thomas Reynolds
95eaeba960 Start cleaning up Rack internals 2014-01-01 19:09:47 -08:00
Thomas Reynolds
42fb8c229a bump version 2014-01-01 18:08:30 -08:00
Thomas Reynolds
a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Thomas Reynolds
c95c924d53 build a config file jail 2013-12-31 18:21:30 -08:00
Thomas Reynolds
2e2415612a spring cleaning util and discovery of nasty variable mutating in url_for 2013-12-31 14:41:17 -08:00
Karl Freeman
dcf527008e StringLiterals 'cop' fix [ci skip] 2013-12-29 23:04:30 +00:00
Matt Simpson
21f575af3a Specify the full path to the NEWLINE constant 2013-12-28 19:43:59 -06:00
Karl Freeman
a31aa5d8be TrailingWhitespace 'cop' fix 2013-12-28 18:14:15 +00:00
Karl Freeman
03d6e6c990 Implemented Rubocop 
- just took a stab at running the StringLiterals cop to get a taste.
 2013-12-28 00:47:39 +00:00
Thomas Reynolds
e996868033 Depend on new i18n gem, silence deprecation warning 2013-12-25 16:52:29 -08:00
Thomas Reynolds
b6361c23f7 prep new release 2013-12-18 14:56:21 -08:00