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

1204 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds
b97f681ef1 Move file extension methods up a level 2012-04-19 15:47:47 -07:00
Thomas Reynolds
aa3e1a6c5a Merge pull request #365 from steel/master 
Add lib/assets to sprockets asset path
 2012-04-18 16:38:05 -07:00
Steel Fu
a85678f040 Add lib/asset to sprocket load path 2012-04-18 13:58:20 -07:00
Thomas Reynolds
129c2845f8 Merge pull request #364 from bhollis/master 
Ignore unnecessary ignores and use destination_path in url
 2012-04-18 09:42:59 -07:00
Ben Hollis
a0712224c6 Ignore unnecessary ignores and use destination_path in url 2012-04-17 23:55:28 -07:00
Thomas Reynolds
cf66ddf206 Make file watcher paths relative 2012-04-17 12:23:33 -07:00
Thomas Reynolds
5866540dd8 Sort default i18n filenames 2012-04-17 10:59:58 -07:00
Thomas Reynolds
b492ded55d nothing left todo 2012-04-17 10:55:19 -07:00
Thomas Reynolds
c623993cc5 Merge pull request #363 from bhollis/asset_hash 
Fix asset hash with new sitemap
 2012-04-17 09:36:37 -07:00
Thomas Reynolds
67ba6acf02 Merge pull request #362 from bhollis/master 
Updated changelog with changes since beta 1
 2012-04-17 09:33:48 -07:00
Ben Hollis
8178eb5602 Use set in filewatcher 2012-04-17 01:05:33 -07:00
Ben Hollis
50b797e0be Get asset_hash working after the sitemap refactor. Part of this required changing the behavior of the OnDisk Sitemap extension to rebuild the sitemap every time a file is touched, instead of just when files are added (even if the file being touched is ignored by the sitemap, like a partial!). This is because asset_hash needs to recalculate hashes whenever any file changes, since partials can affect the output of other files. 2012-04-17 01:05:28 -07:00
Ben Hollis
af2d99f7cd Update changelog with other changes since beta 1 2012-04-16 23:40:41 -07:00
Thomas Reynolds
dc784edc66 test directory_index and relative_assets combo 2012-04-16 16:52:21 -07:00
Thomas Reynolds
bd9814965e Move 3rd party CLI out of fixtures 2012-04-16 15:38:26 -07:00
Thomas Reynolds
a91bcc8a4c Merge pull request #360 from brettgoulder/master 
Bumping HTML5 Boilerplate to 3.0
 2012-04-16 15:16:29 -07:00
Thomas Reynolds
9730425caa Missing comma in Thor::Error 2012-04-16 15:08:44 -07:00
Brett Goulder
1f498eadb2 Bumping HTML5 Boilerplate to 3.0 2012-04-16 15:52:55 -06:00
Thomas Reynolds
259ef52190 reload i18n yml on config 2012-04-16 14:32:00 -07:00
Thomas Reynolds
3f2733720b Don't try to init i18n if we aren't using it (duh) 2012-04-16 14:01:18 -07:00
Thomas Reynolds
d08624dfe3 Port i18n to new sitemap api 2012-04-16 13:42:22 -07:00
Thomas Reynolds
2afbb40925 Merge pull request #357 from trevor/padrino0.10.6 
update vendor'd padrino 0.10.5 -> 0.10.6
 2012-04-14 14:16:05 -07:00
Thomas Reynolds
17c23811de update todo 2012-04-14 14:13:51 -07:00
Thomas Reynolds
5fde3996f7 Enable i18n tests 2012-04-14 14:13:16 -07:00
Thomas Reynolds
8a1342df9c Move Cache into Util 2012-04-14 14:06:49 -07:00
Thomas Reynolds
d2d40079cc Rename Middleman::Base to Middleman::Application 2012-04-14 14:04:10 -07:00
Thomas Reynolds
2130e902c2 Begin splitting our requires into correct places instead of autoload 
Disable autoload on watcher

finish moving requires out
 2012-04-14 13:59:45 -07:00
Trevor Wennblom
12ce74b1d3 update padrino internal padrino references 2012-04-14 15:46:22 -05:00
Trevor Wennblom
d23900f46b update CHANGELOG 2012-04-14 15:45:55 -05:00
Trevor Wennblom
4652736cea update padrino i18n hack 2012-04-14 15:45:55 -05:00
Trevor Wennblom
96eac33118 rename directories 2012-04-14 15:45:55 -05:00
Trevor Wennblom
b514b7ea6e update padrino to 0.10.6 vanilla 2012-04-14 15:45:55 -05:00
Thomas Reynolds
0bc35db4a6 move util methods into their own namespace 2012-04-14 13:36:24 -07:00
Thomas Reynolds
094de61e92 Merge pull request #347 from middleman/sitemap_refactor 
Sitemap refactor (attempt 2)
 2012-04-14 13:26:43 -07:00
Thomas Reynolds
d935aedd59 Sitemap refactor 2012-04-14 13:17:42 -07:00
Ben Hollis
db0febe2f0 Merge pull request #352 from bhollis/bundler 
Friendlier bundle install step
 2012-04-13 22:24:51 -07:00
Ben Hollis
6cebb15b27 Merge pull request #355 from trevor/patch-2 
minor typos
 2012-04-12 18:18:39 -07:00
Trevor Wennblom
4d80d99d36 minor typos 2012-04-12 18:58:03 -05:00
Thomas Reynolds
baac8a31f4 fix CS test 2012-04-12 11:16:24 -07:00
Thomas Reynolds
3d1f8e7624 Try Fivemat cucumber output 2012-04-12 11:04:23 -07:00
Ben Hollis
7c78b20f65 Slightly improve the minify regexes 2012-04-09 19:53:01 -07:00
Thomas Reynolds
313f6f8214 don't need ext, handled by listen gem 2012-04-09 19:06:54 -07:00
Thomas Reynolds
5d1961ba86 bump listen dep 2012-04-09 14:23:58 -07:00
Thomas Reynolds
cd89e5ffa4 Merge pull request #353 from bhollis/minify 
Minify all JS and CSS via middleware
 2012-04-09 11:10:36 -07:00
Thomas Reynolds
6d75bb3bf8 Merge pull request #351 from bhollis/stacktrace 
Stacktraces for config.rb
 2012-04-09 09:53:00 -07:00
Ben Hollis
192047d242 Minify all JS and CSS via middleware. This means JS or CSS anywhere in the site is minified, not just in the Sprockets-controlled directories. I've also added inline CSS compression, and handling of several common "guards" that get wrapped around JS. Also, leave alone non-JS script tags (which may contain something like jQuery templates). Sprockets no longer has anything to do with minification after this. 2012-04-09 00:05:22 -07:00
Ben Hollis
24930b094d Friendlier bundle install step 2012-04-09 00:04:07 -07:00
Ben Hollis
8730a540b0 Add a filename and line number argument to instance_exec so config.rb gets to participate in stack traces. 2012-04-08 23:45:06 -07:00
Thomas Reynolds
b1ba94cf22 Merge pull request #346 from bhollis/master 
Provide a stack trace for build errors
 2012-04-08 08:39:40 -07:00
Ben Hollis
4c0c638892 Provide a stack trace for build errors 2012-04-07 20:00:56 -07:00