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
787 Commits 123 Branches 38 Tags
3-0-stable
Commit Graph

787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Weingarten
8d19fdde7f bump version v3.0.6 2015-07-24 11:14:18 -04:00
Florian Weingarten
e934826820 Merge pull request #633 from Shopify/backport_argument_error 
backport argument error fix
 2015-07-24 11:13:46 -04:00
Florian Weingarten
529cc60ef1 backport argument error fix 2015-07-24 11:04:40 -04:00
Justin Li
5068fcae03 Bump version to 3.0.5 v3.0.5 2015-07-23 17:04:50 -04:00
Justin Li
4095bfa9f8 Update history for 3.0.5 2015-07-23 17:04:30 -04:00
Justin Li
0148289b88 Update history for 2.6.3 2015-07-23 17:02:13 -04:00
Dylan Thacker-Smith
d891c2b7ab Fix a timezone test failure. 2015-07-23 16:37:26 -04:00
Florian Weingarten
ebbfb54de4 Bump version v3.0.4 2015-07-17 11:20:01 -04:00
Florian Weingarten
8f84ddb5ce Fix chained access to multi-dimensional hash 2015-07-17 11:19:38 -04:00
Justin Li
09de50dcb1 Bump version to 3.0.3 v3.0.3 2015-05-28 16:39:10 -04:00
Justin Li
49f2af4209 Merge pull request #570 from Shopify/fix-strict-conditions 
Fix condition parse order in strict mode
 2015-05-28 16:37:43 -04:00
Justin Li
5d7c00a202 Merge pull request #553 from Shopify/cherry-pick-lookup 
Liquid 3.0.2
v3.0.2 		2015-04-27 11:56:13 -04:00
Justin Li
9bd05110dc Update changelog 2015-04-24 16:05:55 -04:00
Justin Li
9dd24824f9 Disable minitest expectation interface due to reckless modification of Object 2015-04-24 13:31:54 -04:00
Florian Weingarten
291b58bc91 Merge pull request #489 from alex-ross/patch-1 
Fixes syntax error in documentation for unless tag
 2015-04-24 11:27:42 -04:00
Florian Weingarten
8c193e203f bump version 2015-04-24 11:25:16 -04:00
Justin Li
47dbcd93a5 Merge pull request #551 from Shopify/expose-variable-name 
Merge pull request 551
 2015-04-24 11:23:35 -04:00
Dylan Thacker-Smith
000d0c911b Merge pull request #519 from Shopify/remove-filter-method-blacklist 
Allow filters to redefine Object methods to make them invokable.
 2015-02-04 18:09:51 -05:00
Arthur Neves
95b340a7cf Bump to version 3.0.1 v3.0.1 2015-01-23 10:45:47 -05:00
Arthur Neves
36a8696c07 Add ruby 2.2 to travis 
and allow failure on ruby head

Conflicts:
	.travis.yml
 2015-01-23 10:43:28 -05:00
Florian Weingarten
cbc163ba1c Merge pull request #506 from Shopify/fix_capture_with_hyphen 
Use VariableSignature as Syntax for Capture tag to allow hyphens in variable names
 2015-01-23 10:37:52 -05:00
Arthur Nogueira Neves
9faf8f9a56 Merge pull request #504 from alfredxing/duplicate-keys 
Remove duplicate `index0` key in TableRow tag
 2015-01-23 10:14:19 -05:00
Florian Weingarten
d6db28c854 Revert "Merge pull request #463 from Shopify/stricter-identifiers" 
This reverts commit a056f6521c, reversing
changes made to 7843bcca8d.
v3.0.0 		2014-11-07 01:49:01 +00:00
Florian Weingarten
475ea51f1f Revert "Merge pull request #466 from Shopify/remove-expression-cache" 
This reverts commit d9ae36ec40, reversing
changes made to 2da9d49478.
 2014-11-07 01:48:51 +00:00
Florian Weingarten
9c33e9601b Revert "Merge pull request #476 from Shopify/missing-variable-name-error" 
This reverts commit 4dc682313f, reversing
changes made to a8f60ff6b1.
 2014-11-07 01:48:16 +00:00
