summaryrefslogtreecommitdiff
path: root/lib/coderay
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into css-in-htmlKornelius Kalnbach2013-06-2313-54/+117
|\
| * Merge branch 'master' into upstreamKornelius Kalnbach2013-06-2312-51/+106
| |\
| | * fix another CSS empty token issueKornelius Kalnbach2013-06-231-2/+2
| | * fix token nesting in PHP scannerKornelius Kalnbach2013-06-231-4/+18
| | * fix unclosed token group in Ruby scannerKornelius Kalnbach2013-06-231-1/+1
| | * close open string token groups in SQL scannerKornelius Kalnbach2013-06-231-3/+6
| | * avoid empty tokens in YAML scannerKornelius Kalnbach2013-06-231-1/+1
| | * close correct token groups in Groovy scannerKornelius Kalnbach2013-06-231-3/+3
| | * avoid empty tokens in Diff scannerKornelius Kalnbach2013-06-231-1/+1
| | * fix Sass regexp modifierKornelius Kalnbach2013-06-231-1/+1
| | * close open token groups in Sass scannerKornelius Kalnbach2013-06-231-0/+8
| | * close open token groups in Lua scannerKornelius Kalnbach2013-06-231-0/+3
| | * remove instance variables from Lua scannerKornelius Kalnbach2013-06-231-16/+18
| | * close open tokens in PHP scannerKornelius Kalnbach2013-06-231-0/+4
| | * close open tokens in Groovy scannerKornelius Kalnbach2013-06-231-2/+15
| | * HTML encoder shouldn't warn about open tokensKornelius Kalnbach2013-06-231-1/+0
| | * DebugLint check open tokens at the endKornelius Kalnbach2013-06-231-7/+16
| | * avoid empty tokens in YAMLKornelius Kalnbach2013-06-231-1/+1
| | * avoid empty tokens in RaydebugKornelius Kalnbach2013-06-231-8/+8
| | * avoid empty tokens in CSSKornelius Kalnbach2013-06-232-2/+2
| * | tweak HTML CDATA token kindsKornelius Kalnbach2013-06-231-9/+7
| * | Merge branch 'master' into upstreamKornelius Kalnbach2013-06-2324-549/+1104
| |\ \ | | |/
| * | Support CDATA blocks in HTML/XMLGavin Kistner2013-06-061-1/+11
* | | scan_css in HTML scanner (arguments), change token kind from :inline to :stringKornelius Kalnbach2013-06-231-9/+14
* | | scan_css in HTML scanner (tags)Kornelius Kalnbach2013-06-231-6/+15
| |/ |/|
* | some more code cleanups before mergelua-scannerKornelius Kalnbach2013-06-231-11/+11
* | Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-231-10/+9
|\ \
| * | fix Tokens documentationKornelius Kalnbach2013-06-231-10/+9
* | | cleanup Lua scanner, fix end_group(:map) issueKornelius Kalnbach2013-06-231-257/+267
* | | move .map styles before .stringKornelius Kalnbach2013-06-231-3/+3
* | | more helpful error messages from DebugLintKornelius Kalnbach2013-06-231-2/+2
* | | add lua file typeKornelius Kalnbach2013-06-231-0/+1
* | | whitespaceKornelius Kalnbach2013-06-222-4/+4
* | | Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-2212-362/+329
|\ \ \ | |/ /
| * | use JSON to highlight .template files (AWS CF)remove-dumpKornelius Kalnbach2013-06-221-0/+1
| * | tags should be boldKornelius Kalnbach2013-06-221-1/+1
| * | use different key/value heuristic in JSON scannerKornelius Kalnbach2013-06-191-12/+11
| * | Merge branch 'master' into remove-dumpKornelius Kalnbach2013-06-164-26/+17
| |\ \
| | * | speedup HTML encoder numbering for Ruby 1.8.7+Kornelius Kalnbach2013-06-161-1/+1
| | * | cleanup Tokens documentationKornelius Kalnbach2013-06-161-23/+14
| | * | cleanup TODOs, FIXMEsKornelius Kalnbach2013-06-163-3/+2
| * | | remove dump/undump functionalityKornelius Kalnbach2013-06-133-89/+1
| |/ /
| * | refactor check functionality to DebugLint encoderKornelius Kalnbach2013-06-132-15/+55
| * | speedup/tweak debug encoderKornelius Kalnbach2013-06-131-11/+14
| * | tweak Terminal encoder, cleanup token kindsKornelius Kalnbach2013-06-133-163/+181
| * | add taskpaper file extensionKornelius Kalnbach2013-06-131-48/+49
| * | add python binary stringKornelius Kalnbach2013-06-122-3/+5
* | | Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-1223-248/+558
|\ \ \ | |/ /
| * | tweak Taskpaper scanner, cleanup doc_string kindKornelius Kalnbach2013-06-124-17/+14
| * | Merge remote-tracking branch 'shimomura1004/taskpaper' into taskpaper-scannerKornelius Kalnbach2013-06-123-0/+40
| |\ \
View Lorry Controller Status