deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2900 commits 11 branches 271 tags 23 MiB
Commit graph

2900 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds ab567b1cbd Merge pull request #1405 from dennisreimann/asset_hash-srcset 
Asset hashing for image references in srcset
 2014-11-16 12:42:51 -08:00
Thomas Reynolds 3eafb4fcf4 Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable 2014-11-16 12:35:45 -08:00
Dennis Reimann e28ed20c63 Asset hashing for image references in srcset 
Fixes #1287
 2014-11-16 21:25:28 +01:00
Thomas Reynolds 20552164aa Merge pull request #1404 from blech75/ignore_git_dir_on_init 
exclude .git folder when init'ing a local template
 2014-11-13 14:33:01 -08:00
justin blecher dcca8968c8 exclude .git folder when init'ing a local template 
freshly init'd middleman projects from a local template should not
include the git files from that template because that's confusing.
this is to help users who clone git repos into `~/.middleman/`.
 2014-11-12 19:12:52 -05:00
Thomas Reynolds be98103e05 An attempt to fix #1402 2014-11-09 11:30:11 -08:00
Thomas Reynolds c231e00f00 bump 2014-11-08 21:06:17 -08:00
Eliott Appleford 4f93adffcc Merge pull request #1401 from claudiob/bring-fix-1582-from-padrino-against-v3-stable 
Import patch to bugfix from Padrino Helpers
 2014-11-08 22:22:25 +00:00
claudiob 9d49b08426 Import patch to bugfix from Padrino Helpers 
Padrino had an issue https://github.com/padrino/padrino-framework/issues/1582
which was solved at 72769fe39a (diff-526024418d0d573e08d46ba3d55c02bcR36)

This commit brings the same fix back into Middleman's method that
overrides Padrino's method.
 2014-11-08 13:01:13 -08:00
Thomas Reynolds ebe2164fe9 Merge pull request #1398 from maxmeyer/feature/switch_current_working_dir 
Switch to current working directory during testing
 2014-11-03 08:02:48 -08:00
Max Meyer f4ce1ff99d Switch to current working directory during testing 2014-11-03 09:17:43 +01:00
Thomas Reynolds 7c37d4ba51 Merge pull request #1338 from dg-ratiodata/feature/chained_templates_partials 
Chained template parsing failed if parent is "html.erb" and child is "html.md.erb"
 2014-10-23 15:25:10 -07:00
Thomas Reynolds 65d3a0c84f Be a bit safer about checking source_file in Sitemap Preview. Working towards fixing #1166 2014-10-20 11:24:52 -07:00
Thomas Reynolds 91d0d39569 stylistic change 2014-10-20 11:19:30 -07:00
Thomas Reynolds c7922c4a35 move actual type detection to sprockets 2014-10-18 12:56:52 -05:00
Thomas Reynolds 6a3d2e7e4e slightly better types debug message 2014-10-18 12:50:18 -05:00
Thomas Reynolds d0a9f01b2f Treat source file types more like tags, allow a set of them 2014-10-18 12:45:49 -05:00
Thomas Reynolds 54e10cf472 yield self along with options in extension activation 2014-10-18 12:11:18 -05:00
Thomas Reynolds 127fba17ef Merge pull request #1307 from middleman/collections 
Collections
 2014-10-15 17:19:43 -05:00
Thomas Reynolds a95dbb6367 Collections 2014-10-15 14:34:53 -05:00
Thomas Reynolds 445443cffc Add a bit of laziness 2014-10-15 14:25:06 -05:00
Thomas Reynolds e36054b605 Merge pull request #1391 from natebird/patch-1 
Add 3.3.6 changes to Changelog
 2014-10-13 07:47:31 -05:00
Nate Bird fea9a38372 Add 3.3.6 changes to Changelog 2014-10-13 07:42:05 -04:00
Thomas Reynolds ddfa37faee Use HTTPS by default in new project Gemfiles. Closes #1372 2014-10-12 09:38:14 -05:00
Thomas Reynolds 49a7c1f3da Merge pull request #1389 from tricknotes/ruby-2.2 
Test against Ruby 2.2.0 on Travis CI
 2014-10-09 09:26:31 -07:00
Ryunosuke SATO 1142630dc8 Test against Ruby 2.2.0 on Travis CI 2014-10-09 00:30:35 +09:00
Thomas Reynolds 144660660f Merge pull request #1381 from minusfive/asset-hash-json 
Parse asset-hashes on JSON files
 2014-09-28 15:06:39 -07:00
minusfive 17cddce675 Parse asset-hashes on JSON files 2014-09-28 16:39:46 -04:00
Thomas Reynolds 1b0b666130 bump 2014-09-15 15:36:57 -07:00
Thomas Reynolds e326e10e98 listen gem started using full paths instead of relative. Fixes #1374 2014-09-15 15:36:41 -07:00
Thomas Reynolds f73e89370d execute modes as configure blocks 2014-09-11 09:40:10 -07:00
Thomas Reynolds e4090760e8 Merge pull request #1371 from AndrewKvalheim/console 
Add a basic feature test for the console.
 2014-09-10 18:27:27 -07:00
Andrew Kvalheim ba6ca5b3b7 Fix bug with starting the console. 2014-09-10 16:12:04 -07:00
Andrew Kvalheim 00b4ac6867 Add a basic feature test for the console. 2014-09-10 16:12:04 -07:00
Thomas Reynolds 2ff64fe3a3 Merge pull request #1369 from dg-ratiodata/feature/force_init 
Add force option to "middleman init"
 2014-09-09 08:43:27 -07:00
Dennis Günnewig d45911f7b8 Add force-option to init 2014-09-09 09:19:41 +02:00
Dennis Günnewig 55e3c93278 Feature tests for force-option 2014-09-09 09:19:31 +02:00
Dennis Günnewig fbe1585ce6 Rubocop fails faster than 'rake test' 2014-09-09 09:19:31 +02:00
Dennis Günnewig b78515ce91 Fixed rubocop offense 2014-09-09 09:02:50 +02:00
Thomas Reynolds 313a2398d4 attempt to get compass 1 working 2014-09-02 12:43:20 -07:00
Thomas Reynolds 5a85d177c2 Catch File read exceptions in frontmatter 2014-08-29 10:24:45 -07:00
Thomas Reynolds e28850c9d7 slim down travis 2014-08-24 19:06:31 -07:00
Thomas Reynolds df22160173 apparently nums are freezable 2014-08-24 18:30:14 -07:00
Thomas Reynolds 5c18b85a8e more freeze fixin 2014-08-24 18:11:56 -07:00
Thomas Reynolds 1d5ae59db9 Lazy isn't in 1.9.3 :( 2014-08-24 17:35:02 -07:00
Thomas Reynolds 84acb50b02 Optimize globbed file lookups, fixes nasty performance regression 2014-08-24 17:10:25 -07:00
Thomas Reynolds 6ef96cc15a more instrumenting 2014-08-24 15:49:53 -07:00
Thomas Reynolds c3492b1f7b Fix partial lookup 2014-08-24 14:38:06 -07:00
Thomas Reynolds 07ac578a31 merge 2014-08-24 11:36:42 -07:00
Thomas Reynolds 18825e7ced no reason for image sizes to touch the alt attr 2014-08-22 09:36:07 -07:00