kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-04 09:15:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
319 Commits 123 Branches 38 Tags
10c151e3aaf00ae6231d89f9504bf2f685cecccf
Commit Graph

319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
94ff457744 Merge pull request #198 from Shopify/limit_resource_usage 
Resource usage limits
 2013-05-31 08:24:29 -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
27fe76c0dd Merge pull request #192 from Shopify/revert_utf8 
Revert "Merge pull request #185 from ISSIntel/liquid-utf8"
 2013-05-21 14:46:17 -07:00