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

2883 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds d2251de898 Bump Padrino 2015-10-12 12:37:33 -07:00
Thomas Reynolds 6357f4f5b8 Add back app.set, but mark as deprecated 2015-10-12 12:37:07 -07:00
Thomas Reynolds eb82f402a0 gem bumps 2015-10-05 09:48:17 -07:00
Thomas Reynolds f4bff73b7b Merge pull request #1622 from y-yagi/master_remove_unnecessary_require 
remove unnecessary require
 2015-10-04 17:57:55 -07:00
yuuji.yaginuma e26f83e1c2 remove unnecessary require 
`require 'rubygems'` is already required in Ruby 1.9 or later.
 2015-10-04 07:24:21 +09:00
Thomas Reynolds e9abfe1134 rubocop 2015-10-01 13:54:54 -07:00
inoue_sachiro 67fc3d0c05 Fix: Can't clean files when the project is under a hidden directory. 2015-10-01 13:54:45 -07:00
Thomas Reynolds fd6a2376bd Fix frontmatter on 2.0 2015-10-01 10:25:53 -07:00
Thomas Reynolds d828067189 Fix sass helpers in SassC context 2015-09-30 11:16:57 -07:00
Thomas Reynolds 0698d7f5aa Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression" 
This reverts commit 5e3ddbf988.
 2015-09-30 10:24:12 -07:00
Eliott Appleford 9686c1ec7a Merge pull request #1611 from middleman/Arcovion-patch-2 
Fix frontmatter regex
 2015-09-30 08:17:18 +01:00
Eliott Appleford b389c26b4e Fix frontmatter regex 2015-09-30 04:58:59 +00:00
Eliott Appleford 9df1a45301 Strip newline after frontmatter 
Closes #1610
 2015-09-30 05:00:57 +01:00
Thomas Reynolds 5e3ddbf988 Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression 2015-09-29 10:27:53 -07:00
Thomas Reynolds d9fc7a95e1 Fix a bad i18n regression 2015-09-28 14:52:16 -07:00
Thomas Reynolds 04c133c90f Fix minify css tests 2015-09-28 13:58:49 -07:00
Thomas Reynolds 32891dc6fe SassC, woot 2015-09-28 11:24:37 -07:00
Eliott Appleford 97cd1c1411 Fix JSON frontmatter parsing 2015-09-24 20:27:36 +01:00
Thomas Reynolds fe66beacc3 Test fix WIP 2015-09-23 16:20:16 -07:00
Eliott Appleford ddc4a3cabc Update data.rb 2015-09-23 23:40:42 +01:00
Thomas Reynolds 5afc138eb8 Merge pull request #1608 from middleman/frontmatter 
Fix frontmatter parsing changes from #1608
 2015-09-23 15:23:05 -07:00
Eliott Appleford 47bdcb2d9c Fix frontmatter parsing changes from #1608 
Only allow frontmatter at the top of the page:
  Now manually removing encoding lines as before

Fix handling of postscript data:
  If there is no frontmatter and the filetype is known,
  parse the whole file

Allow empty frontmatter

Update the documentation comments
 2015-09-23 21:45:52 +00:00
Eliott Appleford 11fc90f93c Merge pull request #1604 from middleman/frontmatter 
Refactor frontmatter parsing
 2015-09-21 13:33:43 +01:00
Eliott Appleford 91a06a1a35 Refactor util/data.rb further 2015-09-20 12:34:15 +00:00
Eliott Appleford 62f431b5ae Refactor frontmatter parsing 
Closes #1603
 2015-09-20 12:24:48 +00:00
Thomas Reynolds d3d32731e1 more test fixes 2015-09-19 16:00:38 -07:00
Thomas Reynolds 765de5ab11 Remove ancient twitter bootstrap test. Use npm or bower, y'all 2015-09-19 14:39:55 -07:00
Thomas Reynolds 3e1fc0aa1f Change test to respect global relative assets change 2015-09-19 14:26:30 -07:00
Thomas Reynolds 3ae28874bf Fix test breakage 2015-09-19 14:07:42 -07:00
Thomas Reynolds 2907761556 tweak logger ref 2015-09-17 14:46:27 -07:00
Thomas Reynolds fdabd87957 merge in fixes from stable 2015-09-17 13:53:43 -07:00
Thomas Reynolds 409a892da7 Forward port some stable changes 2015-09-17 09:41:17 -07:00
Thomas Reynolds a251c82562 Add test for #1568 2015-09-17 09:25:04 -07:00
Thomas Reynolds 2b2ee10d81 dont autoload stuff when bundler will load 2015-09-16 14:01:39 -07:00
Thomas Reynolds 260c6be66c Move compass and sprockets to template config 2015-09-16 10:53:31 -07:00
Thomas Reynolds ed405b266f bump target ruby version 2015-09-14 17:46:12 -07:00
Thomas Reynolds 8c02eb2a26 Some tweaks to get blog working 2015-09-14 17:37:35 -07:00
Thomas Reynolds d99b922e67 Let's do this 2015-09-12 16:16:26 -07:00
Thomas Reynolds 40f023f01c Let's do this 2015-09-12 16:15:32 -07:00
Thomas Reynolds 441dc2faa6 Revert breaking resource source_file api. For #1595 2015-09-09 11:55:56 -07:00
Thomas Reynolds 8a349322ac Merge pull request #1593 from komor72/patch-1 
Update middleman-livereload version to more current
 2015-09-03 10:09:54 -07:00
Rafał Komorowski 0d4d82a01a Update middleman-livereload version to more current 
As discussed https://github.com/middleman/middleman-livereload/issues/69 but I forgot to apply the fix to source code inside MM. @tdreyno, should it be `~> 3.3.0` or `~> 3.4.0`? I looked into 3.4 changes and they seem to be MM v4 related?
 2015-09-03 18:25:43 +02:00
Thomas Reynolds d849930e51 Don't set mode AND environment with the same ENV 2015-09-01 09:58:13 -07:00
Thomas Reynolds 7a28fd0a50 disable osx builds for now 2015-08-31 11:25:22 -07:00
Thomas Reynolds 5cab7c46a9 Store intermediate resources in reducer so the array is not empty the first run. Addresses #1590 2015-08-31 11:18:45 -07:00
Thomas Reynolds 60d88139af Merge pull request #1588 from bradgessler/patch-1 
Fix typo in server CLI.
 2015-08-28 15:29:13 -07:00
Brad Gessler 8bdeab50ee Fix typo in server CLI. 2015-08-28 13:08:56 -07:00
Thomas Reynolds f76561d101 Add logger require in rack. Addresses #1550 2015-08-28 09:58:10 -07:00
Thomas Reynolds 9ed0796b4a Move some extension setup to ready event 2015-08-20 17:45:18 -07:00
Thomas Reynolds 3485f49f74 Use Hashie Mash for recursive indifferent 2015-08-18 16:22:32 -07:00