Thomas Reynolds
d119ac1f5f
Merge pull request #678 from barraponto/html5-layout
...
turn html5 boilerplate into a layout
2012-12-15 14:42:38 -08:00
Capi Etheriel
60fc4ce43a
turn html5 boilerplate into a layout
...
set hbp5 as the DEFAULT layout
use titles from YAML options
2012-12-14 11:39:35 -02:00
Ben Hollis
0801f93ffb
Merge pull request #677 from CaseyLeask/empty-yaml
...
Empty yaml fix
2012-12-13 19:45:00 -08:00
Thomas Reynolds
fd8855eff0
Lock therubyracer for now
2012-12-14 14:22:43 +11:00
Thomas Reynolds
19c0eeeffd
disable cane (Ruby 1.8 travis issues)
2012-12-14 14:22:43 +11:00
Casey Leask
85f06ccecd
Added fix for empty YAML
2012-12-14 14:22:42 +11:00
Thomas Reynolds
865c2c34f9
Lock therubyracer for now
2012-12-08 14:08:10 -08:00
Thomas Reynolds
42709eacb1
disable cane (Ruby 1.8 travis issues)
2012-12-02 16:29:55 -08:00
Thomas Reynolds
1439241661
update donation link
2012-11-16 13:28:43 +00:00
Ben Hollis
4ef92481af
Merge pull request #665 from techthumb/master
...
Changed log message when middleman starts.
2012-11-11 18:01:15 -08:00
Kunal Parikh
e57564c957
Using 'Socket.gethostname' to get default hostname
...
As suggested by @bhollis in https://github.com/middleman/middleman/pull/665#issuecomment-10262763
2012-11-11 15:54:32 +11:00
Kunal Parikh
1761197af3
Changed log message when middleman starts.
...
Old message: == The Middleman is standing watch on port 4567
New message: == The Middleman is standing watch at http://0.0.0.0:4567
The URL in the message makes it clickable if the terminal supports it.
2012-11-11 13:16:47 +11:00
Ben Hollis
434895be0c
Merge pull request #663 from alexpeattie/slim-redcarpet-fix
...
Fix for embedded Markdown in Slim w/ Redcarpet
2012-11-07 22:01:33 -08:00
Alex Peattie
ecefe2a04e
Fix for embedded Markdown in Slim w/ Redcarpet
2012-11-07 11:30:24 -08:00
Thomas Reynolds
3f1fa496b2
Merge pull request #660 from bitgangsta/fix_svg
...
Fixing automatic_image_sizes to eliminate warnings on vector images
2012-11-06 14:41:38 -08:00
Daniel Jabbour
8606fb4eba
Fixing image_tag helper so it only attempts to auto image sizes file extensions supported by FastImage. This can be overriden by passing param :supported_extensions into the image_tag helper.
2012-11-05 18:09:30 -08:00
Thomas Reynolds
d830cf76a5
Merge pull request #659 from lest/patch-1
...
Fix build status image in README
2012-11-04 17:36:37 -08:00
Sergey Nartimov
45fbde4a5e
Fix build status image in README
2012-11-04 19:30:03 +03:00
Thomas Reynolds
0eb906efac
Stylus support and tests. Fixes #649
2012-10-28 12:19:47 -07:00
Thomas Reynolds
01e9c336b0
Stylus support and tests. Fixes #649
2012-10-28 12:18:29 -07:00
Thomas Reynolds
2ea35b3004
Stub out rspec tests for public APIs: Rack and Sitemap for now
2012-10-27 11:47:06 -07:00
Thomas Reynolds
1bfd077d00
update changelog
2012-10-23 13:11:23 -07:00
Thomas Reynolds
0ab6d03845
Merge pull request #648 from bhollis/threading
...
Make Sitemap::Store more thread-safe.
2012-10-22 22:23:04 -07:00
Ben Hollis
bb12e2a0d4
Make Sitemap::Store more thread-safe.
2012-10-22 22:22:54 -07:00
Ben Hollis
c40102cf53
Make Sitemap::Store more thread-safe.
2012-10-20 21:19:13 -07:00
Ben Hollis
0d806277f9
Don’t print a warning when FastImage doesn’t know about a file type
2012-10-20 21:18:42 -07:00
Rolf Timmermans
da11eae106
Fix asset hash generation in combination with sprockets.
2012-10-16 16:57:00 -07:00
Thomas Reynolds
ef6f7c17dc
Merge pull request #641 from rolftimmermans/asset-hash-fix-stable
...
Fix asset hash generation in combination with sprockets.
2012-10-16 11:24:45 -07:00
Rolf Timmermans
6201e671ef
Fix asset hash generation in combination with sprockets.
2012-10-16 19:42:38 +02:00
Thomas Reynolds
338d0f5867
Nevermind, can't do that until the class/inst stuff is cleaned up
2012-10-14 17:19:48 -07:00
Thomas Reynolds
0d9b1eabdb
Instances actually need to dup the global config so they don't set variables that may be different later (tests, config reloading)
2012-10-14 16:25:22 -07:00
Thomas Reynolds
af81b588d5
Merge pull request #620 from bhollis/config
...
Move config settings into a separate object
2012-10-14 12:52:19 -07:00
Ben Hollis
4fe22e3fb5
Move more things over to new configs. Don't let root be configured
2012-10-13 22:37:24 -07:00
Ben Hollis
a50ca56fbc
Switch over to new config methods
2012-10-13 21:37:02 -07:00
Ben Hollis
781fa1c65f
Move configuration into a separate object, that can be reused for extension configuration and makes settings, their defaults, and descriptions inspectable.
2012-10-13 21:36:12 -07:00
Thomas Reynolds
4ee9369d7e
Merge pull request #635 from bhollis/proxy
...
Upgrade proxy to be able to take :locals and understand :ignore
2012-10-13 14:04:17 -07:00
Thomas Reynolds
4255ff8b00
Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable
2012-10-13 14:04:02 -07:00
Ben Hollis
862551c523
Upgrade proxy to be able to take :locals and understand :ignore, and store proxy options and metadata with the proxy list.
...
This allows users to use proxy directly instead of page to create dynamic pages, and improves performance of dynamic pages for sites that create many proxies. It also allows people to use locals instead of instance variables, which are better for partials and reduce the risk of overwriting Middleman settings.
2012-10-13 14:03:32 -07:00
Ben Hollis
1ee89ac6bf
Upgrade proxy to be able to take :locals and understand :ignore, and store proxy options and metadata with the proxy list.
...
This allows users to use proxy directly instead of page to create dynamic pages, and improves performance of dynamic pages for sites that create many proxies. It also allows people to use locals instead of instance variables, which are better for partials and reduce the risk of overwriting Middleman settings.
2012-10-12 19:46:11 -07:00
Thomas Reynolds
434abf2220
prep 3.0.6
2012-10-11 10:08:10 -07:00
Thomas Reynolds
e5713f74d5
Merge pull request #632 from bhollis/tilde
...
Fix handling directories with ~ in them.
2012-10-11 10:07:37 -07:00
Ben Hollis
0bf1b476b0
Fix handling of directories with ~ in them
2012-10-11 10:07:03 -07:00
Jörg Thalheim
4b52858f61
test directories containing the tilde characters
2012-10-11 10:06:50 -07:00
Ben Hollis
ee6add032a
Fix handling of directories with ~ in them
2012-10-10 18:20:20 -07:00
Jörg Thalheim
392a4d23f6
test directories containing the tilde characters
2012-10-10 18:18:55 -07:00
Thomas Reynolds
42f9e331da
Master is now for 3.1 dev
2012-10-06 11:16:54 -07:00
Ben Hollis
52819cd239
Make sure to require rack/test from asset_hash
2012-09-30 19:25:15 -07:00
Thomas Reynolds
3a4c063535
Reload i18n files when they change, closes #616
2012-09-30 13:17:01 -07:00
Thomas Reynolds
c53c46729a
actually make ruby encoding setting work, fix gzip to read/write binary
2012-09-29 14:12:26 -07:00
Thomas Reynolds
58be0f7af9
Merge pull request #617 from bhollis/cli
...
Print a helpful message when encountering an unknown command
2012-09-28 10:27:21 -07:00
