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

1563 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
0ab6d03845 Merge pull request #648 from bhollis/threading 
Make Sitemap::Store more thread-safe.
 2012-10-22 22:23:04 -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
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
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
e5713f74d5 Merge pull request #632 from bhollis/tilde 
Fix handling directories with ~ in them.
 2012-10-11 10:07:37 -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
Thomas Reynolds
534fccaf5b Merge pull request #581 from bhollis/signals 
TERM issue on 3.0
 2012-09-28 09:20:22 -07:00
Ben Hollis
623d73cc0a Print a helpful message when encountering an unknown command 2012-09-27 23:20:04 -07:00
Ben Hollis
d0c00884fe Shutdown even if the user closed their terminal. Also handle signals on Windows (and elsewhere) if available without resorting to platform detection. Fixes #581. 2012-09-27 23:05:36 -07:00
Thomas Reynolds
9efa9d8009 Update normalize.css to v2.0.1. Fixes #614 2012-09-25 16:30:49 -07:00
Thomas Reynolds
d3818e8368 Prep 3.0.5 2012-09-23 19:00:40 -07:00
Thomas Reynolds
061323a09f prep release 2012-09-23 18:43:42 -07:00
Thomas Reynolds
2aec04db69 Merge pull request #558 from bhollis/asset-hash-rack 
Asset_hash doesn't play nice with Sprockets
 2012-09-23 18:41:11 -07:00
Thomas Reynolds
56e2a747b7 Merge pull request #603 from bhollis/sitemap_speed 
Delay recalculating sitemap until absolutely necessary
 2012-09-17 16:13:11 -07:00
Ben Hollis
6c241603ac Delay recalculating sitemap until absolutely necessary, avoiding redundant recalculations. 2012-09-16 19:36:47 -07:00
Thomas Reynolds
a8a555c101 Merge pull request #601 from bhollis/full_path 
Fix previewing directories with '.' in them.
 2012-09-16 14:28:19 -07:00
Ben Hollis
d181ec5f4f Remove use of full_path and odd options from auto_tag 2012-09-16 01:57:37 -07:00
Ben Hollis
8ec42df641 Correctly preview directory URLs with .s in them and show the request path on 404 pages. 2012-09-16 01:57:33 -07:00
Thomas Reynolds
8e808a2324 Merge pull request #598 from bhollis/load_path 
Stop messing with load path in middleman executable
 2012-09-16 00:10:26 -07:00
Thomas Reynolds
8bd98c0d2c Merge pull request #600 from bhollis/doubleinit 
No longer initialize the app twice when starting preview server
 2012-09-16 00:08:34 -07:00
Ben Hollis
aa6b0482ae No longer initialize the app twice when starting preview server 2012-09-15 22:38:49 -07:00
Ben Hollis
e35ce52803 Stop messing with load path in middleman executable 2012-09-15 18:45:14 -07:00
Thomas Reynolds
0327e2067f Merge pull request #596 from bhollis/cli 
Please create a "--skip-bundle" flag for middleman init
 2012-09-15 18:09:53 -07:00
Ben Hollis
e0b88d91be Add skip-gemfile, skip-bundle, and skip-git options to middleman init, aligning with rails options. 2012-09-14 23:32:46 -07:00
Thomas Reynolds
493d782875 bump 3.0.4 2012-09-13 10:52:11 -07:00
Thomas Reynolds
77be952d41 Trying to return from a block is a bad idea 2012-09-13 10:51:31 -07:00
Thomas Reynolds
06578c61fa prep 3.0.3 2012-09-13 10:25:49 -07:00
Thomas Reynolds
345e7787b5 reloading fixes 2012-09-13 10:13:57 -07:00
Ben Hollis
09ba0049d4 Fix asset_hashing assets affected by Rack middleware or mounted apps (like sprockets). Fixes #558 2012-09-11 00:08:58 -07:00
Adam Luikart
4076666c19 Add test for asset_hashing rack-filtered items. 2012-09-11 00:08:57 -07:00
Thomas Reynolds
266e24e03e 3.0.2 2012-09-05 16:24:43 -07:00
Thomas Reynolds
fcd36f587b Merge pull request #585 from adamesque/master 
Fix failing CLI test.
 2012-09-05 16:12:08 -07:00
Adam Luikart
c2f7303041 h5bp 4.0 renames script.js to main.js. Fixes failing cli_init test. 2012-09-05 15:42:49 -05:00
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