kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-02 16:25:42 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
760 Commits 123 Branches 38 Tags
2fe3a21a5d2497d4724dd5ebb3da1708057a4ed2
Commit Graph

760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Weingarten
ee7edacacc Merge pull request #298 from Shopify/respond_to_resource_counting_bug 
Fix resource counting bug with respond_to?(:length)
 2014-01-08 10:37:48 -08:00
Florian Weingarten
62a86a25ae update history 2014-01-08 13:37:24 -05:00
Florian Weingarten
c6e0c1e490 Fix resource counting bug with respond_to?(:length) 2014-01-08 13:00:53 -05:00
Florian Weingarten
43ac8d560b Freeze all the things 2014-01-07 12:35:16 -05:00
Arthur Nogueira Neves
0388376925 Merge pull request #296 from Shopify/ruby2.1.0 
Ruby2.1.0
 2014-01-07 08:55:03 -08:00
Arthur Neves
57c8583dc3 Add 2.1.0 to travis 2014-01-07 11:37:24 -05:00
Arthur Neves
a13f237d3c Remove some 192 tests 2014-01-07 11:37:01 -05:00
Arthur Nogueira Neves
9ed2fa425b Merge pull request #295 from Shopify/remove_ruby_debug 
remove ruby-debug
 2014-01-07 08:34:19 -08:00
Arthur Neves
208c6c8800 remove ruby-debug 2014-01-07 11:31:46 -05:00
Florian Weingarten
9ec2b9da2d Rename tests because of name clashes (same method name used twice) 2014-01-07 11:20:32 -05:00
Florian Weingarten
be7bef4d0b Merge pull request #284 from agladkyi/custom-patterns-for-template-filenames 
Custom patterns for template filenames
 2013-12-16 11:28:19 -08:00
Andrei Gladkyi
0ae42bbc32 Added separate test for custom patterns specifying 
+ updated History.md
 2013-12-16 17:48:43 +02:00
Gaurav Chande
0ec69890ab Merge pull request #287 from Shopify/fix-escape-once 
Fix escape_once filter
 2013-12-02 08:57:24 -08:00
Gaurav Chande
5e8f2f8bd0 Fix escape_once filter 2013-12-01 20:37:47 -05:00
Andrei Gladkyi
0edb252489 Option to specify custom pattern for template filenames 2013-11-30 17:55:53 +02:00
Florian Weingarten
5ce36f79e9 Add Tom's slice loading change to History.md 2013-11-25 11:12:33 -05:00
Florian Weingarten
2d1f15281b Merge pull request #282 from Shopify/load_slice 
allow drops to optimize loading a slice of elements
 2013-11-25 08:12:06 -08:00
Florian Weingarten
4647e6d86b Remove unnecessary comment, add joost's change to History.md 2013-11-25 10:52:46 -05:00
Florian Weingarten
f5620d4670 Merge branch 'master' of github.com:joost/liquid into joost-master 2013-11-25 10:51:48 -05:00
Florian Weingarten
f1a5f6899b Add raggi's change to History, remove Ruby 1.8 code from test 2013-11-25 10:48:03 -05:00
Florian Weingarten
de497eaed2 Merge branch 'class_cache' of github.com:wildfireapp/liquid into wildfireapp-class_cache 2013-11-25 10:46:18 -05:00
Tom Burns
30e5f06313 don't make original slice_collection_using_each private 2013-11-25 10:37:10 -05:00
Arthur Neves
d465d5e20c Add ruby 2.1 on travis 2013-11-25 10:35:24 -05:00
Arthur Neves
7989e834f3 Allow rbx failure and not 2.0.0 2013-11-25 10:33:41 -05:00
Arthur Neves
c264459931 Update history log 
Conflicts:
	History.md
 2013-11-25 10:28:12 -05:00
Tom Burns
e667352629 move slice_collection optimization to utils 2013-11-24 14:00:23 -05:00
Tom Burns
2c26a880f0 add another test showing equivalent functionality 2013-11-24 12:32:32 -05:00
Tom Burns
cf49b06ccc allow drops to optimize loading a slice of elements 2013-11-24 12:29:15 -05:00
Florian Weingarten
f015d804ea Update history 2013-11-11 09:03:39 -05:00
Arthur Nogueira Neves
78c42bce44 Update README.md 
Show travis badge from master only.
 2013-11-04 18:37:53 -05:00
Florian Weingarten
445f19d454 Merge pull request #276 from Shopify/remove_some_1.8_code 
Remove some legacy Ruby 1.8 compatibility code
 2013-11-01 05:50:29 -07:00
Florian Weingarten
a599a26f1a Remove some legacy Ruby 1.8 compatibility code 2013-10-31 15:35:12 -04:00
Dylan Thacker-Smith
4e14a651a7 Merge pull request #274 from Shopify/restrict-send-on-conditions 
security: Prevent arbitrary method invocation on conditions in if tag.
 2013-10-28 10:01:47 -07:00
Dylan Thacker-Smith
cc982e92d0 security: Prevent arbitrary method invocation on conditions in if tag. 2013-10-28 12:20:27 -04:00
Bouke van der Bijl
71a386f723 Merge pull request #273 from Shopify/make-if-less-dangerous 
Make if less dangerous
 2013-10-28 06:39:05 -07:00
Bouke van der Bijl
2f50a0c422 Add history message 2013-10-28 14:10:13 +01:00
Bouke van der Bijl
a5cd661dd9 Use public_send on condition creation 
This makes sure you can't call Kernel methods like `throw`
 2013-10-28 13:57:28 +01:00
Bouke van der Bijl
511ee7fbe1 Remove to_sym from condition creation 
This prevents a DoS http://www.tricksonrails.com/2010/06/avoid-memory-leaks-in-ruby-rails-code-and-protect-against-denial-of-service/
 2013-10-28 13:57:28 +01:00
Joost Hietbrink
5eddfe87d0 Support for passing variables to snippets in subdirs 
Now you can use "include 'some/snippet' with variable".
 2013-10-16 11:55:12 +02:00
Florian Weingarten
9b910a4e6d Update README.md 
Remove old wiki link
 2013-10-15 13:14:39 -04:00
Arthur Neves
7e1a0be752 Put travis badge on top 2013-10-11 12:08:19 -04:00
Arthur Neves
c9ea578b64 Drop 1.8 support on travis CI and add 2.0.0 2013-10-11 12:03:01 -04:00
Florian Weingarten
549777ae53 Merge pull request #267 from djreimer/default-filter 
Add default filter to standard filters
 2013-10-11 07:59:21 -07:00
Derrick Reimer
6710ef60bc Add default filter to history 2013-10-10 09:17:49 -07:00
Arthur Nogueira Neves
5fdab083b0 Merge pull request #268 from Shopify/better_rake 
Improve Rakefile
 2013-10-10 07:55:08 -07:00
Arthur Neves
0644da02bb Improve Rakefile 2013-10-10 10:44:16 -04:00
Derrick Reimer
5db1695694 Add default filter to standard filters 2013-10-09 16:07:32 -07:00
Florian Weingarten
a25ed17e2b Merge pull request #266 from Shopify/fix_map_on_hashes 
Fix map filter on Hash inputs
 2013-10-09 14:18:22 -07:00
Arthur Neves
fa3155fdcc Bump version to 3.0.0 2013-10-09 17:12:03 -04:00
Arthur Neves
534338f923 Update history 
Add 3.0.0 history
Add changes related to 2.5.x
 2013-10-09 17:11:19 -04:00