Commit graph

3113 commits

Author SHA1 Message Date
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
Thomas Reynolds
0861fad2e1 Adding ignore 2015-08-17 15:59:48 -07:00
Thomas Reynolds
241fe69f7d Adding ignore 2015-08-17 14:33:19 -07:00
Thomas Reynolds
9886e04a95 Patch around seemingly invalid logic in Listen v3 2015-08-17 14:28:15 -07:00
Thomas Reynolds
226099d64e Bump listen for test 2015-08-17 10:55:34 -07:00
Thomas Reynolds
50bf848ee8 Add config CLI command 2015-08-17 10:48:56 -07:00
Thomas Reynolds
bb6b8c7f13 Replace Hamster hash for user-accessible data with Hashie Indifferent access 2015-08-12 15:29:06 -07:00
Thomas Reynolds
23cf612dd9 bump sprockets branch 2015-08-12 10:51:06 -07:00
Thomas Reynolds
fb6bca234f Update to newer cucumber and aruba 2015-08-10 16:58:36 -07:00
Thomas Reynolds
ee5e8ff4a1 Merge pull request #1581 from jsdalton/bug/incorrect-file-watch-config
Fix misnamed config value which was causing --force-polling flag to b…
2015-08-10 16:58:17 -07:00
Jim Dalton
1a3f96b58f Fix misnamed config value which was causing --force-polling flag to be ignored by file_watcher extension 2015-08-10 15:04:47 -07:00
Thomas Reynolds
8cce9b8a8c Loudly announce external pipeline errors and exit with failure. 2015-08-10 10:00:23 -07:00
Thomas Reynolds
dcbeb7dc76 Remove fivemat 2015-08-06 11:06:34 -07:00
Thomas Reynolds
b0c90e1192 Merge pull request #1580 from maxmeyer/feature/bump_cucumber
Bump version of cucumber
2015-08-06 10:35:27 -07:00
Max Meyer
dc4057d8dc Bump version of cucumber 2015-08-05 22:51:25 +02:00
Thomas Reynolds
0fba2ae2f6 Fix config meta page 2015-08-05 13:37:03 -07:00
Thomas Reynolds
837a679aa7 bump thor 2015-07-24 14:51:20 -07:00
Thomas Reynolds
a528659034 Bump listen to 3.0 2015-07-24 14:20:04 -07:00
Thomas Reynolds
7bfacd565a Update change log 2015-07-24 13:48:43 -07:00
Dennis Günnewig
63e9cd9b5f Substitue whitespace in name 2015-07-24 13:48:32 -07:00
Thomas Reynolds
c69099c451 Really fix #1568 2015-07-24 13:46:33 -07:00