kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-06 02:05:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
482 Commits 123 Branches 38 Tags
de497eaed24710c968828cc2143ac6d4ec4e3447
Commit Graph

482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Weingarten
de497eaed2 Merge branch 'class_cache' of github.com:wildfireapp/liquid into wildfireapp-class_cache 2013-11-25 10:46:18 -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
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
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
Florian Weingarten
96b30a89a9 Fix map filter on Hash inputs 2013-10-08 08:18:03 -04:00
Florian Weingarten
81d3733f57 Regression test for change of blank? default behaviour (2efe809e11) 2013-09-23 09:38:45 -04:00
Florian Weingarten
2efe809e11 Make blank? default to false for all tags to maintain backwards compatible 2013-09-23 08:43:26 -04:00
Simon Hørup Eskildsen
322ecca145 Merge pull request #261 from Shopify/fix-i18n-regex-warning 
Fix i18n regex warning in Ruby 1.8
 2013-09-16 11:36:47 -07:00
Simon Eskildsen
6ce0b9d705 Fix i18n regex warning in Ruby 1.8 2013-09-16 14:35:33 -04:00
Florian Weingarten
736998df64 Merge pull request #257 from Shopify/fix_comment_tags_second_try 
Fix unknown tags in comment tags, second try
 2013-09-11 13:33:26 -07:00
Florian Weingarten
5b172a4c05 Fix unknown tags in comment tags, second try 2013-09-11 12:31:54 -04:00
Florian Weingarten
bd20595f1a Add regression test for comment tag 2013-09-11 12:14:27 -04:00
Florian Weingarten
f938756a58 Revert "Merge pull request #256 from Shopify/unknown_tags_in_comments" 
This reverts commit 1ae8c0e90a, reversing
changes made to 01d352bc51.
 2013-09-11 12:13:55 -04:00
Florian Weingarten
1ae8c0e90a Merge pull request #256 from Shopify/unknown_tags_in_comments 
Fix handling of unknown tags in comments
 2013-09-11 07:59:44 -07:00
Florian Weingarten
45795f8766 Fix handling of unknown tags in comments 2013-09-11 10:40:33 -04:00
Florian Weingarten
01d352bc51 Move stuff in test around 2013-09-11 14:40:11 +02:00
Ishibashi Hideto
70513fccaf remove include Liquid from the class CustomInclude and substitute QuotedFragment with Liquid::QuotedFragment 2013-09-11 03:25:06 +09:00
Ishibashi Hideto
a5285d3d09 test for the Jekyll's issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll](https://github.com/mojombo/jekyll/issues/1519) 2013-09-10 22:58:56 +09:00
Tristan Hume
beded415cd Merge pull request #253 from trishume/fix-range-parsing 
Fix bad range parsing.
 2013-09-07 05:17:30 -07:00
James Tucker
13c826933c Update against failed cherry-pick 2013-09-07 01:42:41 +00:00
Tristan Hume
7c5b3e0c3b Fix bad range parsing. 2013-09-04 18:13:31 -04:00
James Tucker
d4679cd550 Strainer test now works on 1.8 2013-08-31 18:57:09 +00:00
James Tucker
9b2d5b7dd3 Add a class cache to avoid runtime extend calls 
* Strainer has a class cache that creates Strainer subclasses for each filter
   set that is used on .create calls.
 * Context now creates a list of filters and passes this to Strainer.create to
   utilize the class cache in almost all use cases.
 * If add_filter was called after a render, then the method cache may still be
   invalidated.

Conflicts:

	lib/liquid/strainer.rb
 2013-08-31 18:56:35 +00:00
Tristan Hume
e8b41c8856 Fix error v2.5.2 2013-08-30 16:06:48 -04:00
Tristan Hume
4c22bacbba Merge branch 'master' of https://github.com/Shopify/liquid 2013-08-30 15:56:13 -04:00
Tristan Hume
09a5b57ebe Fix variable closing error message 2013-08-30 15:55:43 -04:00
Florian Weingarten
8059da4938 Update History.md 2013-08-30 15:28:33 -04:00
Tristan Hume
af50f71224 Guard against state that shouldn't happen but does 2013-08-30 15:26:26 -04:00
Simon Hørup Eskildsen
136b6763e6 Merge pull request #241 from Shopify/i18n-error 
Add I18n syntax error translation
 2013-08-30 09:55:05 -07:00