kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
337 Commits 123 Branches 38 Tags
dcd21d3db376671536baed0b982e7aac8a4a0d53
Commit Graph

337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Weingarten
dcd21d3db3 Bump version to 2.6.1 v2.6.1 2014-01-10 13:21:05 -05:00
Florian Weingarten
deeb813d53 Merge pull request #300 from Shopify/cherry_pick_security_fix_to_2-6-stable 
Cherry pick security fix to 2-6-stable
 2014-01-10 10:20:41 -08:00
Florian Weingarten
eb409ff237 Cherry pick security fix (#274) to 2-6-stable 2014-01-10 11:22:28 -05:00
Arthur Neves
442041206f Update history log v2.6.0 2013-11-25 10:25:39 -05:00
Arthur Neves
dc6c6fbb9a Bump version to 2.6.0 2013-11-25 10:24:30 -05:00
Florian Weingarten
4293be3154 Update history 2013-11-11 09:02:32 -05:00
Arthur Nogueira Neves
736c11c876 Merge pull request #268 from Shopify/better_rake 
Improve Rakefile
Conflicts:
	Rakefile
 2013-10-10 10:59:26 -04:00
Arthur Neves
a41a60d294 Bump version to rc1 v2.6.0.rc1 2013-10-10 10:22:35 -04:00
Florian Weingarten
307cab2eaa History and gemspec 
Conflicts:
	History.md
	liquid.gemspec
 2013-10-09 17:04:47 -04:00
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