Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' into css-in-html | Kornelius Kalnbach | 2013-06-23 | 11 | -46/+101 | |
| |\ | ||||||
| | * | Merge branch 'master' into upstream | Kornelius Kalnbach | 2013-06-23 | 10 | -43/+90 | |
| | |\ | ||||||
| | | * | fix another CSS empty token issue | Kornelius Kalnbach | 2013-06-23 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | fix token nesting in PHP scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -4/+18 | |
| | | | | ||||||
| | | * | fix unclosed token group in Ruby scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | close open string token groups in SQL scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -3/+6 | |
| | | | | ||||||
| | | * | avoid empty tokens in YAML scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | close correct token groups in Groovy scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -3/+3 | |
| | | | | ||||||
| | | * | avoid empty tokens in Diff scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | fix Sass regexp modifier | Kornelius Kalnbach | 2013-06-23 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | close open token groups in Sass scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -0/+8 | |
| | | | | ||||||
| | | * | close open token groups in Lua scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -0/+3 | |
| | | | | ||||||
| | | * | remove instance variables from Lua scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -16/+18 | |
| | | | | ||||||
| | | * | close open tokens in PHP scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -0/+4 | |
| | | | | ||||||
| | | * | close open tokens in Groovy scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -2/+15 | |
| | | | | ||||||
| | | * | avoid empty tokens in YAML | Kornelius Kalnbach | 2013-06-23 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | avoid empty tokens in Raydebug | Kornelius Kalnbach | 2013-06-23 | 1 | -8/+8 | |
| | | | | ||||||
| | | * | avoid empty tokens in CSS | Kornelius Kalnbach | 2013-06-23 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | tweak HTML CDATA token kinds | Kornelius Kalnbach | 2013-06-23 | 1 | -9/+7 | |
| | | | | ||||||
| | * | | Merge branch 'master' into upstream | Kornelius Kalnbach | 2013-06-23 | 9 | -42/+600 | |
| | |\ \ | | | |/ | ||||||
| | * | | Support CDATA blocks in HTML/XML | Gavin Kistner | 2013-06-06 | 1 | -1/+11 | |
| | | | | ||||||
| * | | | scan_css in HTML scanner (arguments), change token kind from :inline to :string | Kornelius Kalnbach | 2013-06-23 | 1 | -9/+14 | |
| | | | | ||||||
| * | | | scan_css in HTML scanner (tags) | Kornelius Kalnbach | 2013-06-23 | 1 | -6/+15 | |
| | |/ | |/| | ||||||
| * | | some more code cleanups before mergelua-scanner | Kornelius Kalnbach | 2013-06-23 | 1 | -11/+11 | |
| | | | ||||||
| * | | cleanup Lua scanner, fix end_group(:map) issue | Kornelius Kalnbach | 2013-06-23 | 1 | -257/+267 | |
| | | | | | | | | | | | | - use local instead of instance variables | |||||
| * | | Merge branch 'master' into lua-scanner | Kornelius Kalnbach | 2013-06-22 | 2 | -14/+13 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/coderay/styles/alpha.rb lib/coderay/token_kinds.rb | |||||
| | * | | use different key/value heuristic in JSON scanner | Kornelius Kalnbach | 2013-06-19 | 1 | -12/+11 | |
| | | | | ||||||
| | * | | add python binary string | Kornelius Kalnbach | 2013-06-12 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into lua-scanner | Kornelius Kalnbach | 2013-06-12 | 12 | -36/+320 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: lib/coderay/token_kinds.rb | |||||
| * | | | Merge branch 'master' into lua-scanner | Kornelius Kalnbach | 2013-03-10 | 5 | -63/+93 | |
| |\ \ \ | ||||||
| * | | | | :map token kind | Nathan Youngman | 2012-10-27 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | Use :map instead of :table. It's more generic, and won't be confused with the :table rendering style. | |||||
| * | | | | Merge branch 'master' into lua-scanner | Kornelius Kalnbach | 2012-10-07 | 1 | -1/+4 | |
| |\ \ \ \ | ||||||
| * | | | | | escape = in regex (my editor gets confused:-) | Nathan Youngman | 2012-09-11 | 1 | -10/+10 | |
| | | | | | | ||||||
| * | | | | | use case+when instead of send and methods | Kornelius Kalnbach | 2012-06-19 | 1 | -33/+31 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'Quintus/luascanner-onecommit' into lua-scanner | Kornelius Kalnbach | 2012-06-19 | 1 | -0/+267 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Lua scanner for CodeRay. Meta-commit. | Quintus | 2012-04-22 | 1 | -0/+267 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a super-commit containing all the subcommits for implementing the Lua scanner. | |||||
* | | | | | | | Merge branch 'master' into go-scanner | Kornelius Kalnbach | 2013-06-12 | 12 | -36/+320 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | tweak Taskpaper scanner, cleanup doc_string kind | Kornelius Kalnbach | 2013-06-12 | 1 | -8/+10 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'shimomura1004/taskpaper' into taskpaper-scanner | Kornelius Kalnbach | 2013-06-12 | 1 | -0/+34 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | TaskPaper scanner for CodeRay | SHIMOMURA Sho | 2012-10-22 | 1 | -0/+34 | |
| | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | tweak Sass scanner: comments, includes, functions | Kornelius Kalnbach | 2013-06-11 | 1 | -10/+30 | |
| | | | | | | | ||||||
| * | | | | | | tweak CSS tag/id token kind patch from noprompt | Kornelius Kalnbach | 2013-06-11 | 2 | -5/+5 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'noprompt/master' into css-token-kinds | Kornelius Kalnbach | 2013-06-11 | 1 | -5/+5 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/todo/scanners/css.rb | |||||
| | * | | | | | | use :tag instead of :type for identifiers | Joel Holdbrooks | 2012-07-24 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | use "id" instead of "constant" for css ids | Joel Holdbrooks | 2012-07-03 | 1 | -2/+2 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | reset string_delimiter when detecting open string | Kornelius Kalnbach | 2013-06-10 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into javascript-keep-state | Kornelius Kalnbach | 2013-06-10 | 11 | -27/+231 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | accept all idents as Ruby 1.9 hash keys (#126) | Kornelius Kalnbach | 2013-06-10 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | don't nest :string recursively in :sass_inline | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+8 | |
| | | | | | | | | ||||||
| | * | | | | | | fix Sass highlighting in diff | Kornelius Kalnbach | 2013-06-09 | 1 | -3/+0 | |
| | | | | | | | |