summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'possible-speedups' into dslKornelius Kalnbach2016-06-137-55/+48
|\
| * fix testsKornelius Kalnbach2016-06-134-12/+29
| |
| * don't escape /Kornelius Kalnbach2016-06-131-1/+1
| |
| * speedup plugin lookupKornelius Kalnbach2016-06-131-5/+15
| |
| * use EscapeUtilsKornelius Kalnbach2016-06-072-38/+4
| |
* | update version; this will be CodeRay 2Kornelius Kalnbach2016-06-041-1/+1
| |
* | Merge branch 'possible-speedups' into dslKornelius Kalnbach2016-06-046-38/+57
|\ \ | |/
| * Merge branch 'master' into possible-speedupsKornelius Kalnbach2016-06-0416-337/+375
| |\
| * \ Merge branch 'master' into possible-speedupsKornelius Kalnbach2016-02-139-12/+40
| |\ \
| * \ \ Merge branch 'master' into possible-speedupsKornelius Kalnbach2015-12-242-2/+2
| |\ \ \
| * \ \ \ Merge branch 'master' into possible-speedupsKornelius Kalnbach2014-12-187-30/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/coderay/encoders/html.rb
| * | | | | don't escape " in HTMLKornelius Kalnbach2013-11-205-12/+11
| | | | | |
| * | | | | even less API changesKornelius Kalnbach2013-10-032-3/+2
| | | | | |
| * | | | | don't break old APIKornelius Kalnbach2013-10-031-12/+13
| | | | | |
| * | | | | Merge branch 'master' into possible-speedupsKornelius Kalnbach2013-09-2047-3015/+0
| |\ \ \ \ \
| * | | | | | cleanup changes into make_escape_cacheKornelius Kalnbach2013-09-201-16/+27
| | | | | | |
| * | | | | | Merge branch 'master' into possible-speedupsKornelius Kalnbach2013-09-073-36/+59
| |\ \ \ \ \ \
| * | | | | | | cache escaped tokens, reduce HTML enc setup timeKornelius Kalnbach2013-08-313-28/+37
| | | | | | | |
* | | | | | | | Merge branch 'master' into dslKornelius Kalnbach2016-06-045-70/+79
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | add changelogKornelius Kalnbach2016-06-021-0/+4
| | | | | | | |
| * | | | | | | revert some changes not related to #195Kornelius Kalnbach2016-06-022-1/+2
| | | | | | | |
| * | | | | | | Removed double lineJohnny Willemsen2016-05-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .travis.yml:
| * | | | | | | Removed merge issueJohnny Willemsen2016-05-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .travis.yml:
| * | | | | | | Moved final from keywords to directiveJohnny Willemsen2016-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lib/coderay/scanners/cpp.rb:
| * | | | | | | Merged upstreamJohnny Willemsen2016-05-301-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | tweaking list of Rubies for CIKornelius Kalnbach2016-05-291-4/+4
| | | | | | | | |
| * | | | | | | | Shouldn't have removed the jruby linesJohnny Willemsen2016-05-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .travis.yml:
| * | | | | | | | Allow failures with jruby 18 and 19 mode, RedCloth has a known problem, see ↵Johnny Willemsen2016-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://jgarber.lighthouseapp.com/projects/13054/tickets/230-use-rbconfig-instead-of-obsolete-and-deprecated-config * .travis.yml:
| * | | | | | | | Add env setting to allow C extensions which are not allowed by default ↵Johnny Willemsen2016-05-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore by travis-ci, see https://docs.travis-ci.com/user/languages/ruby * .travis.yml:
| * | | | | | | | Fixed mergeJohnny Willemsen2016-05-271-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | fix Windows line breaks in FOLDERS fileKornelius Kalnbach2016-04-031-48/+48
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of https://github.com/rubychan/coderayJohnny Willemsen2016-04-031-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | fix tests for Ruby 1.8Kornelius Kalnbach2016-04-031-1/+1
| | | | | | | | |
| * | | | | | | | Small changes to grouping of new C++11 keywordsJohnny Willemsen2016-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lib/coderay/scanners/cpp.rb:
| * | | | | | | | Fixed typoJohnny Willemsen2016-03-111-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FOLDERS:
| * | | | | | | | Add C++11 keywordsJohnny Willemsen2016-03-101-16/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * lib/coderay/scanners/cpp.rb:
* | | | | | | | Merge branch 'master' into dslKornelius Kalnbach2016-03-121-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Use SVG badgesv1.1.1Kornelius Kalnbach2016-02-201-3/+3
| | | | | | | |
* | | | | | | | remove templates, yay!Kornelius Kalnbach2016-02-146-146/+46
| | | | | | | |
* | | | | | | | some more variables that are set by the scannerKornelius Kalnbach2016-02-141-1/+1
| | | | | | | |
* | | | | | | | generate scanner code automaticallyKornelius Kalnbach2016-02-142-36/+87
| | | | | | | |
* | | | | | | | nicer debug outputKornelius Kalnbach2016-02-141-1/+1
| | | | | | | |
* | | | | | | | remove obsolete flag, fix order of rulesKornelius Kalnbach2016-02-141-2/+2
| | | | | | | |
* | | | | | | | optional push state (return nil)Kornelius Kalnbach2016-02-142-8/+10
| | | | | | | |
* | | | | | | | add line number to evalKornelius Kalnbach2016-02-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' into dslKornelius Kalnbach2016-02-1312-265/+296
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | changelogv1.1.1.rc1Kornelius Kalnbach2016-02-131-0/+1
| | | | | | | |
| * | | | | | | Merge pull request #190 from rubychan/autoloadKornelius Kalnbach2016-02-1310-264/+292
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Cleanup Folder structure
| | * | | | | | Merge branch 'master' into autoloadautoloadKornelius Kalnbach2016-02-1312-42/+67
| | |\ \ \ \ \ \
| | * | | | | | | cleanupKornelius Kalnbach2013-10-221-2/+0
| | | | | | | | |