Jason Webster
dd08ea2f6d
Fix wrong http pathing/prefixing example in generated config
2013-08-15 15:24:44 -07:00
Thomas Reynolds
6d1effd2e7
bump
2013-07-21 23:32:28 -07:00
Thomas Reynolds
ec060e0b6e
change tests since coffee changed their output
2013-07-16 15:10:43 -07:00
Aggelos Orfanakos
2a8b22558a
Don't set resp Content-Type for some status codes
...
There must not be a Content-Type set when the Status is 1xx, 204, 205 or
304, otherwise Rack blows up with the following error: "Content-Type
header found in 304 response, not allowed"
2013-07-13 05:01:32 +03:00
Aggelos Orfanakos
83d83c5c8c
Fix double-escaping of config settings
2013-07-12 23:06:51 +03:00
Aggelos Orfanakos
fffe36f42c
Fix double-escaping of resource properties
2013-07-12 22:54:15 +03:00
Ben Hollis
bef6e13c5f
I never meant to actually name this parameter blockm
2013-07-08 22:17:12 -07:00
Ben Hollis
8979fe9f18
Print file where YAML/JSON errors occur. Fixes #954 .
2013-07-08 22:16:03 -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
5806f2cbf5
auto include wdm on windows platforms
2013-07-07 20:57:04 -07:00
Thomas Reynolds
dd2525c18e
Merge branch 'master' of github.com:middleman/middleman
2013-07-02 14:42:54 -07:00
Thomas Reynolds
6403daccd3
prep
2013-07-02 14:42:44 -07:00
Arron Mabrey
44e5ff3f6c
Update Sitemap source_dotfiles to support .nojekyll file
2013-06-30 18:46:39 -04:00
Arron Mabrey
00d6a78872
Add expectation that .nojekyll file should exist to directory_index feature
2013-06-30 18:45:49 -04:00
Arron Mabrey
0d4dd71ae2
Add .nojekyll file to indexable-app fixture
2013-06-30 18:44:34 -04: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
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
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
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
Thomas Reynolds
d71af3f5a1
Force padrino to skip safebuffer on erb
2013-06-08 15:36:14 -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
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
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
