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

1565 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds
a96a41004c Logger has no such method .warning. Closes #582 2012-09-05 10:21:02 -07:00
Thomas Reynolds
4b085ea79f HTML5 Boilerplate 4.0 2012-09-04 09:48:52 -07:00
Thomas Reynolds
851652bb6c prep 3.0.1 2012-09-04 09:42:52 -07:00
Thomas Reynolds
05834ad386 Test relative_assets with i18n 2012-09-02 10:04:43 -07:00
Thomas Reynolds
56c6327aed fix windows gem name 2012-09-01 15:02:49 -07:00
Thomas Reynolds
1d8319b45b merge 2012-09-01 12:27:55 -07:00
Thomas Reynolds
0e75df16aa Lets try pre instead 2012-09-01 12:26:41 -07:00
Thomas Reynolds
971e38dc33 Lets try pre instead 2012-09-01 12:22:34 -07:00
Thomas Reynolds
4bbc225559 Prep 3.0.1 2012-09-01 08:45:43 -07:00
Thomas Reynolds
9b9146b437 The return of the windows gem, for wdm and speedier file watching support 2012-09-01 08:44:02 -07:00
Thomas Reynolds
a5d8ab08ff Merge branch 'master' of github.com:middleman/middleman 2012-08-28 16:08:43 -07:00
Thomas Reynolds
1998668a87 Disable buggy color-compression in built-in Rainpress CSS minification. Fixes #576 2012-08-28 16:08:34 -07:00
Thomas Reynolds
fea92e29cc Merge pull request #572 from tvaughan/patch-1 
Update middleman-core/lib/middleman-core/templates/extension/Rakefile
 2012-08-22 20:17:51 -07:00
Tom Vaughan
4c48baeee6 Update middleman-core/lib/middleman-core/templates/extension/Rakefile 
A default target is required by travis-ci.org. Another option is to provide a .travis.yml that looks like:

    script: "bundle exec rake test"
 2012-08-22 12:19:45 -07:00
Thomas Reynolds
1c32c5fd74 missing gitignore 2012-08-22 11:03:14 -07:00
Thomas Reynolds
193f32b9fb Add test gems to extension and a gitignore. Closes #570 2012-08-20 19:37:10 -07:00
Thomas Reynolds
f7fc041034 Check whether a Pathname exists before calling realpath in build. Closes #569 2012-08-20 19:28:43 -07:00
Thomas Reynolds
5a88184769 lock therubyrhino gem dep 2012-08-16 13:56:25 -07:00
Thomas Reynolds
54c055ea5e Hack a way to pass Middleman context into Slim filters 2012-08-16 13:48:34 -07:00
Thomas Reynolds
8e7041994f Wire-up and document smacss template 2012-08-14 13:52:07 -07:00
Thomas Reynolds
b3fd8629d3 Merge pull request #562 from nsteiner/smacss 
adding smacss submodule
 2012-08-14 13:43:57 -07:00
Thomas Reynolds
446aa6a4ba Clean up whitespace, play with cane for testing style quality and code complexity 2012-08-13 15:41:07 -07:00
Thomas Reynolds
955c66a54f Setup Less paths for imports 2012-08-10 12:29:15 -07:00
Nate Steiner
7fb6766d4d adding smacss as files instead of a submodule 2012-08-10 14:19:20 -04:00
Nate Steiner
893b7baafd removing smacss submodule 2012-08-10 14:17:10 -04:00
Nate Steiner
e29dfa4ab7 adding smacss submodule 2012-08-10 11:29:19 -04:00
Thomas Reynolds
80e36b7c53 Given file-based metadata precedence over config/path metadata. Fixes #552 2012-07-29 10:22:57 -07:00
Thomas Reynolds
0625d96e43 Merge pull request #552 from cwebbdesign/master 
Adding tests for setting layout in frontmatter on pages already defined in config.rb
 2012-07-29 10:12:06 -07:00
