middleman

deac/middleman

Fork 0

Commit graph

d181ec5f4f Remove use of full_path and odd options from auto_tag Ben Hollis 2012-09-16 01:56:14 -07:00
8ec42df641 Correctly preview directory URLs with .s in them and show the request path on 404 pages. Ben Hollis 2012-09-15 23:36:00 -07:00
8e808a2324 Merge pull request #598 from bhollis/load_path Thomas Reynolds 2012-09-16 00:10:26 -07:00
8bd98c0d2c Merge pull request #600 from bhollis/doubleinit Thomas Reynolds 2012-09-16 00:08:34 -07:00
aa6b0482ae No longer initialize the app twice when starting preview server Ben Hollis 2012-09-15 22:38:25 -07:00
e35ce52803 Stop messing with load path in middleman executable Ben Hollis 2012-09-10 21:01:17 -07:00
0327e2067f Merge pull request #596 from bhollis/cli Thomas Reynolds 2012-09-15 18:09:53 -07:00
e0b88d91be Add skip-gemfile, skip-bundle, and skip-git options to middleman init, aligning with rails options. Ben Hollis 2012-09-14 23:31:44 -07:00
493d782875 bump 3.0.4 v3.0.4 Thomas Reynolds 2012-09-13 10:52:11 -07:00
77be952d41 Trying to return from a block is a bad idea Thomas Reynolds 2012-09-13 10:51:16 -07:00
06578c61fa prep 3.0.3 v3.0.3 Thomas Reynolds 2012-09-13 10:25:49 -07:00
345e7787b5 reloading fixes Thomas Reynolds 2012-09-13 10:13:57 -07:00
04f29139cb Add README files for each directory Brad Dielman + Joe Fiorini 2012-08-29 18:15:58 -04:00
f1038eb566 Make sure we keep the empty directories Joe Fiorini 2012-08-29 17:44:53 -04:00
8f49e41422 Refactor structure into folders Brad Dielman + Joe Fiorini 2012-08-29 17:29:42 -04:00
09ba0049d4 Fix asset_hashing assets affected by Rack middleware or mounted apps (like sprockets). Fixes #558 Ben Hollis 2012-09-10 21:56:12 -07:00
4076666c19 Add test for asset_hashing rack-filtered items. Adam Luikart 2012-09-06 14:30:47 -05:00
266e24e03e 3.0.2 v3.0.2 Thomas Reynolds 2012-09-05 16:24:43 -07:00
fcd36f587b Merge pull request #585 from adamesque/master Thomas Reynolds 2012-09-05 16:12:08 -07:00
c2f7303041 h5bp 4.0 renames script.js to main.js. Fixes failing cli_init test. Adam Luikart 2012-09-05 15:42:49 -05:00
a96a41004c Logger has no such method .warning. Closes #582 Thomas Reynolds 2012-09-05 10:21:02 -07:00
4b085ea79f HTML5 Boilerplate 4.0 v3.0.1 Thomas Reynolds 2012-09-04 09:48:52 -07:00
851652bb6c prep 3.0.1 Thomas Reynolds 2012-09-04 09:42:52 -07:00
05834ad386 Test relative_assets with i18n Thomas Reynolds 2012-09-02 10:04:43 -07:00
56c6327aed fix windows gem name Thomas Reynolds 2012-09-01 15:02:49 -07:00
1d8319b45b merge v3.0.1.pre Thomas Reynolds 2012-09-01 12:27:55 -07:00
0e75df16aa Lets try pre instead Thomas Reynolds 2012-09-01 12:21:02 -07:00
971e38dc33 Lets try pre instead Thomas Reynolds 2012-09-01 12:21:02 -07:00
4bbc225559 Prep 3.0.1 Thomas Reynolds 2012-09-01 08:45:43 -07:00
9b9146b437 The return of the windows gem, for wdm and speedier file watching support Thomas Reynolds 2012-08-31 09:22:17 -07:00
a5d8ab08ff Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2012-08-28 16:08:43 -07:00
1998668a87 Disable buggy color-compression in built-in Rainpress CSS minification. Fixes #576 Thomas Reynolds 2012-08-28 16:08:34 -07:00
fea92e29cc Merge pull request #572 from tvaughan/patch-1 Thomas Reynolds 2012-08-22 20:17:51 -07:00
4c48baeee6 Update middleman-core/lib/middleman-core/templates/extension/Rakefile Tom Vaughan 2012-08-22 12:19:45 -07:00
1c32c5fd74 missing gitignore Thomas Reynolds 2012-08-22 11:03:14 -07:00
193f32b9fb Add test gems to extension and a gitignore. Closes #570 Thomas Reynolds 2012-08-20 19:37:10 -07:00
f7fc041034 Check whether a Pathname exists before calling realpath in build. Closes #569 Thomas Reynolds 2012-08-20 19:28:43 -07:00
5a88184769 lock therubyrhino gem dep Thomas Reynolds 2012-08-16 13:56:25 -07:00
54c055ea5e Hack a way to pass Middleman context into Slim filters Thomas Reynolds 2012-08-16 13:48:34 -07:00
8e7041994f Wire-up and document smacss template Thomas Reynolds 2012-08-14 13:47:11 -07:00
b3fd8629d3 Merge pull request #562 from nsteiner/smacss Thomas Reynolds 2012-08-14 13:43:57 -07:00
446aa6a4ba Clean up whitespace, play with cane for testing style quality and code complexity Thomas Reynolds 2012-08-13 15:39:06 -07:00
955c66a54f Setup Less paths for imports Thomas Reynolds 2012-08-10 12:29:15 -07:00
7fb6766d4d adding smacss as files instead of a submodule Nate Steiner 2012-08-10 14:19:20 -04:00
893b7baafd removing smacss submodule Nate Steiner 2012-08-10 14:17:10 -04:00
e29dfa4ab7 adding smacss submodule Nate Steiner 2012-08-10 11:29:19 -04:00
f639f6e53a Bump eventmachine dep on windows v2.0.16.1 Thomas Reynolds 2012-08-02 12:22:40 -07:00
80e36b7c53 Given file-based metadata precedence over config/path metadata. Fixes #552 Thomas Reynolds 2012-07-29 10:22:57 -07:00
0625d96e43 Merge pull request #552 from cwebbdesign/master Thomas Reynolds 2012-07-29 10:12:06 -07:00
d0a36f0879 Adding tests for using front matter to override layout set in config cwebbdesign 2012-07-27 10:57:48 +02:00
a0c11df4cc Adding tests for overriding layouts using frontmatter cwebbdesign 2012-07-27 10:55:30 +02:00
4410d858f2 Merge pull request #550 from rumpuslabs/instance_vars_fix Thomas Reynolds 2012-07-26 13:46:56 -07:00
f1eae1e0c8 Correct path in sass-assets-path test Thomas Reynolds 2012-07-25 11:50:56 -07:00
1c9810483b Ruby 1.8-friendly markdown image test Thomas Reynolds 2012-07-25 11:39:17 -07:00
6ccf5e2db0 Don't catch CoffeeScript errors when in build mode. Fixes #551 Thomas Reynolds 2012-07-25 11:21:07 -07:00
99a8723ea6 Fix instance variables in dynamic pages Tim Bates 2012-07-23 15:15:10 +09:30
2f7371ca1f Oops, make NullProfiler actually work Ben Hollis 2012-07-19 22:47:03 -07:00
00b590eedb Support profiling server startup and build via a --profile flag Ben Hollis 2012-07-18 22:10:02 -07:00
3f21f7bc62 Merge pull request #541 from middleman/load_paths Thomas Reynolds 2012-07-19 18:22:04 -07:00
923f7e8408 Merge pull request #545 from bhollis/optimize Thomas Reynolds 2012-07-19 10:58:46 -07:00
1f6d1a7ee1 Extract load_paths so they aren't locked into the binary Thomas Reynolds 2012-07-16 17:24:13 -07:00
62fa17cf1a Reduce work converting paths from relative to absolute and back again Ben Hollis 2012-07-19 01:17:50 -07:00
1f22184fc7 Don't request __middleman__ Ben Hollis 2012-07-18 23:59:55 -07:00
888ee078cc Merge pull request #544 from bhollis/markdown Thomas Reynolds 2012-07-18 23:57:13 -07:00
e6c7caaa83 Test for Redcarpet using our link_to and image_tag helpers Ben Hollis 2012-07-18 22:57:52 -07:00
639a4b2459 Merge pull request #535 from middleman/logger Thomas Reynolds 2012-07-18 09:31:12 -07:00
de6d7980ac Use centralized Logger and add instrument methods Thomas Reynolds 2012-07-15 11:04:45 -07:00
95339dad23 Added :js_assets_paths for external JS repositories kematzy 2012-07-16 16:58:30 +08:00
3ea2241155 Added :sass_assets_path for external SASS repositories kematzy 2012-07-16 16:50:02 +08:00
6f0f9b00a2 Merge pull request #536 from kematzy/fix-sass-cache-location Thomas Reynolds 2012-07-16 22:14:05 -07:00
5368875d05 Moved :sass_cache_path from global to Sass renderer kematzy 2012-07-17 09:35:40 +08:00
7d77de3692 Merge pull request #539 from theotheo/master Thomas Reynolds 2012-07-16 14:23:47 -07:00
0b1b8ca7d1 Update susy gem installation command. theotheo 2012-07-17 00:52:06 +04:00
c00f9d5782 Tests for :sass_cache_path custom config kematzy 2012-07-16 14:39:26 +08:00
1de1d3d25e Added :sass_cache_path custom config of SASS cache directory kematzy 2012-07-16 14:34:36 +08:00
9dad67bf9b Update master Thomas Reynolds 2012-07-15 12:14:29 -07:00
a8f45b1e17 Merge pull request #532 from rumpuslabs/markdown-not-nil Thomas Reynolds 2012-07-15 12:13:46 -07:00
d88f2fade0 Merge pull request #521 from bhollis/markdown Thomas Reynolds 2012-07-15 12:09:39 -07:00
aa35b8f0f0 Markdown engine should not be nil Tim Bates 2012-07-15 23:02:04 +09:30
e59241c036 Merge pull request #531 from m-o-e/chdir_fix Thomas Reynolds 2012-07-14 11:28:34 -07:00
cf897e1e9e Use plain Dir.chdir instead of enclosing middleman in a Dir.chdir-block. moe 2012-07-14 14:46:46 +02:00
9371eb2057 Merge pull request #530 from rumpuslabs/trailing_slash Thomas Reynolds 2012-07-13 09:06:14 -07:00
0fa1bfe675 Tests and a small bug fix to make them pass Tim Bates 2012-07-13 16:00:53 +09:30
3cbda0ee36 Added strip_index_file option for configuring urls Tim Bates 2012-07-13 10:57:05 +09:30
2117cbac79 Make directory_indexes check the destination_path Tim Bates 2012-07-12 15:02:48 +09:30
692aa10c8b Add trailing_slash option for prettier urls Tim Bates 2012-07-12 12:03:33 +09:30
5c9a5c9849 Merge pull request #528 from rumpuslabs/sitemap_patches Thomas Reynolds 2012-07-11 10:43:20 -07:00
d30f883e48 Regenerate @_lookup_cache after each manipulation Tim Bates 2012-07-11 15:16:18 +09:30
ffecc3e4cc Optimisation, Hash#delete returns the deleted item Tim Bates 2012-07-11 15:14:08 +09:30
f062bb7c3d Merge pull request #518 from bhollis/proxy Thomas Reynolds 2012-07-09 12:42:40 -07:00
174000c1a2 3.0 [ci skip] v3.0.0 Thomas Reynolds 2012-07-09 10:00:49 -07:00
67ceb47952 Merge pull request #519 from bhollis/fixes Thomas Reynolds 2012-07-09 08:15:48 -07:00
d52e555dcd Merge pull request #520 from bhollis/image_sizes Thomas Reynolds 2012-07-09 08:14:29 -07:00
7be0590acf Use middleman's image_tag and link_to helpers from within Redcarpet markdown Ben Hollis 2012-07-09 00:17:43 -07:00
4c5b614fe2 Make :automatic_image_sizes work for absolute image paths Ben Hollis 2012-07-09 00:16:54 -07:00
f908b378c5 Fiter out annoying "Could not determine content-length of response body." messages from verbose logging Ben Hollis 2012-07-09 00:16:13 -07:00
324eac428e Ignore emacs temporary files Ben Hollis 2012-07-08 19:01:06 -07:00
d05f968feb Fix all_files_under - not all non-files are directories Ben Hollis 2012-07-08 18:35:50 -07:00
12c551228f Don't allow people to proxy a path to itself, or to another proxy. Ben Hollis 2012-07-07 20:36:37 -07:00
6dad42bc77 Fix gzip extension Ben Hollis 2012-07-07 20:50:43 -07:00