deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 8b20b39b31 Merge pull request #1194 from bhollis/gemfile Thomas Reynolds 2014-03-08 16:05:34 -08:00
  • 10f8715bde Whoops, properly implement findup Ben Hollis 2014-03-04 22:43:10 -08:00
  • f2b7e224ee Merge pull request #1193 from bhollis/middleman-more Thomas Reynolds 2014-03-04 13:08:26 -08:00
  • 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. Ben Hollis 2014-03-03 23:08:32 -08:00
  • 9e9bed0043 pry-debugger is not available on Ruby 2.1 Ben Hollis 2014-03-03 23:07:32 -08:00
  • 5de4e337c1 Merge middleman-more back into middleman-core Ben Hollis 2014-03-03 22:32:12 -08:00
  • c9a640a3e2 Merge remote-tracking branch 'origin/v3-stable' Ben Hollis 2014-03-03 22:10:50 -08:00
  • f5b3720ef8 Merge pull request #1190 from bhollis/middleman-core Thomas Reynolds 2014-03-03 10:50:10 -10:00
  • ca45440ffe Merge pull request #1191 from barraponto/default_no_layout Thomas Reynolds 2014-03-03 10:42:33 -10:00
  • 81baf8c47c Use no layouts for xml, json and txt by default Capi Etheriel 2014-03-01 15:19:38 -03:00
  • f3c4c30853 Merge pull request #1186 from bhollis/catchup Thomas Reynolds 2014-02-28 11:30:09 -10:00
  • 0533bc4209 Be quiet about missing extras when middleman-core is used alone Ben Hollis 2014-02-25 22:28:06 -08:00
  • 0f9b199bfa Move some requires around Ben Hollis 2014-02-22 18:46:32 -08:00
  • e662b6433f Reapply changes from 477f87e98a to TemplateRenderer/TemplateContext Ben Hollis 2014-02-22 18:24:40 -08:00
  • c5b0ba17ea Fix Padrino integration after merge Ben Hollis 2014-02-22 20:10:25 -08:00
  • 4e545eef27 Break Middleman::Extension into its own file, mirroring the change on master Ben Hollis 2014-02-22 18:43:47 -08:00
  • 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable' Ben Hollis 2014-02-22 18:11:37 -08:00
  • 12defbc56b Merge pull request #1185 from bhollis/layout_priority Ben Hollis 2014-02-21 18:32:02 -08:00
  • 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. Ben Hollis 2014-02-20 00:32:38 -08:00
  • ca50f21fac "middleman init" will create a project in the current directory. Fixes #1181. Ben Hollis 2014-02-19 23:13:59 -08:00
  • 3995ad850c update padrino. Thomas Reynolds 2014-02-18 18:30:29 -08:00
  • 049866ee2e Merge pull request #1169 from datapimp/before-build-hook Thomas Reynolds 2014-02-05 09:29:19 -08:00
  • 8d346e74a5 Adding before build hook Jonathan Soeder 2014-02-04 23:03:24 -06:00
  • 3b3ed654b7 Merge pull request #1167 from hagenburger/feature/upgrade-hooks-v3 Thomas Reynolds 2014-02-03 15:30:22 -08:00
  • 7310693b5f Merge pull request #1165 from hagenburger/feature/upgrade-hooks Thomas Reynolds 2014-02-03 15:27:24 -08:00
  • 0c3000c799 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem Nico Hagenburger 2014-02-02 11:18:25 +01:00
  • e5d95944c4 use instance hooks provided by hooks instead of changing the gem’s source Nico Hagenburger 2014-02-02 11:12:57 +01:00
  • 732532b72e upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0 Nico Hagenburger 2014-02-01 23:45:46 +01:00
  • d6f9e8c640 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem Nico Hagenburger 2014-02-02 11:18:25 +01:00
  • 2ad91339bb use instance hooks provided by hooks instead of changing the gem’s source Nico Hagenburger 2014-02-02 11:12:57 +01:00
  • 247a152d39 upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0 Nico Hagenburger 2014-02-01 23:45:46 +01:00
  • cb87e70a72 Merge pull request #1163 from jagthedrummer/jeremy/console-fix Thomas Reynolds 2014-01-31 09:19:49 -08:00
  • b056f4f1d1 Update the console to the new logger syntax. Jeremy Green 2014-01-30 23:26:17 -06:00
  • f0fcebe169 disable sass cache since it cant marshal the path to the MM instance Thomas Reynolds 2014-01-28 10:46:39 -08:00
  • c2d85c35f2 prep release v3.2.2 Thomas Reynolds 2014-01-27 09:56:48 -08:00
  • 277721ee1c Merge pull request #1160 from minivan/template-link-fix Thomas Reynolds 2014-01-27 09:49:10 -08:00
  • 4bc9079470 Merge pull request #1161 from nybblr/v3-stable Thomas Reynolds 2014-01-27 09:48:43 -08:00
  • 3993034883 Fix dynamic pages link in the config template Ivan Zarea 2014-01-27 09:35:30 +02:00
  • 674c3eed0e Update middleman.gemspec Jonathan Martin 2014-01-24 21:24:45 -05:00
  • 6ad90766a7 Merge pull request #1156 from yawboakye/alias_console_to_c Thomas Reynolds 2014-01-22 21:57:08 -08:00
  • 5a974ce75a added an alias for console command Yaw Boakye 2014-01-22 02:02:51 +00:00
  • 6219c95040 Merge pull request #1150 from yawboakye/help_on_middleman_cli_commands Thomas Reynolds 2014-01-16 09:22:55 -08:00
  • 89044396d9 give information on finding help for each command yawboakye 2014-01-16 01:19:55 +00:00
  • 164b6bd983 Happy 2014! Karl Freeman 2014-01-15 14:54:16 +00:00
  • 27c596fd35 Merge pull request #1148 from samsymons/master Thomas Reynolds 2014-01-09 21:08:20 -08:00
  • df1236412b Corrected a handful of documentation typos. Sam Symons 2014-01-09 19:49:41 -08:00
  • 1dc9b97a5e better ruby style on some changes Thomas Reynolds 2014-01-04 12:44:20 -08:00
  • 504a1c2eba remove confusing and broken data.page variable Thomas Reynolds 2014-01-03 16:18:16 -08:00
  • 98e3c8aa79 remove instance variable and page block support Thomas Reynolds 2014-01-03 15:49:54 -08:00
  • 614d69dc18 move current_path in to the template context, one less piece of global state Thomas Reynolds 2014-01-03 14:56:16 -08:00
  • f40903e663 move rendering into specialized File and Template rendering classes. Thomas Reynolds 2014-01-03 13:15:02 -08:00
  • c06fbcfc93 rely directly on rack-mock Thomas Reynolds 2014-01-02 17:25:31 -08:00
  • 926ba0036c Merge pull request #1142 from middleman/middleman_cli Thomas Reynolds 2014-01-02 17:24:49 -08:00
  • bea2515a41 Move CLI into middleman-cli Thomas Reynolds 2014-01-02 16:34:08 -08:00
  • 09c7bda6b1 Merge pull request #1138 from middleman/template_jail Thomas Reynolds 2014-01-02 16:33:05 -08:00
  • 305d2f99ed Put template rendering in a jail Thomas Reynolds 2014-01-01 21:19:05 -08:00
  • 9798f152ca silence slim warnings Thomas Reynolds 2014-01-02 14:59:14 -08:00
  • 5afa66f194 bump deps 1 Thomas Reynolds 2014-01-02 14:48:40 -08:00
  • d77ef04774 upgrade to newest activesupport Thomas Reynolds 2014-01-02 14:38:18 -08:00
  • 95eaeba960 Start cleaning up Rack internals Thomas Reynolds 2014-01-01 19:09:47 -08:00
  • 0a288131c1 changelog Thomas Reynolds 2014-01-01 18:09:19 -08:00
  • 42fb8c229a bump version Thomas Reynolds 2014-01-01 18:08:30 -08:00
  • 8a9fae0e35 Merge pull request #1136 from middleman/remove_v3_extensions Thomas Reynolds 2014-01-01 18:07:56 -08:00
  • a610608785 remove old style extension support Thomas Reynolds 2014-01-01 14:50:42 -08:00
  • b5fec39df8 2.1 is for reals now Thomas Reynolds 2014-01-01 15:00:56 -08:00
  • 572bf533f8 Merge pull request #1135 from middleman/config_context Thomas Reynolds 2014-01-01 13:27:09 -08:00
  • c95c924d53 build a config file jail Thomas Reynolds 2013-12-31 18:21:30 -08:00
  • 2e2415612a spring cleaning util and discovery of nasty variable mutating in url_for Thomas Reynolds 2013-12-31 14:41:17 -08:00
  • 3cc74aae7e whitespace [ci skip] Karl Freeman 2013-12-29 23:06:52 +00:00
  • dcf527008e StringLiterals 'cop' fix [ci skip] Karl Freeman 2013-12-29 23:04:30 +00:00
  • f6f235c1fe exclude development gems Karl Freeman 2013-12-29 22:53:18 +00:00
  • b0a5722b34 use latest bundler Karl Freeman 2013-12-29 22:45:43 +00:00
  • 1de2f5c290 TRAVIS environment variable already set Karl Freeman 2013-12-29 13:01:33 +00:00
  • 2a89de8e2b Merge pull request #1128 from coffeencoke/fixes_call_to_newline_constant Ben Hollis 2013-12-28 19:09:03 -08:00
  • 21f575af3a Specify the full path to the NEWLINE constant Matt Simpson 2013-12-28 19:43:59 -06:00
  • bbfbcf7583 Merge pull request #1126 from middleman/travis-rejig Thomas Reynolds 2013-12-28 12:49:25 -08:00
  • a31aa5d8be TrailingWhitespace 'cop' fix Karl Freeman 2013-12-28 18:14:15 +00:00
  • bf327c17b7 include additional files to 'cop' Karl Freeman 2013-12-28 18:13:44 +00:00
  • 65b0029ccd Merge pull request #1127 from middleman/rubocop Thomas Reynolds 2013-12-27 22:57:56 -08:00
  • b1c0d73259 fast failures and Ruby 2.1 / head testing Karl Freeman 2013-12-27 23:12:48 +00:00
  • 03d6e6c990 Implemented Rubocop Karl Freeman 2013-12-28 00:26:31 +00:00
  • 45365481ef ignore bin directory Karl Freeman 2013-12-28 00:33:26 +00:00
  • e996868033 Depend on new i18n gem, silence deprecation warning Thomas Reynolds 2013-12-25 16:52:29 -08:00
  • b6361c23f7 prep new release v3.2.1 Thomas Reynolds 2013-12-18 14:56:21 -08:00
  • a1090f912c fix issue with UTF-8-MAC paths not matching UTF-8 paths in build clean Thomas Reynolds 2013-12-18 14:54:07 -08:00
  • f9728108cc Fix Mac filenames patch Ben Hollis 2013-12-15 16:06:47 -08:00
  • 70744aa63f fix typo Thomas Reynolds 2013-12-13 08:30:19 -08:00
  • deb75a4c78 Merge pull request #1120 from TMaYaD/master Thomas Reynolds 2013-12-13 08:24:50 -08:00
  • 8b87670024 Allow path to be passed to page_classes TMaYaD 2013-12-13 13:07:00 +05:30
  • 0a264fd3c2 Merge pull request #1116 from bhollis/gzip Thomas Reynolds 2013-12-11 10:40:29 -08:00
  • fe2f43e8a4 Merge pull request #1117 from bhollis/utf8mac Thomas Reynolds 2013-12-11 10:39:17 -08:00
  • 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. Ben Hollis 2013-12-10 22:11:59 -08:00
  • 54bc3e44f7 Parallelize gzip extension using four threads Ben Hollis 2013-12-10 22:06:41 -08:00
  • 6db8ba705a Merge pull request #1112 from dannguyen/patch-1 Thomas Reynolds 2013-12-07 22:02:19 -08:00
  • 264aca8291 Spiffed up the opening text with links to the excellent homepage dannguyen 2013-12-07 23:50:11 -05:00
  • 1f6904c0fc Set locale to :en around gzip extension while it works. It was originally only set for one message, not the whole extension. Ben Hollis 2013-11-30 22:59:14 -08:00
  • c500039197 Add build-mode test cases to see if #1068 occurs Thomas Reynolds 2013-11-29 14:57:35 -08:00
  • 9e8a16cd6d Switch back to single-variable storage for Sitemap::Resource#destination_path Ben Hollis 2013-11-27 00:19:59 -08:00
  • fd9f726b9a Remove 1.8 notice message Ben Hollis 2013-11-25 22:51:34 -08:00
  • 63b53077ff Oops had not meant to commit this yet. Anyway, it makes the "helpers" method on Extension able to take a module directly instead of just a block. Ben Hollis 2013-11-25 01:10:10 -08:00