Thomas Reynolds
cd9964edbe
prep
2013-09-07 13:12:31 -07:00
Thomas Reynolds
48024772db
Merge pull request #1001 from stevenosloan/redcarpet_3
...
Add tests for Redcarpet 3.0.0 options, fix the few that didn't pass
2013-08-27 09:39:17 -07:00
Steven Sloan
ee7c9e6a6e
Add support/tests for Redcarpet 3.0.0 features
...
- :underline
- :highlight
- :disable_indented_code_blocks
Fix support for
- :link_attributes
- :filter_html
separate Redcarpet extensions from renderer options, add specs for missing renderer options
add specs for the missing/new redcarpet extensions, [ :lax_spacing, :underline, :highlight, :quote, :disable_indented_code_blocks, :footnotes ]
fix link_attributes option for Redcarpet
patch Tilt's reverse option aliases (they were there for RC1)
adjust test data for Redcarpet toc_data to match the current way it renders in 3.0
revert tests that aren't in redcarpet 3.0.0
add a cucumber exempt tag for mri-1.8.x
move redcarpet 3 specific extensions to a separate scenario filtered by the no18 tag
2013-08-27 11:37:37 -04:00
Thomas Reynolds
abfe5e673f
Merge pull request #992 from Mark-Simulacrum/master
...
Add listener latency option.
2013-08-21 16:01:27 -07:00
Mark Simulacrum
7606dfd494
Change latency option to :numeric type.
2013-08-21 05:33:29 -06:00
Mark-Simulacrum
c12d98df4f
add comma at end of line 74
2013-08-20 15:59:38 -06:00
Mark-Simulacrum
24ce8334ee
Add latency option to listener object.
2013-08-20 06:36:51 -06:00
Mark-Simulacrum
d37eca6a54
Add latency option.
...
Aliased to -l.
2013-08-20 06:32:49 -06:00
Thomas Reynolds
4aa985b750
Merge pull request #989 from Mark-Simulacrum/patch-1
...
Create automated alt tag addition, based on image name.
2013-08-19 09:08:27 -07:00
Mark-Simulacrum
b1b3339597
Create automated alt tag addition, based on image name.
...
Needs documentation.
2013-08-18 20:06:39 -06:00
Thomas Reynolds
fd33768116
Merge pull request #987 from Linuus/master
...
Fixed encoding issues
2013-08-17 15:36:13 -07:00
Linus Pettersson
e77e615314
Fixed encoding for new buffer
2013-08-18 00:07:26 +02:00
Ben Hollis
f92ae94728
Escape filenames in regexes. Fixes #942 .
2013-08-15 22:04:18 -07:00
Ben Hollis
a3e030e846
Merge pull request #985 from jasonwebster/fix_http_prefix_generated_config
...
Fix wrong http pathing/prefixing example in generated config
2013-08-15 18:08:40 -07:00
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
c2082da444
Merge pull request #962 from Vaguery/kramdown_1.1
...
kramdown 1.0.x -> 1.1
2013-07-19 16:22:32 -07:00
Bill Tozier
44f8f556a4
kramdown 1.0.x -> 1.1
2013-07-19 18:42:47 -04:00
Thomas Reynolds
ec060e0b6e
change tests since coffee changed their output
2013-07-16 15:10:43 -07:00
Thomas Reynolds
ba3b8c4db3
old redcarpet for ruby 1.8
2013-07-16 15:07:59 -07:00
Thomas Reynolds
c0192e2849
Merge pull request #960 from agorf/master
...
Loading an image repeatedly in the server throws a 500 Internal Server Error
2013-07-12 19:33:33 -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
Thomas Reynolds
40cf047a9b
Merge pull request #959 from agorf/master
...
Stuff is double-escaped in meta pages (config, sitemap)
2013-07-12 13:25:09 -07: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
bd4a6c1eb8
reprep2
2013-07-02 14:44:18 -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
Thomas Reynolds
ab98f4bcc0
Merge pull request #947 from arronmabrey/add_support_for_nojekyll_dotfile
...
Add support for nojekyll dotfile [with tests]
2013-07-01 08:10:21 -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
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
