Arthur Neves
|
a64360d148
|
Update history
Conflicts:
History.md
|
2013-10-09 16:33:44 -04:00 |
|
Florian Weingarten
|
6cb5a9b7cc
|
Merge pull request #234 from Shopify/fix_mapping_procs
Fix mapping over procs
|
2013-10-09 16:32:53 -04:00 |
|
Florian Weingarten
|
4207d1f086
|
Merge pull request #232 from Shopify/to_liquid_stuff
Always call 'to_liquid' on stuff in map filter and allow to_liquid to be...
|
2013-10-09 16:32:45 -04:00 |
|
Florian Weingarten
|
988a1694fd
|
Use invoke_drop in map filter
|
2013-10-09 16:32:38 -04:00 |
|
Florian Weingarten
|
5c5e7de31e
|
Merge pull request #221 from d-Pixie/master
Changes not empty? to any?
|
2013-07-01 07:55:26 -07:00 |
|
Jonas Schubert Erlandsson
|
f91233450f
|
Changes not empty? to any?
|
2013-07-01 16:12:58 +02:00 |
|
Florian Weingarten
|
429e492984
|
Merge pull request #220 from coding46/master
Fix some typos in comments
|
2013-06-27 13:20:24 -07:00 |
|
G. Bodenschatz
|
d36a1c518b
|
Fix some typos in comments
|
2013-06-27 22:16:23 +02:00 |
|
Florian Weingarten
|
37309678de
|
Merge pull request #219 from Shopify/indent_and_trailing_ws_cleanup
Convert legacy tab indentation to spaces and remove trailing whitespace ...
|
2013-06-27 06:50:28 -07:00 |
|
Florian Weingarten
|
cfb60c2f1b
|
Update History.md
|
2013-06-27 14:30:37 +02: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
|
7a3746ad77
|
Update CONTRIBUTING.md
Add @arthurnn for code review
|
2013-06-26 05:03:05 +03:00 |
|
Florian Weingarten
|
24511556d3
|
Update README.md
|
2013-06-20 09:53:21 -03:00 |
|
Florian Weingarten
|
5621556b3a
|
Update History.md
|
2013-06-18 12:36:50 -03:00 |
|
Florian Weingarten
|
fd230bef14
|
Merge pull request #106 from gnowoel/fix_example_servlet
fix example servlet
|
2013-06-18 08:35:42 -07:00 |
|
Florian Weingarten
|
e9f3a8e4d3
|
Update History.md
|
2013-06-18 05:18:43 +03: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
|
9c9a7ce8d3
|
Update History.md
|
2013-06-18 05:01:23 +03:00 |
|
Florian Weingarten
|
b7837ce218
|
Merge pull request #210 from Shopify/truncate_utf8_test
UTF8 truncate test
|
2013-06-17 09:45:10 -07: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
|
f5d75718e9
|
Update History.md
|
2013-06-16 18:31:19 +03:00 |
|
Florian Weingarten
|
c280936afa
|
Merge pull request #209 from Shopify/fix_broken_raw_parsing
Fix broken 'raw' tag parsing (issue #204)
|
2013-06-15 04:58:51 -07:00 |
|
Florian Weingarten
|
e47d1af03a
|
Fix broken 'raw' tag parsing (issue #204)
|
2013-06-14 12:47:27 -04:00 |
|
Florian Weingarten
|
81f6c79c53
|
Update README.md
|
2013-06-14 10:04:24 -03:00 |
|
Florian Weingarten
|
3174411407
|
Merge pull request #208 from Shopify/contributing
CONTRIBUTING.md
|
2013-06-14 05:58:37 -07:00 |
|
Florian Weingarten
|
f7c4b0cdec
|
Update History.md
|
2013-06-14 08:57:27 -04:00 |
|
Florian Weingarten
|
3d1f582318
|
Merge pull request #201 from arthurnn/adding_version_file
create version.rb file, and bump version
|
2013-06-14 05:45:48 -07:00 |
|
Florian Weingarten
|
27db1def63
|
CONTRIBUTING.md
|
2013-06-14 02:41:08 +02:00 |
|
Florian Weingarten
|
5cfa13d7a4
|
Merge pull request #205 from phoet/stricter_handling_of_variables_in_for
rejects variables like a/b in for loops, closes #150
|
2013-06-13 15:26:00 -07:00 |
|
Peter Schröder
|
cb12497859
|
add test for allowing whitespace between tokens
|
2013-06-13 18:21:49 -04:00 |
|
Florian Weingarten
|
4c2e2f8a24
|
Merge pull request #203 from phoet/strip_carriage_return
handle carriage return in strip_newline, closes #126
|
2013-06-13 12:54:17 -07:00 |
|
Peter Schröder
|
a2df5a421d
|
rejects variables like a/b in for loops, closes #150
|
2013-06-11 17:22:33 -04:00 |
|
Dylan Thacker-Smith
|
437e9201de
|
Merge pull request #174 from yardstick/drop-context
Allow a Liquid::Drop to be passed into Template#render
|
2013-06-10 07:46:06 -07:00 |
|
Peter Schröder
|
fd263bba0f
|
handle carriage return in strip_newline, closes #126
|
2013-06-09 10:24:35 -04:00 |
|
Arthur Neves
|
0d9353591b
|
bump master version to 2.6.0
Bumping master version to 2.6.0
Adding 2.6.0 changes to history
|
2013-06-06 14:17:12 -04:00 |
|
Arthur Neves
|
1849c24f2c
|
Adding version file
Follow the standard structure of having a version.rb file
|
2013-06-06 14:10:45 -04:00 |
|
Daniel Huckstep
|
f8288546f8
|
Missed in the rebase conflicts
|
2013-06-06 10:20:34 -06:00 |
|
Daniel Huckstep
|
076ae903c0
|
Make sure the context gets set
|
2013-06-06 10:19:20 -06:00 |
|
Daniel Huckstep
|
ba5e65f685
|
Better test, resuse Hash block
|
2013-06-06 10:18:47 -06:00 |
|
Daniel Huckstep
|
b699c93bae
|
Allow a Liquid::Drop to be passed into Template#render
|
2013-06-06 10:17:01 -06:00 |
|
Florian Weingarten
|
85c1503378
|
Merge pull request #200 from arthurnn/155_float_precision
use BigDecimal on filters to have better precision
|
2013-06-05 14:07:20 -07:00 |
|
Arthur Neves
|
ab760649ee
|
use BigDecimal on filters to have better precision
|
2013-06-05 16:09:05 -04:00 |
|
Florian Weingarten
|
f4fb2f159c
|
Merge pull request #157 from stomar/avoid_warnings
Avoid warnings in Ruby 1.9.3
|
2013-06-05 09:10:41 -07:00 |
|
Florian Weingarten
|
a5cd494717
|
Merge pull request #176 from unreal/master
Add reverse filter
|
2013-06-05 09:04:53 -07:00 |
|
Florian Weingarten
|
f8915f3cd2
|
Merge pull request #199 from phoet/add_documentation_for_include
add documentation to include, fixes #163
|
2013-06-05 09:00:11 -07:00 |
|
Peter Schröder
|
e92540a9bf
|
add documentation to include, fixes #163
|
2013-06-05 11:53:01 -04:00 |
|