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
349 Commits 314 Branches 70 Tags
ff570c3ddcca3377b6569cf33421d7a66b079ebb
Commit Graph
349 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 1af28a6eb8 Merge pull request #233 from Shopify/make_map_work_on_enumerables 
Make 'map' filter work on Enumerable drops
 2013-07-26 08:30:16 -07:00
Florian Weingarten 65dfd57bb5 Make 'map' filter work on Enumerable drops 2013-07-26 10:35:28 -04:00
Florian Weingarten 554675d1f8 Update README.md 2013-07-26 14:46:55 +02:00
Florian Weingarten 11e1379570 Merge pull request #234 from Shopify/fix_mapping_procs 
Fix mapping over procs
 2013-07-26 05:45:56 -07:00
Florian Weingarten 3e13ed4ba1 Fix mapping over procs 2013-07-25 22:11:44 -04:00
Florian Weingarten b004acf856 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-07-25 14:10:52 -07: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 c7336e0cc1 Add license to gemspec, closes #231 2013-07-24 19:10:12 -04:00
Florian Weingarten bbc405a24c Merge pull request #230 from Shopify/use_invoke_drop_in_map 
Use invoke_drop in map filter
 2013-07-24 12:47:56 -07: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 f0ecd02199 Fix some blank tests 2013-07-03 02:47:22 +02:00
Florian Weingarten 4a103a9dde Merge pull request #218 from Shopify/dont_render_blank_blocks 
Dont render blank blocks
 2013-07-02 15:15:54 -07: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
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 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 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 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 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