Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-15 08:50:45 -07:00
Code Issues Packages Projects Releases Wiki Activity
911 Commits 314 Branches 70 Tags
5fbb312a67e1276f817cebad6885d00ca658e47f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Weingarten 504b6fb3c7 Merge pull request #596 from Shopify/liquid_c_tests 
Run tests with latest liquid/c gem
 2015-06-08 22:52:57 +02:00
Florian Weingarten 01420e8014 fix gem platforms 2015-06-08 18:38:40 +00:00
Florian Weingarten dde35a2907 shut up rubocop 2015-06-08 18:38:40 +00:00
Florian Weingarten 7b4398d0c4 Merge pull request #595 from Shopify/uniq_on_strings 
Fix uniq filter with string input
 2015-06-05 16:27:05 +02:00
Florian Weingarten 13716fa68b Merge pull request #594 from boobooninja/rake_console 
add rake console
 2015-06-05 04:21:01 +02:00
Florian Weingarten c82e04f4e6 Merge pull request #593 from Shopify/fix_predicate_name 
Rename 'has_key?' and 'has_interrupt?'
 2015-06-04 19:40:14 +02:00
Florian Weingarten b347fac3c0 Merge pull request #592 from Shopify/method_literal 
blank and empty as variable names
 2015-06-04 19:09:48 +02:00
Florian Weingarten 1d3c0b3dab Merge pull request #568 from Shopify/remove_liquid_methods 
Remove support for `liquid_methods` Module extension
 2015-05-14 22:19:02 +02:00
Florian Weingarten f4724f0db3 Remove support for liquid_methods Module extension 2015-05-14 14:44:19 +00:00
Florian Weingarten df74955ac4 Merge pull request #564 from Shopify/rubocop 
Rubocop
 2015-05-14 16:41:32 +02:00
Florian Weingarten 3372ca8136 Rubocop 2015-05-14 14:37:18 +00:00
Florian Weingarten 9e815ec594 Merge pull request #563 from Shopify/webscale_exceptions 
Prefer Class.new() where possible
 2015-05-13 06:06:35 +02:00
Florian Weingarten 93b29b67ef Prefer Class.new() where possible 2015-05-13 02:47:43 +00:00
Florian Weingarten 2fbe813770 Merge pull request #539 from Dorian/patch-1 
Update module_ex.rb code documentation and code style
 2015-03-24 15:21:22 +01:00
Florian Weingarten bebd3570ee 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-10 23:27:00 -05:00
Florian Weingarten 7cfee1616a Use VariableSignature as Syntax for Capture tag to allow hyphens in variable names 2015-01-09 14:15:26 +00:00
Florian Weingarten 319400ea23 Merge pull request #489 from alex-ross/patch-1 
Fixes syntax error in documentation for unless tag
 2014-11-19 14:02:58 +01:00
Florian Weingarten 3321cffe08 Merge pull request #482 from joshk/patch-1 
Use the new beta build env on Travis
 2014-11-07 03:06:52 +01:00
Florian Weingarten 2da9d49478 Merge pull request #465 from Shopify/avoid_multi_assigns 
Avoid parallel assignments
 2014-10-18 16:19:02 +02:00
Florian Weingarten 7196a2d58e Avoid parallel assignments 2014-10-18 13:58:32 +00:00
Florian Weingarten 76ea5596ff Merge pull request #462 from Shopify/flat_map 
nodelist flat_map over map.flatten
 2014-10-17 18:32:00 +02:00
Florian Weingarten f9318e8c93 flat_map 2014-10-17 16:11:12 +00:00
Florian Weingarten 71253ec6f9 Merge pull request #459 from Shopify/pop_vs_shift 
Use pop over shift to avoid reverse
 2014-10-15 21:42:53 +02:00
Florian Weingarten 0fa075b879 Use pop over shift to avoid reverse 2014-10-15 19:26:39 +00:00
Florian Weingarten 632b1fb702 Merge pull request #455 from Shopify/parse_error_line_numbers 
Line numbers for all parse errors
 2014-10-04 17:53:30 +02:00
