 Florian Weingarten
|
40a37c3fb6
|
Merge branch 'master' into dont_render_blank_blocks
Conflicts:
lib/liquid/tags/cycle.rb
lib/liquid/tags/increment.rb
|
2013-06-27 10:03:18 -04:00 |
|
|
Florian Weingarten
|
668ee5e1c4
|
Clean up whitespace collapsing
|
2013-06-27 14:06:05 +02:00 |
|
|
Florian Weingarten
|
b4fbcea114
|
Cycle tags are never blank
|
2013-06-27 14:00:38 +02:00 |
|
|
Florian Weingarten
|
c16697746b
|
Clean up whitespace collapsing a bit
|
2013-06-27 13:57:26 +02:00 |
|
|
Florian Weingarten
|
f01d0dbea6
|
More tests for whitespace collapsing
|
2013-06-27 13:39:04 +02:00 |
|
|
Florian Weingarten
|
10c151e3aa
|
Some tests for whitespace collapsing
|
2013-06-26 22:30:33 -04:00 |
|
|
Florian Weingarten
|
d6e13faa43
|
Don't render blank blocks
|
2013-06-26 22:21:47 -04:00 |
|
|
Florian Weingarten
|
0f5441b09e
|
Convert legacy tab indentation to spaces and remove trailing whitespace from all lines
|
2013-06-26 19:53:09 -04:00 |
|
|
Florian Weingarten
|
8ca4868bff
|
Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master
|
2013-06-18 04:13:49 +02:00 |
|
|
Florian Weingarten
|
f92da6948d
|
Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix
Conflicts:
lib/liquid/standardfilters.rb
|
2013-06-18 04:11:11 +02:00 |
|
|
Florian Weingarten
|
a1b156f0d4
|
strip_html multi-line comment test
|
2013-06-18 04:06:35 +02:00 |
|
|
Florian Weingarten
|
eca520025c
|
Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html
Conflicts:
lib/liquid/standardfilters.rb
|
2013-06-18 04:04:49 +02:00 |
|
|
Florian Weingarten
|
b81469d183
|
Make truncate work for Ruby 1.8
|
2013-06-17 12:05:02 -04:00 |
|
|
Florian Weingarten
|
f488058789
|
UTF8 truncate test
|
2013-06-17 11:48:03 -04:00 |
|
|
Florian Weingarten
|
e47d1af03a
|
Fix broken 'raw' tag parsing (issue #204)
|
2013-06-14 12:47:27 -04:00 |
|
|
Florian Weingarten
|
f7c4b0cdec
|
Update History.md
|
2013-06-14 08:57:27 -04:00 |
|
|
Florian Weingarten
|
27db1def63
|
CONTRIBUTING.md
|
2013-06-14 02:41:08 +02:00 |
|
|
Florian Weingarten
|
1e8c081b42
|
Create new resource_limits hash on Template initialization
|
2013-05-31 09:41:59 -04:00 |
|
|
Florian Weingarten
|
2b17e24b16
|
Mutate resource_limits hash to flag that the limit was reached (for outside observation)
|
2013-05-31 09:34:23 -04:00 |
|
|
Florian Weingarten
|
9075b428b1
|
Resource limits: Don't raise Error but render error message (but abort after first error)
|
2013-05-31 09:25:25 -04:00 |
|
|
Florian Weingarten
|
8760b5e8c4
|
Add optional resource usage limitations to number of rendering calls, length of rendering output and/or number of variable/capture assignments
|
2013-05-30 17:04:26 -04:00 |
|