middleman

deac/middleman

Fork 0

Commit graph

e4b5202238 Provide some helpful error messages when link_to is used improperly Ben Hollis 2013-02-06 00:16:30 -08:00
42320ade8d Force svgz to be binary Ben Hollis 2013-02-06 00:26:21 -08:00
3a3d5bbe3b Override form_tag to use url_for. Fixes #739 Ben Hollis 2013-02-08 23:00:29 -08:00
ba035882fe Test for url_for Ben Hollis 2013-02-08 22:40:27 -08:00
6fa6c021c0 Refactor out a url_for method Ben Hollis 2013-02-08 22:22:33 -08:00
3bdbc11db2 Change the behavior of before_render and after_render hooks from #761. Ben Hollis 2013-02-10 12:05:07 -08:00
5e12c68f1b Merge pull request #773 from JonRowe/patch-1 Ben Hollis 2013-02-10 10:58:10 -08:00
b94be9ed93 Removed outdated information. Jon Rowe 2013-02-10 21:49:32 +11:00
f3750c7c01 Merge pull request #772 from bhollis/binary Ben Hollis 2013-02-09 17:31:12 -08:00
ae7f75e5cc Relative Assets shouldn't return a Pathname sometimes, the rest of the code expects Strings Thomas Reynolds 2013-02-09 15:53:21 -08:00
700b844e67 Add a spec for testing Middleman::Util#binary? Ben Hollis 2013-02-09 15:45:45 -08:00
9d54010656 Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable Thomas Reynolds 2013-02-09 15:49:03 -08:00
76d09a4964 Pathname issues when combining relative assets and cache buster Thomas Reynolds 2013-02-09 15:37:08 -08:00
559265140d Stub out rspec tests for public APIs: Rack and Sitemap for now Thomas Reynolds 2012-10-27 11:47:06 -07:00
923697b517 Micro-optimizations around string comparisons Ben Hollis 2013-02-09 00:20:37 -08:00
ed119bed7b Support .yaml files for i18n Ben Hollis 2013-02-09 10:15:25 -08:00
0f2dc82138 Add vendor.yml to exclude our fixtures from GitHub language stats Ben Hollis 2013-02-09 15:12:35 -08:00
7f7ce07910 Merge pull request #756 from bhollis/yaml Thomas Reynolds 2013-02-09 14:40:10 -08:00
3db5d0ca6a Merge pull request #771 from bhollis/i18n Thomas Reynolds 2013-02-09 14:39:28 -08:00
fbc4d7e9c7 Handle non-english default languages. Fixes #584 Ben Hollis 2013-02-09 12:40:43 -08:00
afc62d5a26 i18n tweaks Ben Hollis 2013-02-09 12:34:30 -08:00
7020bdce1a Failing test for #584 "i18n fails when default locale is not english" Ben Hollis 2013-02-09 12:44:37 -08:00
1af96fe305 Fix gemspecs Ben Hollis 2013-02-09 10:28:55 -08:00
7e0ae0e59c Support .yaml files for i18n Ben Hollis 2013-02-09 10:15:25 -08:00
dd80d22b6a Merge pull request #767 from bhollis/deps Thomas Reynolds 2013-02-08 23:15:49 -08:00
de7e621766 Revert the more-flexible Thor dependency since it breaks bundle install for JRuby and we will need to update Padrino when it gets upgraded anyway Ben Hollis 2013-02-08 00:05:34 -08:00
c9290c6b11 Allow frontmatter to be parsed on templates outside the project root Thomas Reynolds 2013-02-06 13:19:09 -08:00
8d5dd8e8ce Merge pull request #763 from zuf/patch-1 Ben Hollis 2013-02-06 00:28:37 -08:00
4e88414478 blksize was replaced with fixed value because windows issues Egor Vakhromtsev 2013-02-06 12:14:24 +04:00
137ce94d23 Restore indifferent-access behavior to page data and fix broken caching Ben Hollis 2013-02-05 23:34:18 -08:00
bb2f40cc72 Merge branch '3.0-stable' Ben Hollis 2013-02-05 22:07:05 -08:00
8996e65fd1 Merge pull request #761 from LeonB/3.0-stable Thomas Reynolds 2013-02-02 14:08:10 -08:00
83c8f9a2ce Fix huge files regression (for undetected mime) Egor 2013-02-02 00:26:58 +04:00
81acdca5f9 Update README.md Thomas Reynolds 2013-02-01 10:02:43 -08:00
cc988ee302 Added before_render & after_render hook Can be used for pre-processing content Leon Bogaert 2013-01-31 23:04:49 +01:00
ec94b3710b Merge pull request #760 from k33l0r/patch-1 Thomas Reynolds 2013-01-31 10:50:01 -08:00
80c464a96f Fixes the Travis CI status image Matias Korhonen 2013-01-31 15:57:19 +02:00
aa6564f038 Don't catch Exception when parsing YAML frontmatter Ben Hollis 2013-01-27 17:11:54 -08:00
5cedd4c37c Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-01-26 01:01:01 -08:00
5f84833fc5 loosening our thor dependency in advance of padrino updating to 0.16. Closes #751 Thomas Reynolds 2013-01-25 23:04:52 -08:00
49cf6c53c6 Merge pull request #752 from bhollis/gemfile Thomas Reynolds 2013-01-25 22:58:09 -08:00
6dbe7f7a5a Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs. Ben Hollis 2013-01-25 22:31:40 -08:00
c0c14f4eab Merge remote-tracking branch 'origin/3.0-stable' Ben Hollis 2013-01-25 21:43:30 -08:00
7c9c4d03db Make build error message code a bit more compact Ben Hollis 2013-01-25 20:22:45 -08:00
8f0cc92f1b Merge pull request #750 from sethvargo/better_error_message Ben Hollis 2013-01-25 20:13:35 -08:00
95fa217cec Say middleman build instead of just middleman Seth Vargo 2013-01-25 21:23:24 -05:00
12753c5759 add quotes and bundle exec to error message Seth Vargo 2013-01-24 12:40:24 -05:00
1af216240a prep v3.0.11 Thomas Reynolds 2013-01-22 23:14:35 -08:00
2d28272396 Merge pull request #736 from bhollis/master Thomas Reynolds 2013-01-22 23:14:15 -08:00
da39484767 Mitigate major perf regression caused by the Middleman::Util#binary? method Ben Hollis 2013-01-22 00:59:54 -08:00
c34b425f45 prep v3.0.10 Thomas Reynolds 2013-01-21 11:42:34 -08:00
17ad2caf11 also "build" .htpasswd files Steven Sloan 2013-01-18 20:13:49 -05:00
00581876b5 Merge pull request #740 from stevenosloan/add_htpasswd Ben Hollis 2013-01-18 19:56:27 -08:00
c121c407df also "build" .htpasswd files Steven Sloan 2013-01-18 20:13:49 -05:00
16b3a729cd 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
cad7f8a0a4 disable cane Thomas Reynolds 2013-01-14 23:33:16 -08:00
af132f6207 disable cane Thomas Reynolds 2013-01-14 23:33:16 -08:00
ae9e6e722e bye bye pry Thomas Reynolds 2013-01-14 22:41:11 -08:00
4e9ec930c4 bye bye pry Thomas Reynolds 2013-01-14 22:40:37 -08:00
80fb3ff06f merge Thomas Reynolds 2013-01-13 15:22:36 -08:00
c7e35b95ba use .sass-cache everywhere Thomas Reynolds 2013-01-13 15:22:36 -08:00
7c1d55cb38 merge Thomas Reynolds 2013-01-11 17:00:41 -08:00
e3bb956649 Update installation command for susy-gem. Daniel Bayerlein 2013-01-12 16:40:00 +01:00
1b1a5c086e Add --force-polling flag to server. Closes #730. Closes #644 Thomas Reynolds 2013-01-13 11:56:53 -08:00
d4f5e4db29 Add --force-polling flag to server. Closes #730. Closes #644 Thomas Reynolds 2013-01-13 11:56:53 -08:00
428912850f Merge pull request #729 from danielbayerlein/update-susy-command Thomas Reynolds 2013-01-12 17:38:24 -08:00
2dca9e5787 Update installation command for susy-gem. Daniel Bayerlein 2013-01-12 16:40:00 +01:00
277f1b5bb4 merge frontmatter fix Thomas Reynolds 2013-01-11 17:00:41 -08:00
a76b02a55b Don't look for frontmatter on binary files. Fixes #728 Thomas Reynolds 2013-01-11 16:58:02 -08:00
18da6362ba Allow multi-level i18n files. Fixes #725 Thomas Reynolds 2013-01-11 17:00:41 -08:00
2e2516b95a Don't look for frontmatter on binary files. Fixes #728 Thomas Reynolds 2013-01-11 16:58:02 -08:00
0bedb36f3f added font file types to asset_hash extension Nico Hagenburger 2013-01-09 22:07:41 +01:00
7231f9dfe2 Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2013-01-09 13:24:41 -08:00
fbb7820ecd added font file types to asset_hash extension Nico Hagenburger 2013-01-09 22:07:41 +01:00
df539e2743 Fix error with link_to when options are nil Ben Hollis 2013-01-08 19:40:50 -08:00
aa633a1cd3 make windows rack generic again Thomas Reynolds 2013-01-09 09:49:23 -08:00
e82aa6cc61 make blksize work on windows. v3.0.10.pre.1 Thomas Reynolds 2013-01-09 09:49:23 -08:00
1019c7803c Fix error with link_to when options are nil Ben Hollis 2013-01-08 19:40:50 -08:00
8e7a87e167 Merge pull request #714 from bhollis/link_to Thomas Reynolds 2013-01-08 22:53:09 -08:00
3d00e91605 Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3) Ben Hollis 2013-01-08 20:35:57 -08:00
3521b7527b Merge pull request #717 from bhollis/rack Thomas Reynolds 2013-01-08 22:51:31 -08:00
e3b9a41d3b Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3) Ben Hollis 2013-01-08 20:35:57 -08:00
a33ef20726 Fix error with link_to when options are nil Ben Hollis 2013-01-08 19:40:50 -08:00
d6c2cf305b prep 3.0.9 v3.0.9 Thomas Reynolds 2013-01-08 10:33:19 -08:00
eccda125e5 Remove Tilt mappings for missing libraries. Fixes #713 Thomas Reynolds 2013-01-08 10:22:52 -08:00
84239f04a2 lock rack version Thomas Reynolds 2013-01-08 10:06:40 -08:00
49ad35b2c8 correctly handle passing resources into relative link_to Thomas Reynolds 2013-01-07 23:30:04 -08:00
0a580c8b9a prep 3.0.8 v3.0.8 Thomas Reynolds 2013-01-07 22:56:36 -08:00
5b8fae612e backport sass paths fix Nico Hagenburger 2013-01-04 21:14:19 +01:00
3ec36ce07b Merge pull request #707 from hagenburger/master Thomas Reynolds 2013-01-04 17:14:08 -08:00
0ab7cdcbe1 add import paths instead of resetting them Nico Hagenburger 2013-01-04 21:14:19 +01:00
15ca8db58d Revert 8606fb4eba and 40a60efd28 since the original problem had already been solved by handling FastImage::UnknownImageType in 0d806277f9. See #660. Ben Hollis 2013-01-03 22:55:10 -08:00
4ecadd8734 Corrected image_tag helper so that supported_extensions doesn't appear in the tag attributes Krystian 2013-01-03 22:46:45 -05:00
55a674853f Merge pull request #705 from Krystosterone/master Thomas Reynolds 2013-01-03 22:04:53 -08:00
40a60efd28 Corrected image_tag helper so that supported_extensions doesn't appear in the tag attributes Krystian 2013-01-03 22:46:45 -05:00
057c3724fe bump required sprockets Thomas Reynolds 2013-01-03 13:08:19 -08:00
7cd6cd233e Manually copy the file instead of asking Thor to do it v3.0.8.pre.2 Thomas Reynolds 2013-01-02 16:40:42 -08:00
aefcdabb52 prep pre v3.0.8.pre.1 Thomas Reynolds 2013-01-01 19:10:54 -08:00
aefe61b18f Catch bad URI errors Thomas Reynolds 2013-01-01 17:40:54 -08:00
ed5893ffcd Add a :query option to link_to to allow specifying query string Ben Hollis 2012-12-30 16:27:33 -08:00