Florian Weingarten 584b492e70 Line numbers for all parse errors 2014-10-03 21:00:31 +00:00
Florian Weingarten 7ba5a6ab75 Merge pull request #450 from Shopify/additional_test_for_includes 
Regression test for including assignments
 2014-09-18 21:05:37 +02:00
Florian Weingarten be3d261e11 Regression test for including assignments 2014-09-18 10:37:44 +00:00
Florian Weingarten 4004cb63a5 Merge pull request #419 from Shopify/liquid_error_line_numbers 
Optional line numbers for liquid errors
 2014-09-08 23:15:53 +02:00
Florian Weingarten ce06ed4bb1 merge conflicts 2014-09-05 14:16:20 +00:00
Florian Weingarten 939365c234 move line number check 2014-09-05 14:12:30 +00:00
Florian Weingarten c60fd0715d remove unnecessary nil 2014-09-05 14:12:30 +00:00
Florian Weingarten c83e1c7b6d prefix for Liquid::Error instances 2014-09-05 14:12:30 +00:00
Florian Weingarten aabbd8f1a1 remove unnecessary method 2014-09-05 14:12:30 +00:00
Florian Weingarten 60d8a213a5 Clean up Liquid::Error#render 2014-09-05 14:12:30 +00:00
Florian Weingarten 17cc8fdbb3 put line number in parentheses 2014-09-05 14:12:30 +00:00
Florian Weingarten 5eff375094 Optional line numbers for liquid errors 2014-09-05 14:12:29 +00:00
Florian Weingarten c0ec0652ae Merge pull request #421 from djreimer/url-encode-filter 
Add url_encode standard filter
 2014-08-15 20:05:39 +02:00
Florian Weingarten c2663258be Merge pull request #364 from collectiveidea/instrument-rendering-with-hooks 
Profiling the rendering of a liquid template
 2014-08-13 23:04:29 +02:00
Florian Weingarten 35808390ee Merge pull request #414 from Shopify/to_liquid_context 
Call to_liquid in Context invoke
 2014-08-12 22:05:52 +02:00
Florian Weingarten 1678c07548 Call to_liquid in Context invoke 2014-08-12 19:54:12 +00:00
Florian Weingarten 5c0e0be639 Merge pull request #402 from Shopify/benchmark-ips 
benchmark/ips
 2014-08-11 21:22:43 +02:00
Florian Weingarten a74d40f1e5 benchmark/ips 2014-08-11 19:22:06 +00:00
Florian Weingarten 4b22fc8d1b Merge pull request #407 from Shopify/slice_arrays 
Slice filter for arrays
 2014-08-05 20:00:45 +02:00
Florian Weingarten fb6f9c1c13 Slice filter for arrays. 2014-08-05 17:59:31 +00:00
Florian Weingarten 66ae7f3ec0 Merge pull request #406 from Shopify/slice_filter 
slice filter
 2014-08-05 17:14:01 +02:00
Florian Weingarten 0bea31d2ef Use Integer() instead of to_i 2014-08-05 15:13:15 +00:00
Florian Weingarten e5b0487fef Merge pull request #312 from Shopify/uniq_filter 
uniq filter
 2014-08-05 16:22:48 +02:00
