Thomas Reynolds
1f98d0f4f0
Add :format and :keep_original options to :asset_hash. Closes #1257
2014-04-14 10:05:00 -07:00
Thomas Reynolds
4b53549ae4
Merge in recent changes from v3-stable
2014-04-08 09:27:18 -07:00
Thomas Reynolds
bbd9913372
Update changelog [ci skip]
2014-04-07 11:03:13 -07:00
Thomas Reynolds
80256ec3c5
revert back to sass 3.2 and stable compass
2014-04-04 10:38:50 -07:00
Thomas Reynolds
bf62454dc2
bump uglifier dep
2014-04-04 10:31:11 -07:00
Thomas Reynolds
638e2e64b7
Unvendor padrino
2014-04-04 10:22:34 -07:00
Ben Hollis
4605ffc398
Improvements to the /__middleman/ metadata pages.
...
Includes formatting/styling changes to clarify the data being presented as well as align styling with middlemanapp.com. Also adds features and fixes to the sitemap view to show ignored files differently, hide redundant information, print data/options as a hash instead of as array pairs, and to list out available locals defined on a page.
2014-03-26 00:12:10 -07:00
Thomas Reynolds
8bc2fddb9d
Remove static serving of non-Middleman folders
2014-03-25 16:57:57 -07:00
Karl Freeman
c5609dc889
up to date
2014-03-25 08:46:03 +00:00
Thomas Reynolds
ce7636ad18
remove Implied Extensions feature. Closes #1211
2014-03-20 17:12:41 -07:00
Ben Hollis
220d1e8948
Require Bundler (a Gemfile) for all set up Middleman projects. We still do extension auto-discovery for "init". Gemfile may now be in any parent directory of 'config.rb', in case the Middleman project is in a subdirectory of a larger project.
2014-03-03 23:47:24 -08:00
Ben Hollis
7b46fd6524
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/extensions.rb
middleman-core/lib/middleman-core/version.rb
middleman-core/lib/middleman-more/core_extensions/compass.rb
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -08:00
Thomas Reynolds
3995ad850c
update padrino.
2014-02-18 18:30:29 -08:00
Thomas Reynolds
c2d85c35f2
prep release
2014-01-27 09:56:48 -08:00
Thomas Reynolds
504a1c2eba
remove confusing and broken data.page variable
2014-01-03 16:18:16 -08:00
Thomas Reynolds
98e3c8aa79
remove instance variable and page block support
2014-01-03 15:49:54 -08:00
Thomas Reynolds
95eaeba960
Start cleaning up Rack internals
2014-01-01 19:09:47 -08:00
Thomas Reynolds
0a288131c1
changelog
2014-01-01 18:09:19 -08:00
Thomas Reynolds
b6361c23f7
prep new release
2013-12-18 14:56:21 -08:00
Thomas Reynolds
48db12429a
upgrade padrino. closes #1078
2013-11-19 18:10:39 -08:00
Paul C Pederson
dd1ba160e1
update changelog
2013-11-18 10:22:36 -08:00
Thomas Reynolds
6db13610ac
3.2 changelog
2013-10-29 09:54:46 -07:00
Thomas Reynolds
fd85ca90a3
update changelog
2013-10-15 14:41:50 -07:00
Thomas Reynolds
7762abe461
prep
2013-10-15 14:40:01 -07:00
Ben Hollis
a746be1342
Use our magic linking functions from Kramdown, just like we do with Redcarpet. Fixes #999
2013-09-16 23:46:59 -07:00
Thomas Reynolds
cd9964edbe
prep
2013-09-07 13:12:31 -07:00
Thomas Reynolds
8b970f9d92
support redcarpet's no_ flags which need to be re-implemented in our overrides. Fixes #951
2013-07-08 14:21:36 -07:00
Thomas Reynolds
bd4a6c1eb8
reprep2
2013-07-02 14:44:18 -07:00
Thomas Reynolds
6403daccd3
prep
2013-07-02 14:42:44 -07:00
Thomas Reynolds
b6a73ccfe5
prep
2013-06-24 14:15:27 -07:00
Thomas Reynolds
c7d3e7d601
Fix regex which was allowing i18n to file yaml files in the data folder
2013-06-24 13:56:32 -07:00
Thomas Reynolds
37752dc291
fix layouts with implied extensions
2013-06-24 13:39:14 -07:00
Thomas Reynolds
d86dffa7c6
implement redirect support
2013-06-19 11:13:23 -07:00
Thomas Reynolds
0415b76d4f
tests for content_tag escaping
2013-06-18 11:12:41 -07:00
Thomas Reynolds
8eac168618
new rc
2013-06-13 09:23:31 -07:00
Thomas Reynolds
913d2b7049
Implement generic which is a simple way to build a file from Rack
2013-06-13 09:05:13 -07:00
Thomas Reynolds
f97c9ffab1
dont bother with jruby 1.8 mode
2013-06-12 18:24:00 -07:00
Thomas Reynolds
7d7d5e683e
Set current_engine on the context, not self, since we dup self and use that for each render loop. Closes #860
2013-06-12 15:21:31 -07:00
Thomas Reynolds
d0cd3e3cf9
layouts_dir is now configurable. Closes #899
2013-06-01 15:25:44 -07:00
Ben Hollis
85c6a8faa3
Fix changelog
2013-05-30 21:21:13 -07:00
Ben Hollis
dbcb28dded
Add an "empty" template and let template classes override the "Gemfile" template.
...
Custom template classes can define "self.gemfile_template" to return the path to their own Gemfile template, without having to reimplement our generate_bundler! task.
2013-05-30 21:17:43 -07:00
Thomas Reynolds
fe2a7c4dd6
Merge branch 'master' of github.com:middleman/middleman
2013-05-31 00:11:54 -04:00
Ben Hollis
7bdf28a421
Fix ignoring layouts from the sitemap when the source directory has been set to something other than 'source'. Fixes #896 .
2013-05-30 20:17:58 -07:00
Thomas Reynolds
f4002dbb36
update changelog
2013-05-30 15:13:42 -04:00
Thomas Reynolds
de5dfe3a91
High-level 3.1 changes
2013-05-15 17:45:25 -07:00
Thomas Reynolds
9ebddeed1d
merge more into core, use gem availability to autoload
2013-05-09 14:41:26 -07:00
Thomas Reynolds
4964022998
rollback some versions
2013-05-03 11:24:05 -07:00
Ben Hollis
1d88a52170
Make the list of regexes ignored by FileWatcher configurable
2013-05-02 22:09:54 -07:00
Ben Hollis
d58acae939
Progress towards making localizable pages work
2013-05-02 21:17:50 -07:00
Ben Hollis
ec1b92d427
Add DataStore-as-Hash stuff to CHANGELOG
2013-05-02 19:05:50 -07:00