cwebbdesign
d0a36f0879 Adding tests for using front matter to override layout set in config 2012-07-27 10:57:48 +02:00
cwebbdesign
a0c11df4cc Adding tests for overriding layouts using frontmatter 2012-07-27 10:55:30 +02:00
Thomas Reynolds
4410d858f2 Merge pull request #550 from rumpuslabs/instance_vars_fix 
Fix instance variables in dynamic pages
 2012-07-26 13:46:56 -07:00
Thomas Reynolds
f1eae1e0c8 Correct path in sass-assets-path test 2012-07-25 12:05:43 -07:00
Thomas Reynolds
1c9810483b Ruby 1.8-friendly markdown image test 2012-07-25 11:39:17 -07:00
Thomas Reynolds
6ccf5e2db0 Don't catch CoffeeScript errors when in build mode. Fixes #551 2012-07-25 11:22:29 -07:00
Tim Bates
99a8723ea6 Fix instance variables in dynamic pages 2012-07-24 23:02:27 +09:30
Ben Hollis
2f7371ca1f Oops, make NullProfiler actually work 2012-07-19 22:47:03 -07:00
Ben Hollis
00b590eedb Support profiling server startup and build via a --profile flag 2012-07-19 21:05:33 -07:00
Thomas Reynolds
3f21f7bc62 Merge pull request #541 from middleman/load_paths 
Extract load_paths so they aren't locked into the binary
 2012-07-19 18:22:04 -07:00
Thomas Reynolds
923f7e8408 Merge pull request #545 from bhollis/optimize 
Reduce work converting paths from relative to absolute and back again
 2012-07-19 10:58:46 -07:00
Thomas Reynolds
1f6d1a7ee1 Extract load_paths so they aren't locked into the binary 2012-07-19 10:55:14 -07:00
Ben Hollis
62fa17cf1a Reduce work converting paths from relative to absolute and back again 2012-07-19 01:18:55 -07:00
Ben Hollis
1f22184fc7 Don't request __middleman__ 2012-07-19 01:18:55 -07:00
Thomas Reynolds
888ee078cc Merge pull request #544 from bhollis/markdown 
Test for Redcarpet using our link_to and image_tag helpers
 2012-07-18 23:57:13 -07:00
Ben Hollis
e6c7caaa83 Test for Redcarpet using our link_to and image_tag helpers 2012-07-18 22:57:52 -07:00
Thomas Reynolds
639a4b2459 Merge pull request #535 from middleman/logger 
Use centralized Logger and add benchmark methods
 2012-07-18 09:31:12 -07:00
Thomas Reynolds
de6d7980ac Use centralized Logger and add instrument methods 2012-07-18 09:30:39 -07:00
kematzy
95339dad23 Added :js_assets_paths for external JS repositories 
Please Note!

This fix depends upon support in the 'middleman-sprockets' gem, where the following code must be present:

    # lib/middleman-sprockets/extension.rb
    <snip…>
    append_path app.css_dir

    # add custom assets paths to the scope
    app.js_assets_paths.each do |p|
      append_path p
    end

The purpose of this addition is to support including JS files from external (global) repositories.

Example usage:

    # in config.rb

    set :js_assets_path, [ "#{root}/assets/js/", "~/.js-repo/"]

Using symlinks or copying files to the Middleman project can get messy quickly. This fix reduces some of those issues.
 2012-07-17 09:21:46 -07:00
kematzy
3ea2241155 Added :sass_assets_path for external SASS repositories 
Compass is great, but sometimes we need to have common framework code in one (global) location with local overrides in the app.

This addition adds built-in support for loading SASS/SCSS files from multiple locations external to the "source" directory and even the Middleman app root.

Example usage:

    # in config.rb

    set :sass_assets_path, [ "#{root}/assets/sass/", "~/.sass-repo/"]

Using symlinks or copying files to the Middleman project can get messy quickly.  This fix reduces some of those issues.
 2012-07-17 09:21:46 -07:00
Thomas Reynolds
6f0f9b00a2 Merge pull request #536 from kematzy/fix-sass-cache-location 
Fix sass cache location
 2012-07-16 22:14:05 -07:00
kematzy
5368875d05 Moved :sass_cache_path from global to Sass renderer 2012-07-17 09:35:40 +08:00