Florian Weingarten 9117722740 Use symbols in respond_to? 2014-08-05 14:22:11 +00:00
Florian Weingarten baea0a6bf7 slice filter 2014-08-04 16:47:08 +00:00
Florian Weingarten 9b8e3d437e Merge pull request #401 from Shopify/ktdreyer-minitest 
Minitest 5 (continuation of #358)
 2014-07-29 15:05:23 +02:00
Florian Weingarten a2f0f2547d with_global_filter test helper 2014-07-28 19:28:22 +00:00
Florian Weingarten 6c6350f18b Exception handling for humans 
Ability to pass exception_handler as a block to #render
and provide whatever behavior you want on handling exceptions

https://github.com/Shopify/liquid/pull/254
 2014-07-24 14:44:02 +00:00
Florian Weingarten eae24373e6 remove unnecessary flatten filter 2014-07-24 02:56:57 +00:00
Florian Weingarten 0b45ffeada add more legacy tests 2014-07-24 00:33:39 +00:00
Florian Weingarten c75522026b Merge pull request #389 from Shopify/remove_unnecessary_blank_stuf 
Remove unnecessary blank? code
 2014-07-23 15:07:26 +02:00
Florian Weingarten 1e0e9f1f31 Remove unnecessary blank? code 2014-07-22 21:19:12 +00:00
Florian Weingarten c4bc6cf3db Merge pull request #378 from Shopify/revert_352 
Revert: Add error messages for missing variables when :strict
 2014-07-08 17:31:19 +02:00
Florian Weingarten 0ac3ec7834 Revert "Merge pull request #352 from gaiottino/master" 
This reverts commit 553b0926ae, reversing
changes made to 628ab3dc6a.
 2014-07-08 14:48:19 +00:00
Florian Weingarten 8909c9f27a add regression tests for #377 2014-07-08 14:47:39 +00:00
Florian Weingarten 1ea178e7a8 Merge pull request #363 from rrrene/patch-2 
Update docs badge in README
 2014-06-05 10:32:47 -04:00
Florian Weingarten 2eb552c65d Merge pull request #354 from Dillon-Benson/patch-3 
use attr_writer instead of error_mode= method
 2014-05-02 18:15:33 -04:00
Florian Weingarten 3ef29c624c Merge pull request #347 from Dillon-Benson/patch-1 
remove template return
 2014-04-30 08:23:36 -04:00
Florian Weingarten bde32018dd Merge pull request #346 from Shopify/false_rendering 
Fix broken rendering of variables which are equal to false (closes #345)
 2014-04-29 15:21:30 -04:00
Florian Weingarten 765751b9cb Merge pull request #303 from Shopify/strip_filter 
Add strip, lstrip, rstrip filters
 2014-01-24 08:09:19 -08:00
Florian Weingarten 808fa244ca Merge pull request #250 from wildfireapp/correct-if-nodelists 
Correct if-statement nodelist.
 2014-01-13 12:47:51 -08:00
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 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
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 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 9b910a4e6d Update README.md 
Remove old wiki link
 2013-10-15 13:14:39 -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
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
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 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 8059da4938 Update History.md 2013-08-30 15:28:33 -04:00
Florian Weingarten f6f89fd0aa Merge pull request #242 from Shopify/overwrite_drop_inspect 
Overwrite drop inspect
 2013-08-19 09:48:16 -07:00
Florian Weingarten 355199dac4 Update History.md 2013-08-14 17:00:26 -04:00
Florian Weingarten c8f38ad9d0 Merge pull request #239 from Shopify/sort_filter_on_enumerables 
Sort filter on Enumerables
 2013-08-14 13:59:44 -07:00
Florian Weingarten 98c184f2fb Update History.md 2013-08-06 10:24:37 -04:00
Florian Weingarten 615e48fe29 Merge pull request #238 from Shopify/fix_clashing_method_names_in_enumerable_drops 
Fix clashing method names in enumerable drops
 2013-08-06 07:23:56 -07:00
Florian Weingarten ee2902761c Update History.md 2013-08-01 09:18:29 -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 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 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 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 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 5c5e7de31e Merge pull request #221 from d-Pixie/master 
Changes not empty? to any?
 2013-07-01 07:55:26 -07:00
Florian Weingarten 429e492984 Merge pull request #220 from coding46/master 
Fix some typos in comments
 2013-06-27 13:20:24 -07: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 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 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 f5d75718e9 Update History.md 2013-06-16 18:31:19 +03:00