Florian Weingarten
b242a7273a Revert "Merge pull request #478 from Shopify/numbers-in-identifiers" 
This reverts commit 263e90e772, reversing
changes made to 4dc682313f.
 2014-11-07 01:48:05 +00:00
Florian Weingarten
4b1835e3c0 Revert "Merge pull request #458 from Shopify/block-body" 
This reverts commit 12d526a05c, reversing
changes made to 263e90e772.

Conflicts:
	lib/liquid/block_body.rb
 2014-11-07 01:47:47 +00:00
Florian Weingarten
2fe3a21a5d Revert "Merge pull request #479 from Shopify/tweaks-for-c" 
This reverts commit aa182f64b4, reversing
changes made to 70c45f8cd8.
 2014-11-07 01:46:59 +00:00
Justin Li
76ef675eb2 Merge pull request #481 from Shopify/fix-nil-blank 
Coerce regex @blank output to a boolean
 2014-11-06 13:03:15 -05:00
Justin Li
e5fd4d929f Coerce regex @blank output to a boolean 2014-11-05 20:44:06 -05:00
Justin Li
2e42c7be1f Merge pull request #480 from Shopify/number_variables 
Add quirks test for variables with number prefixes
 2014-11-05 12:05:21 -05:00
Justin Li
95b031ee04 Add quirks test for extra dots in ranges 2014-11-05 11:41:12 -05:00
Justin Li
4d97a714a9 Add quirks test for variables with number prefixes 2014-11-05 10:56:58 -05:00
Justin Li
aa182f64b4 Merge pull request #479 from Shopify/tweaks-for-c 
Tweaks for C
 2014-11-04 14:02:14 -05:00
Justin Li
4e870302b1 Add env var for saving stackprof graphviz output 2014-11-04 18:38:14 +00:00
Justin Li
098c89b5f5 Convenience methods for raising terminator syntax errors 2014-11-04 18:38:08 +00:00
Justin Li
70c45f8cd8 Use SVG badge URLs 
[ci skip]
 2014-11-03 17:41:42 -05:00
Justin Li
12d526a05c Merge pull request #458 from Shopify/block-body 
Create a BlockBody class to decouple block body parsing from tags.
 2014-11-03 17:34:39 -05:00
Dylan Thacker-Smith
2fd8ad08c0 Remove unused local variable that was accidentally added. 2014-11-03 17:07:42 -05:00
Dylan Thacker-Smith
15e1d46125 Avoid storing options instance variable in BlockBody. 
There is no need to pass parse options to the BlockBody initializer, since
it does all the parsing in the parse method, unlike tags which parse the
tag markup in the initializer.
 2014-11-03 17:07:42 -05:00
Dylan Thacker-Smith
73fcd42403 Create a BlockBody class to decouple block body parsing from tags. 2014-11-03 17:07:42 -05:00
Justin Li
263e90e772 Merge pull request #478 from Shopify/numbers-in-identifiers 
Use a single token for identifiers
 2014-10-30 21:59:26 -04:00
Justin Li
81770f094d Remove unnecessary + 2014-10-29 13:39:43 -04:00
Justin Li
dd5ee81089 Disallow number and dash identifier prefixes 2014-10-29 12:08:00 -04:00
Justin Li
a07e382617 Use a single token for identifiers 2014-10-29 11:28:41 -04:00
Justin Li
4dc682313f Merge pull request #476 from Shopify/missing-variable-name-error 
Disallow filters with no variable in strict mode
 2014-10-27 13:56:11 -04:00
Justin Li
5616ddf00e Remove obsolete comment 2014-10-27 13:44:14 -04:00
Justin Li
fcb23a4cd2 Disallow filters with no variable in strict mode 2014-10-27 13:34:27 -04:00
Justin Li
a8f60ff6b1 Merge pull request #472 from Shopify/fix-leaky-test 
Fix test leaking error_mode, fix equality check for VariableLookup
 2014-10-23 10:12:41 -04:00
Justin Li
a206c8301d Fix test leaking error_mode, fix equality check for VariableLookup 2014-10-22 15:40:41 -04:00