Commit Graph
38 Commits
Author SHA1 Message Date
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
Florian Weingarten c280936afa Merge pull request #209 from Shopify/fix_broken_raw_parsing
Fix broken 'raw' tag parsing (issue #204)
2013-06-15 04:58:51 -07:00
Florian Weingarten 81f6c79c53 Update README.md 2013-06-14 10:04:24 -03:00
Florian Weingarten 3174411407 Merge pull request #208 from Shopify/contributing
CONTRIBUTING.md
2013-06-14 05:58:37 -07:00
Florian Weingarten 3d1f582318 Merge pull request #201 from arthurnn/adding_version_file
create version.rb file, and bump version
2013-06-14 05:45:48 -07:00
Florian Weingarten 5cfa13d7a4 Merge pull request #205 from phoet/stricter_handling_of_variables_in_for
rejects variables like a/b in for loops, closes #150
2013-06-13 15:26:00 -07:00
Florian Weingarten 4c2e2f8a24 Merge pull request #203 from phoet/strip_carriage_return
handle carriage return in strip_newline, closes #126
2013-06-13 12:54:17 -07:00
Florian Weingarten 85c1503378 Merge pull request #200 from arthurnn/155_float_precision
use BigDecimal on filters to have better precision
2013-06-05 14:07:20 -07:00
Florian Weingarten f4fb2f159c Merge pull request #157 from stomar/avoid_warnings
Avoid warnings in Ruby 1.9.3
2013-06-05 09:10:41 -07:00
Florian Weingarten a5cd494717 Merge pull request #176 from unreal/master
Add reverse filter
2013-06-05 09:04:53 -07:00
Florian Weingarten f8915f3cd2 Merge pull request #199 from phoet/add_documentation_for_include
add documentation to include, fixes #163
2013-06-05 09:00:11 -07:00
Florian Weingarten 94ff457744 Merge pull request #198 from Shopify/limit_resource_usage
Resource usage limits
2013-05-31 08:24:29 -07:00