Commit Graph

  • cc0276bb97 Add a StringSlice class to use in the nodelist. Dylan Thacker-Smith 2014-02-28 13:16:07 -05:00
  • f367dd7915 don't really need those I suppose Isha 2014-02-28 12:35:15 -05:00
  • edd28a144a Comment out lax_parse test cases for now Isha 2014-02-28 12:34:46 -05:00
  • 8669029afd Comment out verbose log message Isha 2014-02-28 12:33:48 -05:00
  • 8f42e50959 wip Isha 2014-02-28 12:24:37 -05:00
  • 25cc69c3c0 add variable in c Isha 2014-02-28 12:23:26 -05:00
  • 03d586aafe Add convenience methods for getting a struct from a ruby object. Dylan Thacker-Smith 2014-02-28 10:08:21 -05:00
  • dc8a34a52f Implement Block#parse_body in C. Dylan Thacker-Smith 2014-02-28 07:47:36 -05:00
  • 99cebf74bc Rename Block#parse to parse_body since that is how it is being used. Dylan Thacker-Smith 2014-02-27 23:16:11 -05:00
  • 7eb64886dc Move the parse method out of Tag, only blocks need the body parsed. Dylan Thacker-Smith 2014-02-27 22:29:04 -05:00
  • f89046e81f Use super rather than render_all in single block render classes. Dylan Thacker-Smith 2014-02-27 21:38:49 -05:00
  • 9ee4573ef4 Avoid keeping track of two lists of nodes during parsing. Dylan Thacker-Smith 2014-02-27 20:51:05 -05:00
  • a48b4f47f6 Return nil in Document#block_delimiter rather than an empty array. Dylan Thacker-Smith 2014-02-27 20:06:57 -05:00
  • 72d402837e Remove unused Block#end_tag method. Dylan Thacker-Smith 2014-02-27 18:53:18 -05:00
  • 06bef40527 Fix a missing return warning. Dylan Thacker-Smith 2014-02-27 18:47:55 -05:00
  • a48b245e6e Turn on C compiler warnings. Dylan Thacker-Smith 2014-02-27 18:45:57 -05:00
  • d4aabda625 Avoid freeing of uninitialized memory. Dylan Thacker-Smith 2014-02-27 18:29:07 -05:00
  • dab6bdfdee Make sure the ext directory is included in the distributed gem. Dylan Thacker-Smith 2014-02-27 15:50:22 -05:00
  • 8c075fca1f Remove a couple FIXME comments which are only partially a lie. Dylan Thacker-Smith 2014-02-27 15:21:57 -05:00
  • ea8406e36e Create a Liquid::Tokenizer class in the C extension. Dylan Thacker-Smith 2014-02-27 15:19:27 -05:00
  • 8bb3bca64a Require the liquid extension when liquid is required. Dylan Thacker-Smith 2014-02-27 14:22:18 -05:00
  • 5de1082201 Add profile:stackprof rake task. Dylan Thacker-Smith 2014-02-27 11:20:49 -05:00
  • 7ba02d2811 Use start and end of string rather than line matching in regexes. Dylan Thacker-Smith 2014-02-27 10:07:04 -05:00
  • 2066676bf4 Add a C extension that doesn't yet do anything. Dylan Thacker-Smith 2014-02-27 09:53:17 -05:00
  • 3efa8e8762 Merge pull request #310 from Shopify/faster-increment-used-resources Dylan Thacker-Smith 2014-02-25 00:18:27 -05:00
  • 3c06d837b5 Speed up Context#increment_used_resources #310 Dylan Thacker-Smith 2014-02-24 23:56:39 -05:00
  • d3fc30ef85 Merge pull request #309 from bogdan/argument_error_for_filters Arthur Nogueira Neves 2014-02-21 15:13:11 -05:00
  • f23e69d565 Raise liquid argument error instead of ruby argument #309 Bogdan Gusiev 2014-02-21 21:12:42 +02:00
  • fa179e811d Merge pull request #306 from Shopify/default_to_s_for_drops Adam Doeler 2014-02-13 13:45:01 -05:00
  • 18907fc570 Updates History.md #306 Adam Doeler 2014-02-10 10:24:37 -05:00
  • 5f8a028a56 Liquid::Drop should not return a string representation of standard ruby objects Adam Doeler 2014-02-07 14:48:02 -05:00
  • 63ee6a5977 Merge aa62e889343f7faec6f98d5a5012a6c5b5a9c150 into 765751b9cb0cf09fbb1e4526f7bd10ffe9ba5af4 #94 Peter P. Gengler 2014-02-05 02:47:12 -07:00
  • 0a7de51e2b Revert some freezes on non-literals Florian Weingarten 2014-01-27 14:56:07 -05:00
  • fe434b5e43 Support sorting the collection in a for loop tag. #304 Patrick Joyce 2012-02-23 17:14:11 -05:00
  • 765751b9cb Merge pull request #303 from Shopify/strip_filter Florian Weingarten 2014-01-24 08:09:19 -08:00
  • d2827bfa76 Add strip, lstrip, rstrip filters #303 Florian Weingarten 2014-01-24 11:04:13 -05:00
  • 70d92b84ab Rename test Florian Weingarten 2014-01-24 10:55:45 -05:00
  • 808fa244ca Merge pull request #250 from wildfireapp/correct-if-nodelists Florian Weingarten 2014-01-13 12:47:51 -08:00
  • 5570f697fd Update history #250 Nicholas Jones 2014-01-13 12:46:43 -08:00
  • 8f9f12e542 Merge remote-tracking branch 'upstream/master' into correct-if-nodelists Nicholas Jones 2014-01-13 12:43:43 -08:00
  • 17dae40707 Fix History.md ordering Florian Weingarten 2014-01-13 15:38:18 -05:00
  • 06e2f2577f Add else blocks to for and case nodelists Nicholas Jones 2014-01-13 11:50:35 -08:00
  • dcd21d3db3 Bump version to 2.6.1 v2.6.1 Florian Weingarten 2014-01-10 13:21:05 -05:00
  • deeb813d53 Merge pull request #300 from Shopify/cherry_pick_security_fix_to_2-6-stable Florian Weingarten 2014-01-10 10:20:41 -08:00
  • 712d97e37d Bump version to 2.5.5 v2.5.5 Florian Weingarten 2014-01-10 13:19:20 -05:00
  • ca72282dff Merge pull request #299 from Shopify/cherry_pick_security_fix_to_2-5-stable Florian Weingarten 2014-01-10 10:18:38 -08:00
  • eb409ff237 Cherry pick security fix (#274) to 2-6-stable #300 Florian Weingarten 2014-01-10 11:22:28 -05:00
  • e8a3fd10d4 Cherry pick security fix (#274) to 2-5-stable #299 Florian Weingarten 2014-01-10 11:17:31 -05:00
  • ee7edacacc Merge pull request #298 from Shopify/respond_to_resource_counting_bug Florian Weingarten 2014-01-08 10:37:48 -08:00
  • 62a86a25ae update history #298 Florian Weingarten 2014-01-08 13:37:24 -05:00
  • c6e0c1e490 Fix resource counting bug with respond_to?(:length) Florian Weingarten 2014-01-08 13:00:53 -05:00
  • 64f314e082 Merge 43ac8d560bdfe7f90d6e275bb13bc7f02f86a9d9 into 0388376925ed4bdf1ce2c8f2e20d21854d1b9045 #297 Florian Weingarten 2014-01-07 09:37:33 -08:00
  • 43ac8d560b Freeze all the things Florian Weingarten 2014-01-07 12:35:16 -05:00
  • 0388376925 Merge pull request #296 from Shopify/ruby2.1.0 Arthur Nogueira Neves 2014-01-07 08:55:03 -08:00
  • 57c8583dc3 Add 2.1.0 to travis #296 Arthur Neves 2014-01-07 11:37:24 -05:00
  • a13f237d3c Remove some 192 tests Arthur Neves 2014-01-07 11:37:01 -05:00
  • 9ed2fa425b Merge pull request #295 from Shopify/remove_ruby_debug Arthur Nogueira Neves 2014-01-07 08:34:19 -08:00
  • 208c6c8800 remove ruby-debug #295 Arthur Neves 2014-01-07 11:31:46 -05:00
  • 9ec2b9da2d Rename tests because of name clashes (same method name used twice) Florian Weingarten 2014-01-07 11:20:32 -05:00
  • a02d17ba74 Merge 92728ffa7c40b62c49d5c1c9d2615ba3a500a8f2 into be7bef4d0bb86ac4a7102c78574bc1ade3ad738a #243 Nick Pearson 2014-01-07 06:47:35 -08:00
  • be7bef4d0b Merge pull request #284 from agladkyi/custom-patterns-for-template-filenames Florian Weingarten 2013-12-16 11:28:19 -08:00
  • 0ae42bbc32 Added separate test for custom patterns specifying + updated History.md #284 Andrei Gladkyi 2013-12-16 17:48:43 +02:00
  • acf0723d08 Updated regex to add text *after* the replacement string as opposed to truncating it. #291 Mark Benson 2013-12-14 14:34:12 -06:00
  • 08bd0ea3b3 Added replace_last and corresponding tests to list of standard filters. Mark Benson 2013-12-14 13:49:30 -06:00
  • 0ec69890ab Merge pull request #287 from Shopify/fix-escape-once Gaurav Chande 2013-12-02 08:57:24 -08:00
  • 5e8f2f8bd0 Fix escape_once filter #287 Gaurav Chande 2013-12-01 20:35:25 -05:00
  • 0edb252489 Option to specify custom pattern for template filenames Andrei Gladkyi 2013-11-30 17:55:53 +02:00
  • 5ce36f79e9 Add Tom's slice loading change to History.md Florian Weingarten 2013-11-25 11:12:33 -05:00
  • 2d1f15281b Merge pull request #282 from Shopify/load_slice Florian Weingarten 2013-11-25 08:12:06 -08:00
  • 4647e6d86b Remove unnecessary comment, add joost's change to History.md Florian Weingarten 2013-11-25 10:52:46 -05:00
  • f5620d4670 Merge branch 'master' of github.com:joost/liquid into joost-master Florian Weingarten 2013-11-25 10:51:48 -05:00
  • 1c910161ef Merge 5eddfe87d0030c1d5073e97e0bfccf19da660abb into f1a5f6899ba0315b6165e821b26c1611fa3cd42e #271 Joost Hietbrink 2013-11-25 07:51:16 -08:00
  • f1a5f6899b Add raggi's change to History, remove Ruby 1.8 code from test Florian Weingarten 2013-11-25 10:48:03 -05:00
  • de497eaed2 Merge branch 'class_cache' of github.com:wildfireapp/liquid into wildfireapp-class_cache Florian Weingarten 2013-11-25 10:46:18 -05:00
  • 30e5f06313 don't make original slice_collection_using_each private #282 Tom Burns 2013-11-25 10:37:10 -05:00
  • cbade99f04 Merge 13c826933c0c0a7cfe48e8731fc93dc594507561 into d465d5e20c7585fbbee5e73046c2d554f9941fcf #249 James Tucker 2013-11-25 07:35:37 -08:00
  • d465d5e20c Add ruby 2.1 on travis Arthur Neves 2013-11-25 10:35:24 -05:00
  • 7989e834f3 Allow rbx failure and not 2.0.0 Arthur Neves 2013-11-25 10:33:41 -05:00
  • c264459931 Update history log Arthur Neves 2013-11-25 10:25:39 -05:00
  • 442041206f Update history log v2.6.0 Arthur Neves 2013-11-25 10:25:39 -05:00
  • dc6c6fbb9a Bump version to 2.6.0 Arthur Neves 2013-11-25 10:24:30 -05:00
  • e667352629 move slice_collection optimization to utils Tom Burns 2013-11-24 14:00:23 -05:00
  • 2c26a880f0 add another test showing equivalent functionality Tom Burns 2013-11-24 12:32:32 -05:00
  • cf49b06ccc allow drops to optimize loading a slice of elements Tom Burns 2013-11-24 12:29:15 -05:00
  • f015d804ea Update history Florian Weingarten 2013-11-11 09:03:39 -05:00
  • 4293be3154 Update history Florian Weingarten 2013-11-11 09:02:32 -05:00
  • e77b1a09b6 Update gemspec v2.5.4 Florian Weingarten 2013-11-11 08:57:22 -05:00
  • 73b39beef2 Update history Florian Weingarten 2013-11-11 08:56:56 -05:00
  • fc63219087 Merge pull request #173 from jsw0528/master Dylan Thacker-Smith 2013-06-04 13:09:42 -07:00
  • 78c42bce44 Update README.md Arthur Nogueira Neves 2013-11-04 18:37:53 -05:00
  • a1465021e4 Merge 9530786bb34d3d46ec987f58456455e6af601c46 into 445f19d454deb4ae4c8712d301fd4683998c7ad2 #277 Julian Nadeau 2013-11-02 12:19:45 -07:00
  • 9530786bb3 Add a missing test, remove duplicated test, add new test. #277 jules2689 2013-11-02 15:17:48 -04:00
  • 3f27278b0b Add transliterate to standard filters jules2689 2013-11-02 15:17:23 -04:00
  • 445f19d454 Merge pull request #276 from Shopify/remove_some_1.8_code Florian Weingarten 2013-11-01 05:50:29 -07:00
  • a599a26f1a Remove some legacy Ruby 1.8 compatibility code #276 Florian Weingarten 2013-10-31 15:33:56 -04:00
  • b3f3301408 Merge 2d0a08299a04486d06e14069c951053c08e16ecb into 4e14a651a756810a23df13ee487d401a08f0a95f #269 Jon Gelo 2013-10-28 12:40:17 -07:00
  • 0403d9131a Merge ef220db3d5422ab289a0d7299e8542e7bbe3c086 into 4e14a651a756810a23df13ee487d401a08f0a95f #272 Anatol Broder 2013-10-28 10:39:39 -07:00
  • 4e14a651a7 Merge pull request #274 from Shopify/restrict-send-on-conditions Dylan Thacker-Smith 2013-10-28 10:01:47 -07:00
  • cc982e92d0 security: Prevent arbitrary method invocation on conditions in if tag. #274 Dylan Thacker-Smith 2013-10-28 11:19:25 -04:00
  • 71a386f723 Merge pull request #273 from Shopify/make-if-less-dangerous Bouke van der Bijl 2013-10-28 06:39:05 -07:00