Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity
352 Commits 314 Branches 70 Tags
f98949117df9bea291a37794aabba20f23e22fa5
Commit Graph
203 Commits
Author SHA1 Message Date
Florian Weingarten f98949117d Fix .include? method on Enumerable drops, used by "contains" conditions 2013-08-02 10:23:10 -04:00
Florian Weingarten 7fdb789eac Ruby 1.8.x compatibility 2013-08-01 13:56:01 -04:00
Florian Weingarten ff570c3ddc Fix clashing method names in enumerable drops 2013-08-01 13:17:02 -04:00
Florian Weingarten 07f7d63bea Use kind_of? instead of class.include? and rearrange stuff 2013-07-26 11:34:00 -04:00
Florian Weingarten 65dfd57bb5 Make 'map' filter work on Enumerable drops 2013-07-26 10:35:28 -04:00
Florian Weingarten 3e13ed4ba1 Fix mapping over procs 2013-07-25 22:11:44 -04:00
Florian Weingarten 182d3fefb6 Always call 'to_liquid' on staff in map filter and allow to_liquid to be called on drops 2013-07-25 17:10:19 -04:00
Florian Weingarten f9027d54ab Use invoke_drop in map filter 2013-07-24 15:41:50 -04:00
Florian Weingarten fbfda1a189 Little cosmetic change 2013-07-05 11:30:50 -04:00
Florian Weingarten 0f38fe3596 Add blank test for case tags 2013-07-02 18:08:20 -04:00
Florian Weingarten cd3f976288 Merge branch 'master' into dont_render_blank_blocks 
Conflicts:
	lib/liquid/tag.rb
 2013-07-02 14:00:30 -04:00
Florian Weingarten b53601100f Make sure include tags are never blank 2013-07-02 13:57:27 -04:00
Jonas Schubert Erlandsson f91233450f Changes not empty? to any? 2013-07-01 16:12:58 +02:00
G. Bodenschatz d36a1c518b Fix some typos in comments 2013-06-27 22:16:23 +02:00
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 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 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 e47d1af03a Fix broken 'raw' tag parsing (issue #204) 2013-06-14 12:47: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 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
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
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
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
Dylan Thacker-Smith 482115d784 Merge pull request #173 from jsw0528/master 
fix `can't convert Fixnum into String` for `replace`
 2013-06-04 13:09:42 -07: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
Tom Burns 50b2ebee56 Merge pull request #189 from Shopify/cache_partials 
Cache tokenized partial templates
 2013-05-29 07:51:12 -07:00
Dylan Thacker-Smith 23203c0122 Fix some old templates that abused colon as an argument separator. 
This is a fallback for keyword argument parsing since this feature broke
old templates that accidentally used a colon as a filter argument
separator.
 2013-05-21 17:47:46 -04:00
Tom Burns 8913a5615a Revert "Merge pull request #185 from ISSIntel/liquid-utf8" 
This reverts commit c5dfcd29b0, reversing
changes made to f7d1e1d0c1.
 2013-05-20 19:53:13 -04:00
Tasos Stathopoulos 8c1bbfec57 Use array instead of Hash to keep the registered filters 
1.8.7 compatibility fix

In Ruby 1.8.7, Hash does not preserve insertion ordering as Array does.
This could cause a problem when registering filters which depend on others and
the registration order is important.

So, the @@filters variable was changed to array where the order of the filters is
the same as the insertion order.
 2013-05-17 14:12:57 +03:00