middleman

deac/middleman

Fork 0

Commit graph

dd2525c18e Merge branch 'master' of github.com:middleman/middleman v3.1.3 Thomas Reynolds 2013-07-02 14:42:54 -07:00
6403daccd3 prep Thomas Reynolds 2013-07-02 14:42:44 -07:00
ab98f4bcc0 Merge pull request #947 from arronmabrey/add_support_for_nojekyll_dotfile Thomas Reynolds 2013-07-01 08:10:21 -07:00
44e5ff3f6c Update Sitemap source_dotfiles to support .nojekyll file Arron Mabrey 2013-06-30 18:46:39 -04:00
00d6a78872 Add expectation that .nojekyll file should exist to directory_index feature Arron Mabrey 2013-06-30 18:45:49 -04:00
0d4dd71ae2 Add .nojekyll file to indexable-app fixture Arron Mabrey 2013-06-30 18:44:34 -04:00
f83e6c0998 Merge pull request #945 from al/bugfix-typo_in_core_extensions_request Thomas Reynolds 2013-06-25 10:28:04 -07:00
26b7f46978 Fixed typo in middleman-core/core-extensions/request.rb. Alan Larkin 2013-06-25 14:55:12 +01:00
b2ecf5526b ignore all ds_store v3.1.2 Thomas Reynolds 2013-06-24 14:26:58 -07:00
b6a73ccfe5 prep Thomas Reynolds 2013-06-24 14:15:27 -07:00
c7d3e7d601 Fix regex which was allowing i18n to file yaml files in the data folder Thomas Reynolds 2013-06-24 13:56:32 -07:00
37752dc291 fix layouts with implied extensions Thomas Reynolds 2013-06-24 13:39:14 -07:00
3399ee207e dont hardcode ignored build dir name Thomas Reynolds 2013-06-23 15:15:43 -07:00
15ec5441c3 Merge pull request #943 from southpolesteve/patch-1 Karl Freeman 2013-06-23 10:19:52 -07:00
f68f01a574 Update gitignore Steve Faulkner 2013-06-22 22:53:10 -05:00
d86dffa7c6 implement redirect support Thomas Reynolds 2013-06-19 11:13:23 -07:00
912b33929f bump listen Thomas Reynolds 2013-06-19 10:23:53 -07:00
0415b76d4f tests for content_tag escaping v3.1.1 Thomas Reynolds 2013-06-18 11:06:43 -07:00
298e842510 Merge pull request #941 from krautcomputing/fix_content_tag_helper Thomas Reynolds 2013-06-18 11:01:28 -07:00
c75e31ae94 Fix content_tag helper, only try to mark content as safe if it is not a hash of options Manuel Meurer 2013-06-18 10:12:38 +02:00
0e69928939 bump ver Thomas Reynolds 2013-06-17 00:47:58 +00:00
efe52f7cca Check if set is redefining a param at the class level. Fixes #939 Thomas Reynolds 2013-06-17 00:47:10 +00:00
f0707c0968 Prevent relative asset helper from munging data URIs. Closes #938. v3.1.0 Thomas Reynolds 2013-06-15 16:22:14 -07:00
9320007be6 dum dum dum..... Thomas Reynolds 2013-06-14 16:31:51 -07:00
8eac168618 new rc v3.1.0.rc.4 Thomas Reynolds 2013-06-13 09:23:31 -07:00
913d2b7049 Implement generic which is a simple way to build a file from Rack Thomas Reynolds 2013-06-13 09:05:13 -07:00
f97c9ffab1 dont bother with jruby 1.8 mode Thomas Reynolds 2013-06-12 18:24:00 -07:00
7e405fc414 And by 1.8, I mean MRI 1.8 Thomas Reynolds 2013-06-12 17:58:59 -07:00
e03362e6f6 Apparently Ruby 1.8 doesn't have Proc.source_location Thomas Reynolds 2013-06-12 17:40:17 -07:00
7d7d5e683e Set current_engine on the context, not self, since we dup self and use that for each render loop. Closes #860 Thomas Reynolds 2013-06-12 13:52:35 -07:00
b234deb540 Add cucumber scenarios for markdown pages with erb layout Moritz Breit 2013-04-14 21:28:35 +02:00
a52effc119 continue forcing Padrino to html_safe everything Thomas Reynolds 2013-06-12 11:19:02 -07:00
34b354f156 Update CONTRIBUTING.md Karl Freeman 2013-06-10 18:20:09 +02:00
9d5a878713 prybegone Thomas Reynolds 2013-06-09 17:15:15 -07:00
d71af3f5a1 Force padrino to skip safebuffer on erb v3.1.0.rc.3 Thomas Reynolds 2013-06-08 15:36:14 -07:00
d9f8327dc6 Merge pull request #930 from utensil/master Thomas Reynolds 2013-06-07 10:09:23 -07:00
efc0f9961b Merge pull request #927 from middleman/content_for_escaping Thomas Reynolds 2013-06-07 10:08:37 -07:00
c051b72322 Merge pull request #928 from middleman/capture_html-tests Thomas Reynolds 2013-06-07 10:07:31 -07:00
7e9ff77c1d fix #929 : cd in Rakefile in a cross-platform way utensil 2013-06-07 23:19:47 +08:00
ef46e4e6c3 add breaking test for escaped html using content_for Karl Freeman 2013-06-07 09:59:59 +01:00
0b8c36cb8c capture_html helper tests Karl Freeman 2013-06-07 09:58:37 +01:00
d728df12cf bump ver Thomas Reynolds 2013-06-05 13:40:45 -07:00
265f90e240 Add callback so v4 extensions can see when other extensions are activated Thomas Reynolds 2013-06-04 15:51:03 -07:00
f3e2e8fdf5 ignore vendor in simplecov Thomas Reynolds 2013-06-04 14:28:46 -07:00
48ce4a8beb Update vendor.yml Thomas Reynolds 2013-06-04 15:23:01 -06:00
69c36e691f use latest padrino Thomas Reynolds 2013-06-04 09:56:33 -07:00
39d3fa01ad Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2013-06-04 09:48:45 -07:00
a9839731e6 only require padrino once Thomas Reynolds 2013-06-04 09:48:01 -07:00
d3d85f8bc7 Merge pull request #923 from pulletsforever/feature/rack-block Thomas Reynolds 2013-06-03 13:35:01 -07:00
f2f17c33b3 Allow block to be passed through from Middleman.server() David W. Keith 2013-06-03 11:48:16 -07:00
c741735446 update path to helpers for sitemap metapages Thomas Reynolds 2013-06-03 10:07:09 -07:00
564af31987 Merge pull request #922 from middleman/ignore-vendor-folder Thomas Reynolds 2013-06-03 09:57:13 -07:00
32b113dc93 include '/vendor' in ignored files / folders Karl Freeman 2013-06-03 17:06:43 +01:00
8863473756 bump dep Thomas Reynolds 2013-06-02 19:04:33 -07:00
d0cd3e3cf9 layouts_dir is now configurable. Closes #899 v3.1.0.rc.2 Thomas Reynolds 2013-06-01 15:25:44 -07:00
149f6ffa5b fix builder not cleaning empty directories Thomas Reynolds 2013-05-31 21:20:15 -04:00
9d50cad910 Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2013-05-31 21:01:34 -04:00
10f1d7ada2 break apart some methods to make code less complex Thomas Reynolds 2013-05-31 20:46:12 -04:00
8cf25c7cc3 Merge pull request #920 from bhollis/empty Thomas Reynolds 2013-05-31 06:49:57 -07:00
85c6a8faa3 Fix changelog Ben Hollis 2013-05-30 21:21:13 -07:00
dbcb28dded Add an "empty" template and let template classes override the "Gemfile" template. Ben Hollis 2013-05-30 21:16:30 -07:00
7127401aa2 Micro-optimize some regexes Ben Hollis 2013-05-30 21:16:07 -07:00
fe2a7c4dd6 Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2013-05-31 00:11:54 -04:00
7bdf28a421 Fix ignoring layouts from the sitemap when the source directory has been set to something other than 'source'. Fixes #896. Ben Hollis 2013-05-30 20:16:27 -07:00
474b56ae25 Merge pull request #917 from joallard/i18n_pages Ben Hollis 2013-05-30 18:39:13 -07:00
f4002dbb36 update changelog Thomas Reynolds 2013-05-30 15:13:42 -04:00
403d6abd05 fix up simplecov, add coveralls Thomas Reynolds 2013-05-30 13:38:52 -04:00
56f16c2488 Fix #823-2 to allow only one extension on localized views Make Sitemap::Store#strip_away_locale actually do something Jonathan Allard 2013-05-30 13:20:57 -04:00
31f238f881 Refactor some of i18n for better codeclimate scores. In the process, make nested i18n files work like rails Thomas Reynolds 2013-05-29 14:00:37 -04:00
86cd626084 write some file change and deletion tests for better data coverage Thomas Reynolds 2013-05-29 10:59:03 -04:00
b8b48afcbb how do i paren? Thomas Reynolds 2013-05-29 10:35:00 -04:00
fef8b8417d Add more nested data tests, actually get simplecov to run Thomas Reynolds 2013-05-29 09:59:15 -04:00
3d247d40fb Merge pull request #914 from krautcomputing/replace_data_page_with_current_page_data Thomas Reynolds 2013-05-29 06:04:09 -07:00
ed59260367 Replace all occurrences of data.page with current_page.data Manuel Meurer 2013-05-29 11:25:57 +02:00
994bd651f8 Add Simplecov Ben Hollis 2013-05-28 22:11:57 -07:00
f611a7185b Clean up frontmatter a bit Ben Hollis 2013-05-28 21:36:25 -07:00
38b3d5155d Merge pull request #904 from bhollis/master Thomas Reynolds 2013-05-26 20:21:18 -07:00
e03ef4226a Cache the filtered resource list to avoid calling Resource#ignored? a ton Ben Hollis 2013-05-23 00:11:09 -07:00
950aace674 Make Frontmatter a class-based extension to simplify file Thomas Reynolds 2013-05-24 17:11:46 -07:00
5104579623 after_build support in class-based extension Thomas Reynolds 2013-05-24 15:49:15 -07:00
7611f4ef4a Listen bundles these gems again (le sigh) Thomas Reynolds 2013-05-24 11:34:03 -07:00
3d804494f5 ignore tmp dir Thomas Reynolds 2013-05-24 10:34:10 -07:00
117a9ab6f9 unneeded require Thomas Reynolds 2013-05-23 16:27:37 -07:00
5b8c7a2494 move vendored gems into shared root Thomas Reynolds 2013-05-23 15:59:26 -07:00
7a227b8bac stub out blank middleman-more gem for backwards compat with extensions Thomas Reynolds 2013-05-23 15:26:33 -07:00
77157b96e0 jruby isn't optional Thomas Reynolds 2013-05-23 15:04:05 -07:00
ed9012ef5b Ruby 1.8 can't regex on a symbol (or something) Thomas Reynolds 2013-05-23 14:55:26 -07:00
bcdaad6443 Merge pull request #906 from adamesque/master Thomas Reynolds 2013-05-23 13:35:01 -07:00
90eb5fca3e loosen thor dep now that we're bundling padrino Thomas Reynolds 2013-05-23 13:32:10 -07:00
424fee0722 Cache frontmatter repeated calling of recursively_enhance Thomas Reynolds 2013-05-23 13:31:38 -07:00
c60cddc1ac Make sure Frontmatter data is actually cached. Fixes #903 Adam Luikart 2013-05-23 14:50:46 -05:00
dbbf84016f Fix c9d151ba66 for when files are outside the project Ben Hollis 2013-05-22 23:39:56 -07:00
c9d151ba66 The file watcher knows which files exist, so don't use slow File.exists? Thomas Reynolds 2013-05-22 17:37:43 -07:00
fc37ef9b99 vendor padrino Thomas Reynolds 2013-05-19 13:53:37 -07:00
b19e8bc185 reorg some of the more stuff Thomas Reynolds 2013-05-19 13:23:49 -07:00
4d0ffe11c0 Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2013-05-18 13:47:29 -07:00
407f1b67a3 fix test for updated uglifier Thomas Reynolds 2013-05-18 13:47:15 -07:00
633e14f266 Merge pull request #897 from middleman/readme-license-contributing Thomas Reynolds 2013-05-18 13:25:13 -07:00
f20101ac32 add CONTRIBUTING.md / LICENSE.md, rejig README.md / .gemspec Karl Freeman 2013-05-17 13:34:15 +01:00
15cfbd3b51 bump v3.1.0.rc.1 Thomas Reynolds 2013-05-16 17:03:32 -07:00