Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity
354 Commits 314 Branches 70 Tags
4dc9cc0ea130d71da71524cf669b146f454900d3
Commit Graph
354 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Hume 4dc9cc0ea1 Add back tests for lax parsing 2013-07-26 11:55:50 -04:00
Tristan Hume 87b8ee7341 Add error mode switching 2013-07-26 11:45:13 -04:00
Tristan Hume 8b1dff9d98 Allow ! in identifiers like Ruby 2013-07-26 10:33:30 -04:00
Tristan Hume 8896b55fa5 Parsing for if statements 2013-07-26 10:31:26 -04:00
Tristan Hume c0b9d53548 Revert "Test a different lexer architechture" 
This reverts commit 24ddaf1a9c.
 2013-07-26 09:52:04 -04:00
Tristan Hume 24ddaf1a9c Test a different lexer architechture 2013-07-26 09:51:58 -04:00
Tristan Hume 673826630c Unfinished if statement parser. 2013-07-26 09:32:08 -04:00
Tristan Hume 17d818b453 Fix profiler 2013-07-25 15:04:04 -04:00
Tristan Hume 0453d7e299 Fix benchmarks to use only valid liquid. 2013-07-25 11:51:51 -04:00
Tristan Hume 4da7b36139 New variable parser! 2013-07-25 11:38:57 -04:00
Tristan Hume f43e973e67 Basic expression parsing 2013-07-24 16:36:14 -04:00
Tristan Hume 84be895db2 Fancy StringScanner based lexer 2013-07-24 15:39:48 -04:00
Tristan Hume b20a594f25 Better lexer 2013-07-24 15:19:14 -04:00
Tristan Hume 76272a1afa Bring back the lexer 2013-07-24 14:40:29 -04:00
Tristan Hume 61a6deb43b Descriptive comment for lexer 2013-07-24 12:00:51 -04:00
Tristan Hume ee14775f83 Replace hand-coded lexer with faster hacky lexer. 2013-07-24 11:41:47 -04:00
Tristan Hume 2332d86156 Slow lexer and parser scaffold. 2013-07-24 11:35:00 -04:00
Florian Weingarten fbfda1a189 Little cosmetic change 2013-07-05 11:30:50 -04:00
Florian Weingarten f0ecd02199 Fix some blank tests 2013-07-03 02:47:22 +02: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 0f38fe3596 Add blank test for case tags 2013-07-02 18:08:20 -04:00
Florian Weingarten cd3f976288 Merge branch 'master' into dont_render_blank_blocks 
Conflicts:
	lib/liquid/tag.rb
 2013-07-02 14:00:30 -04:00
Florian Weingarten b53601100f Make sure include tags are never blank 2013-07-02 13:57:27 -04: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
Jonas Schubert Erlandsson f91233450f Changes not empty? to any? 2013-07-01 16:12:58 +02:00
Florian Weingarten 429e492984 Merge pull request #220 from coding46/master 
Fix some typos in comments
 2013-06-27 13:20:24 -07:00
G. Bodenschatz d36a1c518b Fix some typos in comments 2013-06-27 22:16:23 +02:00
Florian Weingarten 40a37c3fb6 Merge branch 'master' into dont_render_blank_blocks 
Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
 2013-06-27 10:03:18 -04: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 668ee5e1c4 Clean up whitespace collapsing 2013-06-27 14:06:05 +02:00
Florian Weingarten b4fbcea114 Cycle tags are never blank 2013-06-27 14:00:38 +02:00
Florian Weingarten c16697746b Clean up whitespace collapsing a bit 2013-06-27 13:57:26 +02:00
Florian Weingarten f01d0dbea6 More tests for whitespace collapsing 2013-06-27 13:39:04 +02:00
Florian Weingarten 10c151e3aa Some tests for whitespace collapsing 2013-06-26 22:30:33 -04:00
Florian Weingarten d6e13faa43 Don't render blank blocks 2013-06-26 22:21:47 -04:00
Florian Weingarten 0f5441b09e Convert legacy tab indentation to spaces and remove trailing whitespace from all lines 2013-06-26 19:53:09 -04: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 8ca4868bff Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master 2013-06-18 04:13:49 +02:00
Florian Weingarten f92da6948d Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix 
Conflicts:
	lib/liquid/standardfilters.rb
 2013-06-18 04:11:11 +02:00
Florian Weingarten a1b156f0d4 strip_html multi-line comment test 2013-06-18 04:06:35 +02:00
Florian Weingarten eca520025c Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html 
Conflicts:
	lib/liquid/standardfilters.rb
 2013-06-18 04:04:49 +02: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 b81469d183 Make truncate work for Ruby 1.8 2013-06-17 12:05:02 -04:00
Florian Weingarten f488058789 UTF8 truncate test 2013-06-17 11:48:03 -04:00