Thomas Reynolds
|
485cf1aed0
|
Merge pull request #1205 from bhollis/lazy-v3
Avoid loading middleman-core unless needed (v3)
|
2014-03-14 09:30:16 -07:00 |
|
Ben Hollis
|
a88f12a262
|
Apply fix from 32716f3729 - avoid loading middleman-core unless needed. Fixes #1203
|
2014-03-13 20:32:25 -07:00 |
|
|
Ben Hollis
|
58616ce486
|
pry-debugger is not available on Ruby 2.1
|
2014-03-13 20:31:41 -07:00 |
|
|
Thomas Reynolds
|
250c87ef61
|
move livereload init into dev block
|
2014-03-09 17:50:34 -07: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 |
|
|
Ben Hollis
|
0533bc4209
|
Be quiet about missing extras when middleman-core is used alone
|
2014-02-25 22:28:06 -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
|
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 |
|
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 |
|
|
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
|
2e2415612a
|
spring cleaning util and discovery of nasty variable mutating in url_for
|
2013-12-31 14:41:17 -08:00 |
|
Karl Freeman
|
3cc74aae7e
|
whitespace [ci skip]
|
2013-12-30 21:39:28 +00:00 |
|
|
Karl Freeman
|
dcf527008e
|
StringLiterals 'cop' fix [ci skip]
|
2013-12-29 23:04:30 +00:00 |
|
|
Karl Freeman
|
f6f235c1fe
|
exclude development gems
|
2013-12-29 22:53:18 +00:00 |
|
|
Karl Freeman
|
b0a5722b34
|
use latest bundler
|
2013-12-29 22:45:43 +00:00 |
|
|
Karl Freeman
|
1de2f5c290
|
TRAVIS environment variable already set
http://about.travis-ci.org/docs/user/ci-environment/#Environment-variables
|
2013-12-29 13:01:33 +00:00 |
|
|
Ben Hollis
|
2a89de8e2b
|
Merge pull request #1128 from coffeencoke/fixes_call_to_newline_constant
Specify the full path to the NEWLINE constant
|
2013-12-28 19:09:03 -08:00 |
|
Matt Simpson
|
21f575af3a
|
Specify the full path to the NEWLINE constant
|
2013-12-28 19:43:59 -06:00 |
|
|
Thomas Reynolds
|
bbfbcf7583
|
Merge pull request #1126 from middleman/travis-rejig
Fast fail and Ruby 2.1 / head testing
|
2013-12-28 12:49:25 -08:00 |
|
|
Karl Freeman
|
a31aa5d8be
|
TrailingWhitespace 'cop' fix
|
2013-12-28 18:14:15 +00:00 |
|
|
Karl Freeman
|
bf327c17b7
|
include additional files to 'cop'
|
2013-12-28 18:13:44 +00:00 |
|
|
Thomas Reynolds
|
65b0029ccd
|
Merge pull request #1127 from middleman/rubocop
Implemented Rubocop
|
2013-12-27 22:57:56 -08:00 |
|
|
Karl Freeman
|
b1c0d73259
|
fast failures and Ruby 2.1 / head testing
|
2013-12-28 01:31:32 +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 |
|
|
Karl Freeman
|
45365481ef
|
ignore bin directory
|
2013-12-28 00:33:33 +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 |
|
|
Thomas Reynolds
|
a1090f912c
|
fix issue with UTF-8-MAC paths not matching UTF-8 paths in build clean
|
2013-12-18 14:54:07 -08:00 |
|
|
Ben Hollis
|
f9728108cc
|
Fix Mac filenames patch
|
2013-12-15 16:06:55 -08:00 |
|
|
Thomas Reynolds
|
70744aa63f
|
fix typo
|
2013-12-13 08:30:19 -08:00 |
|
|
Thomas Reynolds
|
deb75a4c78
|
Merge pull request #1120 from TMaYaD/master
Allow path to be passed to page_classes
|
2013-12-13 08:24:50 -08:00 |
|
TMaYaD
|
8b87670024
|
Allow path to be passed to page_classes
This allows tagging navigation links etc. in other pages with page classes
|
2013-12-13 13:07:00 +05:30 |
|
|
Thomas Reynolds
|
0a264fd3c2
|
Merge pull request #1116 from bhollis/gzip
Parallelize gzip extension using threads
|
2013-12-11 10:40:29 -08:00 |
|
|
Thomas Reynolds
|
fe2f43e8a4
|
Merge pull request #1117 from bhollis/utf8mac
Fix a perf regression when building
|
2013-12-11 10:39:17 -08:00 |
|
|
Ben Hollis
|
39a9331232
|
Commit 8e99d39570 introduced a serious regression by encoding filenames within a "delete_if" block, meaning that every path in the list of all previously built files was re-encoded every time a file was built. For large projects this causes serious slowdowns - for a 4000 file test, it went from 14s to build to around 8 minutes to build. This change fixes the builder to only encode files when the file list is initially build, removing the bottleneck.
|
2013-12-10 22:11:59 -08:00 |
|