Commit Graph

  • b53601100f Make sure include tags are never blank Florian Weingarten 2013-07-02 13:57:27 -04:00
  • 5c5e7de31e Merge pull request #221 from d-Pixie/master Florian Weingarten 2013-07-01 07:55:26 -07:00
  • 657c94a3a7 Merge f91233450f5e3a956bca30be235051e720dc5b6f into 429e492984113cf01ae4f9729d8f24d29d4c3c0a #221 Jonas Schubert Erlandsson 2013-07-01 07:46:41 -07:00
  • f91233450f Changes not empty? to any? #221 Jonas Schubert Erlandsson 2013-07-01 16:12:58 +02:00
  • 429e492984 Merge pull request #220 from coding46/master Florian Weingarten 2013-06-27 13:20:24 -07:00
  • da56cf1e9d Merge d36a1c518b6876830f137890e024827ca4a60e84 into 37309678dedca772bb6ea09494d1d2bab92d937e #220 G. Bodenschatz 2013-06-27 13:19:00 -07:00
  • d36a1c518b Fix some typos in comments #220 G. Bodenschatz 2013-06-27 22:16:23 +02:00
  • 43085bde64 Couple small fixes #217 Scott Francis 2013-06-27 10:27:38 -04:00
  • 40a37c3fb6 Merge branch 'master' into dont_render_blank_blocks Florian Weingarten 2013-06-27 10:03:18 -04:00
  • 37309678de Merge pull request #219 from Shopify/indent_and_trailing_ws_cleanup Florian Weingarten 2013-06-27 06:50:28 -07:00
  • 4b01a43882 Merge 0f5441b09e48c7207526fb5ad6e22c057b061aa9 into cfb60c2f1b3109ec7163cf010b2197045008d6bf #219 Florian Weingarten 2013-06-27 06:45:52 -07:00
  • ab2f7815b7 Merge 0526214254dfba9a049ac7ebd877a7553230e9aa into cfb60c2f1b3109ec7163cf010b2197045008d6bf #215 Nick Pearson 2013-06-27 06:25:42 -07:00
  • cfb60c2f1b Update History.md Florian Weingarten 2013-06-27 14:30:37 +02:00
  • 668ee5e1c4 Clean up whitespace collapsing Florian Weingarten 2013-06-27 14:03:38 +02:00
  • b4fbcea114 Cycle tags are never blank Florian Weingarten 2013-06-27 14:00:38 +02:00
  • c16697746b Clean up whitespace collapsing a bit Florian Weingarten 2013-06-27 13:56:33 +02:00
  • f01d0dbea6 More tests for whitespace collapsing Florian Weingarten 2013-06-27 13:39:04 +02:00
  • 10c151e3aa Some tests for whitespace collapsing Florian Weingarten 2013-06-26 22:30:33 -04:00
  • d6e13faa43 Don't render blank blocks Florian Weingarten 2013-06-26 20:53:13 -04:00
  • 264f9b49cd Strip unnecessary whitespace from for tags Scott Francis 2013-06-26 21:39:34 -04:00
  • 0f5441b09e Convert legacy tab indentation to spaces and remove trailing whitespace from all lines #219 Florian Weingarten 2013-06-26 19:53:09 -04:00
  • 236a04e665 Merge 2d7ca7613867a71f90b68c168bd7ca5de8075b29 into 7a3746ad77996ccce2f5c214318fc56c8201e043 #214 Nick Pearson 2013-06-26 06:52:24 -07:00
  • 7a3746ad77 Update CONTRIBUTING.md Florian Weingarten 2013-06-26 05:03:05 +03:00
  • 0526214254 Add ERB-like trim mode for tags and outputs #215 Nick Pearson 2013-06-21 14:54:00 -05:00
  • 2d7ca76138 Trim tabs and spaces after -}} and before \n #214 Nick Pearson 2013-06-21 13:30:58 -05:00
  • c60728da46 Add ERB-like trim mode for tags and outputs. Nick Pearson 2013-06-21 10:32:38 -05:00
  • 24511556d3 Update README.md Florian Weingarten 2013-06-20 09:53:21 -03:00
  • 5621556b3a Update History.md Florian Weingarten 2013-06-18 12:36:50 -03:00
  • fd230bef14 Merge pull request #106 from gnowoel/fix_example_servlet Florian Weingarten 2013-06-18 08:35:42 -07:00
  • 62e2186099 Merge 5c4938f443cf4e358b603cbde80bf26966b1e491 into e9f3a8e4d3b404ab573d07cdf84546b1ede12e5b #106 gnowoel 2013-06-18 08:31:18 -07:00
  • e9f3a8e4d3 Update History.md Florian Weingarten 2013-06-18 05:18:43 +03:00
  • 8ca4868bff Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master Florian Weingarten 2013-06-18 04:12:45 +02:00
  • f92da6948d Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix Florian Weingarten 2013-06-18 04:11:11 +02:00
  • a1b156f0d4 strip_html multi-line comment test Florian Weingarten 2013-06-18 04:06:35 +02:00
  • eca520025c Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html Florian Weingarten 2013-06-18 04:04:49 +02:00
  • 2ffe11dbb5 Merge 740cd6e76231d3493e8660e991be886caec963cd into 9c9a7ce8d3a7579e32c12c92f0e26fc4ca958a97 #117 Notre Dame Webgroup 2013-06-17 19:01:44 -07:00
  • 9c9a7ce8d3 Update History.md Florian Weingarten 2013-06-18 05:01:23 +03:00
  • b7837ce218 Merge pull request #210 from Shopify/truncate_utf8_test Florian Weingarten 2013-06-17 09:45:10 -07:00
  • eb204c9e64 Merge b81469d183e57cb269c026415c68324bb71262e4 into f5d75718e99b82e5d8707d8846738f4a30571052 #210 Florian Weingarten 2013-06-17 09:05:26 -07:00
  • b81469d183 Make truncate work for Ruby 1.8 #210 Florian Weingarten 2013-06-17 12:05:02 -04:00
  • aa0798930d Merge 80eacde8b03697de0e44aaf442052fb2fc15377f into f5d75718e99b82e5d8707d8846738f4a30571052 #183 Pete Nelson 2013-06-17 08:59:20 -07:00
  • f488058789 UTF8 truncate test Florian Weingarten 2013-06-17 11:48:03 -04:00
  • f5d75718e9 Update History.md Florian Weingarten 2013-06-16 18:31:19 +03:00
  • f35932fa7d Merge c935d481b0f88b3b0b75d0cee55524bec43013f4 into c280936afaf73c0ea8889be3ace6d37ee6125f8c #85 Brad Greenlee 2013-06-16 06:54:40 -07:00
  • c280936afa Merge pull request #209 from Shopify/fix_broken_raw_parsing Florian Weingarten 2013-06-15 04:58:51 -07:00
  • 47625e6161 Merge e47d1af03aeb52ad0d8baa3c2c2fc9d1b44a841c into 81f6c79c53572e98a31ddc7bc8d83b9871ae118d #209 Florian Weingarten 2013-06-14 09:47:41 -07:00
  • e47d1af03a Fix broken 'raw' tag parsing (issue #204) #209 Florian Weingarten 2013-06-14 11:10:26 -04:00
  • 81f6c79c53 Update README.md Florian Weingarten 2013-06-14 10:04:24 -03:00
  • 3174411407 Merge pull request #208 from Shopify/contributing Florian Weingarten 2013-06-14 05:58:37 -07:00
  • c67dea144d Merge 27db1def63e5afd477772733bcfa374d25506ea7 into f7c4b0cdec7e21ba86f49bfc32132047a5741e84 #208 Florian Weingarten 2013-06-14 05:58:33 -07:00
  • f7c4b0cdec Update History.md Florian Weingarten 2013-06-14 08:57:27 -04:00
  • 3d1f582318 Merge pull request #201 from arthurnn/adding_version_file Florian Weingarten 2013-06-14 05:45:48 -07:00
  • 27db1def63 CONTRIBUTING.md #208 Florian Weingarten 2013-06-14 02:41:08 +02:00
  • 8948467189 Merge 0d9353591bc797b3da0f37093cc9d3f3fe2a0762 into 5cfa13d7a478d6b3ae8b2ac3c3e56d6cad9688e8 #201 Arthur Nogueira Neves 2013-06-13 17:29:17 -07:00
  • b82c7b3c33 Merge 6de1fd85d1237dbcc032c3c14cde831527a0e128 into 5cfa13d7a478d6b3ae8b2ac3c3e56d6cad9688e8 #158 FABIANSKI Cédric 2013-06-13 16:36:11 -07:00
  • 5cfa13d7a4 Merge pull request #205 from phoet/stricter_handling_of_variables_in_for Florian Weingarten 2013-06-13 15:26:00 -07:00
  • 807a5e0460 Merge cb124978590e7324d3c5b78e6d8f7930498e6882 into 4c2e2f8a249f3112bfaefe386cfb6b71494b7084 #205 Peter Schröder 2013-06-13 15:21:57 -07:00
  • cb12497859 add test for allowing whitespace between tokens #205 Peter Schröder 2013-06-13 18:21:49 -04:00
  • 4c2e2f8a24 Merge pull request #203 from phoet/strip_carriage_return Florian Weingarten 2013-06-13 12:54:17 -07:00
  • 5047d0598e Merge fd263bba0fa47be15d3f03af7c74747732ff7809 into 437e9201de6a33da059e8e1907b190998fc46e25 #203 Peter Schröder 2013-06-13 01:16:57 -07:00
  • 0955daed90 Merge pull request #1 from dntj/Correct-if-nodelists #191 James Tucker 2013-06-12 10:02:08 -07:00
  • 6e55998a47 Correct if-statement nodelist. The nodelist returned by all tags is a list of containing nodes, except for the if tag. This correct that inconsistency Nick Jones 2013-06-12 09:13:41 -07:00
  • a2df5a421d rejects variables like a/b in for loops, closes #150 Peter Schröder 2013-06-11 17:20:35 -04:00
  • 437e9201de Merge pull request #174 from yardstick/drop-context Dylan Thacker-Smith 2013-06-10 07:46:06 -07:00
  • fd263bba0f handle carriage return in strip_newline, closes #126 #203 Peter Schröder 2013-06-09 10:24:35 -04:00
  • 0d9353591b bump master version to 2.6.0 #201 Arthur Neves 2013-06-06 14:17:12 -04:00
  • 1849c24f2c Adding version file Arthur Neves 2013-06-06 14:10:45 -04:00
  • 0349200ab3 Merge f8288546f872357ff69c2ef45544fadd9280762e into 85c1503378d25d254a366778e7ac24445ec76fc5 #174 Daniel Huckstep 2013-06-06 09:20:59 -07:00
  • f8288546f8 Missed in the rebase conflicts #174 Daniel Huckstep 2013-06-06 10:20:34 -06:00
  • 076ae903c0 Make sure the context gets set Daniel Huckstep 2013-06-05 20:27:14 -06:00
  • ba5e65f685 Better test, resuse Hash block Daniel Huckstep 2013-05-27 18:17:13 -06:00
  • b699c93bae Allow a Liquid::Drop to be passed into Template#render Daniel Huckstep 2013-02-13 16:35:39 -07:00
  • 6de1fd85d1 Add localization to date #158 Cédric FABIANSKI 2012-11-21 14:17:58 +01:00
  • 85c1503378 Merge pull request #200 from arthurnn/155_float_precision Florian Weingarten 2013-06-05 14:07:20 -07:00
  • a66763b132 Merge ab760649ee148de75be4f295424ded092c58bbb7 into f4fb2f159c2c0bfe34a3a92aef3585d2828aaa61 #200 Arthur Nogueira Neves 2013-06-05 13:12:59 -07:00
  • ab760649ee use BigDecimal on filters to have better precision #200 Arthur Neves 2013-06-05 16:09:05 -04:00
  • f4fb2f159c Merge pull request #157 from stomar/avoid_warnings Florian Weingarten 2013-06-05 09:10:41 -07:00
  • 2dd6c6201c Merge 1cac09831d12c50b5eaeffc3653f78268495873e into a5cd494717a8327743f14943355b86f710c0b998 #157 Marcus Stollsteimer 2013-06-05 09:07:19 -07:00
  • 55c71a06a7 Merge 424cafe064b9fbd41589036a3dce54c7d6c4c0fe into a5cd494717a8327743f14943355b86f710c0b998 #168 Arthur Nogueira Neves 2013-06-05 09:05:12 -07:00
  • a5cd494717 Merge pull request #176 from unreal/master Florian Weingarten 2013-06-05 09:04:53 -07:00
  • a90531bdc0 Merge a556ae6c26909c9c98018784cdd0984b1aad8921 into f8915f3cd2db709032444b8006917494f5d0ca3b #176 Jay Strybis 2013-06-05 09:01:02 -07:00
  • f8915f3cd2 Merge pull request #199 from phoet/add_documentation_for_include Florian Weingarten 2013-06-05 09:00:11 -07:00
  • 7cd125a146 Merge e92540a9bf7ce350dad71cb009c44800a4d8b14d into 482115d78497427860c8664142878bd485bbec90 #199 Peter Schröder 2013-06-05 08:53:15 -07:00
  • e92540a9bf add documentation to include, fixes #163 #199 Peter Schröder 2013-06-04 16:40:50 -04:00
  • 482115d784 Merge pull request #173 from jsw0528/master Dylan Thacker-Smith 2013-06-04 13:09:42 -07:00
  • 63bd0853a4 Merge 17dd85868d1653c02ab8d27d584018b497312ae9 into 94ff457744f91ad89c3d9e31068c88953a4b7f07 #173 wǒ_is神仙 2013-06-04 12:18:05 -07:00
  • 94ff457744 Merge pull request #198 from Shopify/limit_resource_usage Florian Weingarten 2013-05-31 08:24:29 -07:00
  • 84e7d17d60 Merge 1e8c081b428268ddb8bd23492236e65f2fee8a18 into 50b2ebee56a78abf4f269ac859cf736f19972166 #198 Florian Weingarten 2013-05-31 06:42:06 -07:00
  • 1e8c081b42 Create new resource_limits hash on Template initialization #198 Florian Weingarten 2013-05-31 09:41:59 -04:00
  • 2b17e24b16 Mutate resource_limits hash to flag that the limit was reached (for outside observation) Florian Weingarten 2013-05-31 09:34:23 -04:00
  • 9075b428b1 Resource limits: Don't raise Error but render error message (but abort after first error) Florian Weingarten 2013-05-31 09:25:25 -04:00
  • 8760b5e8c4 Add optional resource usage limitations to number of rendering calls, length of rendering output and/or number of variable/capture assignments Florian Weingarten 2013-05-30 12:01:15 -04:00
  • 5c59c3ecdd Merge dead0a4381f7112f084438a1dfc0375a63d28855 into 50b2ebee56a78abf4f269ac859cf736f19972166 #197 Florian Weingarten 2013-05-29 15:08:31 -07:00
  • dead0a4381 Change interface for timeouts a little bit #197 Florian Weingarten 2013-05-29 18:08:28 -04:00
  • 9c974dcda6 Use Time.now.to_f and Speedytime.current_f Florian Weingarten 2013-05-29 17:33:22 -04:00
  • 3006cb58b5 Use timeout (offset to Time.now) instead of deadline. Also, fail hard if Speedytime is missing (instead of having render() return stringified expcetions). Florian Weingarten 2013-05-29 17:04:59 -04:00
  • bdcfd9e793 Use Speedytime gem for render_with_timeout() Florian Weingarten 2013-05-29 16:48:54 -04:00
  • dc04c4ab21 Implement vague timeouts for rendering inside blocks Florian Weingarten 2013-05-29 15:58:18 -04:00
  • 0779213686 Merge 74d13a6c35d3b2e3d8ba44bd55dcf1f6515ca835 into 50b2ebee56a78abf4f269ac859cf736f19972166 #196 Florian Weingarten 2013-05-29 10:29:49 -07:00
  • 74d13a6c35 Render with timeout #196 Florian Weingarten 2013-05-29 13:27:57 -04:00