Thomas Reynolds
|
6403daccd3
|
prep
|
2013-07-02 14:42:44 -07:00 |
|
|
Thomas Reynolds
|
f83e6c0998
|
Merge pull request #945 from al/bugfix-typo_in_core_extensions_request
Fixed typo in middleman-core/core-extensions/request.rb.
|
2013-06-25 10:28:04 -07:00 |
|
Alan Larkin
|
26b7f46978
|
Fixed typo in middleman-core/core-extensions/request.rb.
|
2013-06-25 14:55:12 +01:00 |
|
|
Thomas Reynolds
|
b2ecf5526b
|
ignore all ds_store
|
2013-06-24 14:26:58 -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
|
3399ee207e
|
dont hardcode ignored build dir name
|
2013-06-23 15:15:43 -07:00 |
|
Karl Freeman
|
15ec5441c3
|
Merge pull request #943 from southpolesteve/patch-1
Add .DS_Store to generated .gitignore
|
2013-06-23 10:19:52 -07:00 |
|
Steve Faulkner
|
f68f01a574
|
Update gitignore
|
2013-06-22 22:53:10 -05:00 |
|
|
Thomas Reynolds
|
d86dffa7c6
|
implement redirect support
|
2013-06-19 11:13:23 -07:00 |
|
|
Thomas Reynolds
|
912b33929f
|
bump listen
|
2013-06-19 10:23:53 -07:00 |
|
|
Thomas Reynolds
|
0415b76d4f
|
tests for content_tag escaping
|
2013-06-18 11:12:41 -07:00 |
|
|
Thomas Reynolds
|
298e842510
|
Merge pull request #941 from krautcomputing/fix_content_tag_helper
Fix content_tag helper, only try to mark content as safe if it is not a hash of options
|
2013-06-18 11:01:28 -07:00 |
|
Manuel Meurer
|
c75e31ae94
|
Fix content_tag helper, only try to mark content as safe if it is not a hash of options
|
2013-06-18 10:12:38 +02:00 |
|
|
Thomas Reynolds
|
0e69928939
|
bump ver
|
2013-06-17 00:47:58 +00:00 |
|
|
Thomas Reynolds
|
efe52f7cca
|
Check if set is redefining a param at the class level. Fixes #939
|
2013-06-17 00:47:10 +00:00 |
|
|
Thomas Reynolds
|
f0707c0968
|
Prevent relative asset helper from munging data URIs. Closes #938.
|
2013-06-15 16:22:14 -07:00 |
|
|
Thomas Reynolds
|
9320007be6
|
dum dum dum.....
|
2013-06-14 16:31:51 -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
|
7e405fc414
|
And by 1.8, I mean MRI 1.8
|
2013-06-12 17:58:59 -07:00 |
|
|
Thomas Reynolds
|
e03362e6f6
|
Apparently Ruby 1.8 doesn't have Proc.source_location
|
2013-06-12 17:40:17 -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 |
|
Moritz Breit
|
b234deb540
|
Add cucumber scenarios for markdown pages with erb layout
These are tests for middleman/middleman#860.
|
2013-06-12 11:23:00 -07:00 |
|
|
Thomas Reynolds
|
a52effc119
|
continue forcing Padrino to html_safe everything
|
2013-06-12 11:19:02 -07:00 |
|
|
Karl Freeman
|
34b354f156
|
Update CONTRIBUTING.md
|
2013-06-10 18:20:09 +02:00 |
|
|
Thomas Reynolds
|
9d5a878713
|
prybegone
|
2013-06-09 17:15:15 -07:00 |
|
|
Thomas Reynolds
|
d71af3f5a1
|
Force padrino to skip safebuffer on erb
|
2013-06-08 15:36:14 -07:00 |
|
|
Thomas Reynolds
|
d9f8327dc6
|
Merge pull request #930 from utensil/master
fix #929 : `cd` in Rakefile in a cross-platform way
|
2013-06-07 10:09:23 -07:00 |
|
|
Thomas Reynolds
|
efc0f9961b
|
Merge pull request #927 from middleman/content_for_escaping
content_for is escaping .erb
|
2013-06-07 10:08:37 -07:00 |
|
|
Thomas Reynolds
|
c051b72322
|
Merge pull request #928 from middleman/capture_html-tests
capture_html helper tests
|
2013-06-07 10:07:31 -07:00 |
|
utensil
|
7e9ff77c1d
|
fix #929 : cd in Rakefile in a cross-platform way
|
2013-06-07 23:19:47 +08:00 |
|
|
Karl Freeman
|
ef46e4e6c3
|
add breaking test for escaped html using content_for
|
2013-06-07 09:59:59 +01:00 |
|
|
Karl Freeman
|
0b8c36cb8c
|
capture_html helper tests
|
2013-06-07 09:58:37 +01:00 |
|
|
Thomas Reynolds
|
d728df12cf
|
bump ver
|
2013-06-05 13:40:45 -07:00 |
|
|
Thomas Reynolds
|
265f90e240
|
Add callback so v4 extensions can see when other extensions are activated
|
2013-06-04 15:51:03 -07:00 |
|
|
Thomas Reynolds
|
f3e2e8fdf5
|
ignore vendor in simplecov
|
2013-06-04 14:28:46 -07:00 |
|
|
Thomas Reynolds
|
48ce4a8beb
|
Update vendor.yml
|
2013-06-04 15:23:01 -06:00 |
|
|
Thomas Reynolds
|
69c36e691f
|
use latest padrino
|
2013-06-04 09:56:33 -07:00 |
|
|
Thomas Reynolds
|
39d3fa01ad
|
Merge branch 'master' of github.com:middleman/middleman
|
2013-06-04 09:48:45 -07:00 |
|
|
Thomas Reynolds
|
a9839731e6
|
only require padrino once
|
2013-06-04 09:48:01 -07:00 |
|
|
Thomas Reynolds
|
d3d85f8bc7
|
Merge pull request #923 from pulletsforever/feature/rack-block
Allow block to be passed through from Middleman.server()
|
2013-06-03 13:35:01 -07:00 |
|
David W. Keith
|
f2f17c33b3
|
Allow block to be passed through from Middleman.server()
|
2013-06-03 11:48:16 -07:00 |
|
|
Thomas Reynolds
|
c741735446
|
update path to helpers for sitemap metapages
|
2013-06-03 10:07:09 -07:00 |
|
|
Thomas Reynolds
|
564af31987
|
Merge pull request #922 from middleman/ignore-vendor-folder
include '/vendor' in ignored files / folders
|
2013-06-03 09:57:13 -07:00 |
|
|
Karl Freeman
|
32b113dc93
|
include '/vendor' in ignored files / folders
|
2013-06-03 17:06:43 +01:00 |
|
|
Thomas Reynolds
|
8863473756
|
bump dep
|
2013-06-02 19:04:33 -07:00 |
|
|
Thomas Reynolds
|
d0cd3e3cf9
|
layouts_dir is now configurable. Closes #899
|
2013-06-01 15:25:44 -07:00 |
|