Thomas Reynolds
2282657000
Use therubyrhino for jruby execjs tests
2012-07-07 14:31:39 -07:00
Thomas Reynolds
4b03c5e2df
Add Middleman::Util.all_files_under to get a recursive listing of files beneath a path, follows symlinks. Fixes #515
2012-07-06 19:32:05 -07:00
Thomas Reynolds
b67d4e7c82
bump submodule [ci skip]
2012-07-04 16:52:53 -07:00
Thomas Reynolds
d4259315e7
version bump [ci skip]
2012-07-04 16:47:01 -07:00
Thomas Reynolds
54f796120f
Merge branch 'master' of github.com:middleman/middleman
2012-07-04 16:45:32 -07:00
Thomas Reynolds
63224639d9
Add tests for more implied extensions
2012-07-04 16:45:27 -07:00
Thomas Reynolds
d23a773491
Merge pull request #370 from bhollis/master
...
Syntax errors lock up Middleman
2012-07-04 16:24:42 -07:00
Thomas Reynolds
df31f65522
Make automatic helpers smarter. Fixes #510
2012-07-04 11:29:00 -07:00
Thomas Reynolds
be2589de0d
Merge pull request #284 from bhollis/layout
...
Bad error message for extensionless files
2012-07-03 13:30:38 -07:00
Ben Hollis
89afc86a5b
Friendlier error message when a non-default layout is not in the layouts directory.
2012-07-03 00:01:11 -07:00
Ben Hollis
1229a9991a
Prevent NoMethodError/NameError from hanging the server.
...
The fix is to work around this bug: http://bugs.ruby-lang.org/issues/4521 where Ruby will call to_s/inspect while printing exception messages, which can take a long time (minutes at full CPU) if the object is huge or has cyclic references, like Middleman::Application does. Defining #to_s short-circuits that. This fixes #370 .
2012-07-02 23:39:30 -07:00
Thomas Reynolds
a5a2e1568b
point to public repo
2012-07-02 21:46:17 -07:00
Thomas Reynolds
6791dc431c
Let travis know we're using submodules
2012-07-02 21:43:17 -07:00
Thomas Reynolds
d0cf90675a
Update changelog
2012-07-02 21:42:55 -07:00
Thomas Reynolds
cdca063fb8
Add middleman-sprockets as a gitmodule [no ci]
2012-07-02 21:32:08 -07:00
Thomas Reynolds
1c9a97990e
Update some gem requirements, lock Padrino
2012-07-02 16:35:53 -07:00
Ben Hollis
4faa98e874
Simplify and fix relative_assets extension to work more consistently. Also, fix a bug in relative link_to inspired by fixing this bug. This fixes #507 .
2012-06-30 22:02:23 -07:00
Ben Hollis
dad9b33174
Merge pull request #505 from dzubi/master
...
Fix build failure message, option --debug does not exist anymore
2012-06-28 21:58:52 -07:00
Daniel Zuberbühler
e9b996516b
Fix option in build failure help message
2012-06-28 14:57:35 +02:00
Thomas Reynolds
121715e2be
Merge pull request #503 from bhollis/master
...
Clean up listener handling in preview server
2012-06-28 01:07:31 -07:00
Ben Hollis
2bb47049c1
Clean up listener handling in preview server
2012-06-27 23:28:28 -07:00
Ben Hollis
702930484f
Update changelog
2012-06-27 23:28:27 -07:00
Thomas Reynolds
b5f6de980a
Merge pull request #500 from bhollis/http_prefix
...
Make :http_prefix work in link_to and asset helpers
2012-06-23 18:27:38 -07:00
Ben Hollis
6ac263619a
Make :http_prefix work in link_to and asset helpers as long as the linked item is a sitemap resource. Fixes #484 .
2012-06-23 17:19:24 -07:00
Thomas Reynolds
f907f4acb4
Merge branch 'master' of github.com:middleman/middleman
2012-06-20 17:53:27 -07:00
Thomas Reynolds
8912d3627d
Update Padrino to 0.10.7 and Thor to 0.15.3. Closes #495
2012-06-20 17:53:14 -07:00
Thomas Reynolds
fbc4591922
bump listen dep
2012-06-20 09:51:19 -07:00
Thomas Reynolds
35ff2e0c48
bump version [no-ci]
2012-06-19 20:12:55 -07:00
Thomas Reynolds
c3796a9161
:automatic_directory_matcher optionally converts a character sequence in file names into a subdirectory. Closes #491
2012-06-19 20:07:50 -07:00
Thomas Reynolds
ddc0712c1b
Say :update, not :create on automatic conflict resolution
2012-06-19 19:40:57 -07:00
Thomas Reynolds
bd9d9d0f93
travishatesme
2012-06-18 16:53:22 -07:00
Thomas Reynolds
518ae3f46d
Move encoding tests into a dynamic form so they aren't packaged with gemspecs on unsupported platforms.
2012-06-18 15:18:16 -07:00
Ben Hollis
cf8314ecab
Merge pull request #490 from rstacruz/changelog_for_3rc2
...
Update CHANGELOG for 3.0.0.rc.2
2012-06-17 15:46:45 -07:00
Rico Sta. Cruz
f74c54470d
Update CHANGELOG for 3.0.0.rc.2
2012-06-18 05:16:52 +08:00
Thomas Reynolds
eee1e45afb
bump to rc2
2012-06-17 12:21:24 -07:00
Thomas Reynolds
5da63cb84f
Emit identical message on build as before, removing confusion reported in #475
2012-06-17 12:11:07 -07:00
Thomas Reynolds
5071a2c15d
Tests for #477
2012-06-17 12:03:36 -07:00
Thomas Reynolds
4ea2f6f7ed
Sick of jruby breaking travis
2012-06-17 11:42:39 -07:00
Thomas Reynolds
10d0df2622
Fix cucumber flags in jruby
2012-06-17 11:31:10 -07:00
Thomas Reynolds
bdfc270367
Merge pull request #489 from bhollis/match
...
Add a Middleman::Util.path_match function and use it
2012-06-17 11:17:41 -07:00
Ben Hollis
57f5701e72
Add a Middleman::Util.path_match function that handles matching on regexes, globs, and procs, and use it from asset_hash, minify_javascript, and minify_css. Fixes #480 .
2012-06-16 20:26:42 -07:00
Thomas Reynolds
524fd49c47
Merge pull request #488 from bhollis/link_to
...
Improve link_to so that it can handle a Resource in place of a url
2012-06-16 19:44:42 -07:00
Ben Hollis
8a01b28369
Improve link_to so that it can handle a Resource in place of a url. Fixes #474 .
2012-06-16 17:48:41 -07:00
Thomas Reynolds
f81b6c7c40
Merge pull request #478 from rolftimmermans/charset-fix
...
Change the default character encoding to 'utf-8', with a dash
2012-06-16 15:11:05 -07:00
Thomas Reynolds
f3f508399c
Merge pull request #487 from rstacruz/listener_fix
...
Fix the listener/watcher
2012-06-16 15:10:20 -07:00
Thomas Reynolds
509c91999d
Add ~encoding tag to cucumber to only run tests for Encoding on platforms which support it
2012-06-16 15:09:48 -07:00
Thomas Reynolds
f6b55e8674
Merge pull request #486 from rstacruz/encoding_fix
...
Implement the :encoding setting which defaults to 'utf-8'
2012-06-16 15:04:54 -07:00
Rico Sta. Cruz
b35de4834b
Restart the listener when reloading the server
2012-06-16 06:30:20 +08:00
Rico Sta. Cruz
8a898f8239
Persist the preview servers options (like port) when reloading
2012-06-16 06:20:40 +08:00
Rico Sta. Cruz
96c29181aa
Implement the :encoding setting which defaults to 'utf-8'
2012-06-16 06:07:50 +08:00
