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

Commit graph

  • fe20d92b28 feature for partials_dir setting Artem Baguinski 2013-04-08 09:39:03 +02:00
  • 91e7033d54 a first stab at partials_dir setting Artem Baguinski 2013-04-05 13:58:41 +02:00
  • 023ea9f34e Process resources for asset_hash extension in a specific order. This makes sure static assets (images, fonts) get their paths modified before assets that include them (css, js). Ben Hollis 2013-04-08 00:50:58 -07:00
  • 1617875934 Activate Sprockets before user config Ben Hollis 2013-04-07 23:33:40 -07:00
  • b159946a6e Upgrade fivemat Ben Hollis 2013-04-06 23:53:51 -07:00
  • de1bfc440c Support fonts with asset_path Ben Hollis 2013-04-06 23:39:45 -07:00
  • c602df30dd Fix some 1.8.7 issues Ben Hollis 2013-04-06 22:55:49 -07:00
  • d6fa92d70e Add i18n changes to CHANGELOG Ben Hollis 2013-04-06 18:30:10 -07:00
  • 3e75a10056 Switch default markdown engine to Kramdown Ben Hollis 2013-04-06 16:01:40 -07:00
  • 53bddf8304 Merge pull request #853 from bhollis/i18n Thomas Reynolds 2013-04-06 18:25:23 -07:00
  • 17b3e3e628 Include I18n::Fallbacks and set the default I18n locale to our default locale. Ben Hollis 2013-04-06 17:21:56 -07:00
  • ee10d207a1 Update changelog with changes on master since 3.0.13 Ben Hollis 2013-04-06 16:58:47 -07:00
  • 37ef6a31da Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-04-06 16:09:41 -07:00
  • 7a4aa109a6 Overhaul content-type handling, making it configurable via page/proxy commands as well as frontmatter with the 'content_type' parameter. Ben Hollis 2013-04-06 14:05:26 -07:00
  • 397ccd2c1e Fix a bunch of Ruby warnings, including a bug in the not_found method Ben Hollis 2013-04-06 14:48:00 -07:00
  • 1d869b0c08 Simplify frontmatter by removing its resource_list_manipulator Ben Hollis 2013-04-06 14:23:10 -07:00
  • 14a39e5e87 Minor performance fix to not double-compute metadata in directory_indexes. Ben Hollis 2013-04-06 12:15:05 -07:00
  • 044b49d83b Fixes for alpha Sass versions Ben Hollis 2013-04-04 23:19:10 -07:00
  • c2ffa538ad Undo my previous change, apparently it is no good Ben Hollis 2013-04-04 23:22:38 -07:00
  • f7d1471edb Handle empty frontmatter without logging an exception Ben Hollis 2013-04-04 22:59:05 -07:00
  • f89c815868 More agressively set the context for our custom Markdown renderer, and fall back if we still don't manage to get it right. Fixes #662. Ben Hollis 2013-04-04 22:43:28 -07:00
  • fca4c0330e Merge pull request #849 from stevenosloan/markdown_filter_in_haml Ben Hollis 2013-04-04 22:43:16 -07:00
  • 6043392e1a add feature tests for markdown support in haml Steven Sloan 2013-04-04 15:05:20 -04:00
  • 70643dcc32 Merge pull request #846 from argent-smith/master Ben Hollis 2013-04-03 22:06:14 -07:00
  • 087872d286 Merge pull request #845 from bhollis/i18n Thomas Reynolds 2013-04-03 11:25:18 -07:00
  • 6f76ae31a9 Added .idea dir to .gitignore Pavel Argentov 2013-04-03 12:35:33 +04:00
  • 4d5c509688 Fix several issues around i18n and resource metadata. Ben Hollis 2013-04-02 23:28:47 -07:00
  • cc418c7a2d Ruby 2.0 switches to using #inspect instead of #to_s when printing out objects, which brings back the infinite-hang-on-NoMethodError bug from http://bugs.ruby-lang.org/issues/4521. Aliasing #inspect to #to_s for Middleman::Application fixes it again. This fixes #833. Ben Hollis 2013-04-02 22:19:17 -07:00
  • 7c1c93562a Merge pull request #842 from tricknotes/fix-method-comments Ben Hollis 2013-03-29 08:51:10 -07:00
  • 3de491981a Fix method comments Ryunosuke SATO 2013-03-29 03:15:33 +09:00
  • c1c752aa32 Suggest adding middleman-livereload to bundle Capi Etheriel 2013-03-26 15:07:22 -03:00
  • 00ac776fc4 Document livereload usage in config file Capi Etheriel 2013-03-26 11:21:05 -03:00
  • 92954a7c95 Merge pull request #839 from tricknotes/modify-year-in-smacss Thomas Reynolds 2013-03-25 12:44:57 -07:00
  • afd8f0e775 Modify copyright year in smacss template Ryunosuke SATO 2013-03-26 03:17:55 +09:00
  • 8aa652713a Merge pull request #836 from tricknotes/directory-as-a-data-key Thomas Reynolds 2013-03-25 09:53:58 -07:00
  • 420b4c6087 simplest thing that could work implementation of Middleman::Extension Thomas Reynolds 2013-03-23 15:35:38 -07:00
  • 1e64e8022e Support directory name as a data key Ryunosuke SATO 2013-03-23 17:13:05 +09:00
  • cd539f4e91 Merge pull request #835 from artm/need_reload_fix Thomas Reynolds 2013-03-22 11:13:07 -07:00
  • e07bd036d1 just call needs_to_reload? once Artem Baguinski 2013-03-22 18:28:38 +01:00
  • a9a15caeae Merge pull request #834 from tricknotes/fix-code-comment Thomas Reynolds 2013-03-22 10:23:12 -07:00
  • e169f88a5a fix 'needs_to_reload?' regexps Artem Baguinski 2013-03-22 18:22:16 +01:00
  • f7f281de39 Fix code comment Ryunosuke SATO 2013-03-22 18:14:10 +09:00
  • bef30685e0 Merge pull request #831 from tricknotes/modify-filetype Thomas Reynolds 2013-03-21 13:17:42 -07:00
  • de7b58e210 Modify filetype Ryunosuke SATO 2013-03-22 00:57:28 +09:00
  • 63a13e1e66 coffee test Thomas Reynolds 2013-03-20 09:52:31 -07:00
  • 0a1751fff0 change i18n dep again Thomas Reynolds 2013-03-20 08:57:32 -07:00
  • f83bcad312 loosen dep Thomas Reynolds 2013-03-20 08:54:28 -07:00
  • c4cf672640 Remove Rainpress pure ruby CSS compressor and simply use SCSS :) Thomas Reynolds 2013-03-19 16:21:49 -07:00
  • 1c7308fcea Remove Rainpress pure ruby CSS compressor and simply use SCSS :) Thomas Reynolds 2013-03-19 16:21:49 -07:00
  • fc30e0570b changelog Thomas Reynolds 2013-03-19 16:09:58 -07:00
  • 77fe264788 prep v3.0.13 Thomas Reynolds 2013-03-19 15:55:41 -07:00
  • 16d6ac156c looser test deps Thomas Reynolds 2013-03-18 14:21:06 -07:00
  • f2f3ad21b6 bump tilt requirement, unregister plaintext template. fixes #824 Thomas Reynolds 2013-03-18 14:11:48 -07:00
  • c994004aaa bump tilt requirement, unregister plaintext template. fixes #824 Thomas Reynolds 2013-03-18 14:11:48 -07:00
  • 546c1fdafc Merge pull request #825 from michaelbaudino/change-default-and-html5-templates-to-use-current_page.data.title Ben Hollis 2013-03-17 16:05:29 -07:00
  • d8d34b6c74 Changed 'default' and 'html5' templates to use 'current_page.data.title' instead of 'data.page.title' Related to middleman/middleman-blog#107 Michael Baudino 2013-03-17 18:18:59 +01:00
  • 659f063076 Include file extension in template cache. May fix #798 Ben Hollis 2013-03-14 23:21:58 -07:00
  • 6672c1c324 Merge branch '3.0-stable' Ben Hollis 2013-03-10 16:32:55 -07:00
  • 46f060ab12 Don't require securerandom - not sure what it was there for, but its not available in JRuby Ben Hollis 2013-03-10 16:29:00 -07:00
  • 3ce35149ec Merge pull request #806 from kevin8t8/3.0-stable Ben Hollis 2013-03-03 19:07:55 -08:00
  • 7608275089 Fix dynamic multi-byte utf-8 files rebuilding. Kevin McCarthy 2013-03-03 18:13:41 -08:00
  • 9a72036655 Merge branch '3.0-stable' Ben Hollis 2013-03-03 12:57:48 -08:00
  • 9fb54fcf5a Force locale to english for number_to_human_size in the gzip extension. Fixes #804. Ben Hollis 2013-03-03 12:57:21 -08:00
  • 34fe18e56c Don't use the logger from a trap context. Fixes #801. Ben Hollis 2013-03-03 12:31:42 -08:00
  • a10c8aa194 Don't use the logger from a trap context. Fixes #801. Ben Hollis 2013-03-03 12:31:42 -08:00
  • cda8bd759d Allow Haml 4 on master too Ben Hollis 2013-03-02 23:34:57 -08:00
  • 4745418200 Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-03-02 22:32:03 -08:00
  • 3928b209ef Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type. Ben Hollis 2013-01-17 19:40:23 -08:00
  • de955aa0c3 try again Thomas Reynolds 2013-02-27 13:20:26 -08:00
  • a24397d45b avoid broken version of i18n gem Thomas Reynolds 2013-02-27 13:02:57 -08:00
  • 0525902e43 what about no https travis? v3.0.12 Thomas Reynolds 2013-02-24 16:13:31 -08:00
  • 5817df96de bump Thomas Reynolds 2013-02-24 15:21:55 -08:00
  • 1def1fc1f0 update sprockets dep Thomas Reynolds 2013-02-24 14:20:28 -08:00
  • 18849c2eea loosen testing deps Thomas Reynolds 2013-02-24 13:55:59 -08:00
  • 6cee2d74f5 adapt to bundler changes, add ruby 2.0 to tests, prep release Thomas Reynolds 2013-02-24 13:44:24 -08:00
  • dd63ba164e Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable Thomas Reynolds 2013-02-24 13:37:30 -08:00
  • 6f5804d6b2 Bundler advises not to use a source symbol anymore Karl Freeman 2013-02-24 19:13:54 +00:00
  • 0f80965ae3 latest listen supports new wdm Thomas Reynolds 2013-02-24 13:34:07 -08:00
  • 45905f2599 Merge pull request #795 from middleman/deprecate-gemfile-symbol Thomas Reynolds 2013-02-24 13:30:04 -08:00
  • 13c58a3ad5 Bundler advises not to use a source symbol anymore Karl Freeman 2013-02-24 19:13:54 +00:00
  • 8d5ac575f6 prep pre v3.0.12.pre.1 Thomas Reynolds 2013-02-20 13:15:38 -08:00
  • aa2102cbb7 update listen dep Thomas Reynolds 2013-02-19 17:14:10 -08:00
  • f0e76c85d0 Merge pull request #789 from bhollis/haml Thomas Reynolds 2013-02-19 17:03:43 -08:00
  • 9057b7a85e Support Haml 4. Tests only run with Haml 4 now. Fixes #783 Ben Hollis 2013-02-17 19:40:17 -08:00
  • aa10991b78 Update CHANGELOG for 3.0.12 Ben Hollis 2013-02-17 18:22:17 -08:00
  • 1d3503b56c OK maybe not Rubinius Ben Hollis 2013-02-15 23:00:53 -08:00
  • f791733cc6 Constrain HAML Ben Hollis 2013-02-15 22:26:46 -08:00
  • 00f23cad8e Test on more rubies Ben Hollis 2013-02-15 21:24:39 -08:00
  • c48ac06526 Merge pull request #776 from bhollis/config_meta Ben Hollis 2013-02-14 08:52:07 -08:00
  • ff971dd327 Merge pull request #775 from bhollis/console Ben Hollis 2013-02-14 08:51:48 -08:00
  • b4aa33fe22 Typo in merge Ben Hollis 2013-02-10 18:43:38 -08:00
  • 51a494b343 Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-02-10 18:05:24 -08:00
  • d553c6a88e Protect against unset current_path Ben Hollis 2013-02-10 17:51:47 -08:00
  • 978b981e11 Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-02-10 17:05:18 -08:00
  • 5a585dd3ab Copy/paste error Ben Hollis 2013-02-10 17:04:53 -08:00
  • fede3449b6 Merge branch '3.0-stable' Ben Hollis 2013-02-10 16:54:02 -08:00
  • cf51fe6a20 Fix binary_spec test for svgz - it's binary Ben Hollis 2013-02-10 16:53:38 -08:00
  • d6110e2ff1 Add a metadata page for inspecting configuration. Ben Hollis 2013-02-10 16:43:37 -08:00
  • 2a5513dcc9 Add an experimental "console" CLI command. Ben Hollis 2013-02-10 16:12:32 -08:00
  • 52c4677391 Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-02-10 15:41:36 -08:00