summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2012-09-07119-40247/+8
|\
| * changelogKornelius Kalnbach2012-07-231-0/+4
| * add :string.:char, remove :regexp.:function color from terminal encode (GH #29)Kornelius Kalnbach2012-07-231-1/+1
| * test with different Travis settings, againKornelius Kalnbach2012-07-191-1/+1
| * test with different Travis settingsKornelius Kalnbach2012-07-181-3/+3
| * remove etc folderKornelius Kalnbach2012-07-18116-40244/+1
* | Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2012-06-257-519/+31
|\ \ | |/
| * changelogv1.0.7Kornelius Kalnbach2012-06-211-0/+1
| * replace LGPL license with MIT [GH-25]Kornelius Kalnbach2012-06-213-509/+22
| * prepare for rc2v1.0.7.rc2Kornelius Kalnbach2012-06-191-1/+1
| * HTML scanner accepts boolean attributes; fixes issue #26Kornelius Kalnbach2012-06-192-4/+2
| * fix buggy indentation in documentation (issue #23)Kornelius Kalnbach2012-05-041-5/+5
* | Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2012-04-1313-26/+157
|\ \ | |/
| * bump version to 1.0.7v1.0.7.rc1Kornelius Kalnbach2012-04-062-1/+5
| * Merge pull request #20 from TildeWill/masterKornelius Kalnbach2012-04-051-1/+0
| |\
| | * Removing redundant LoadError raise. File.exists? seems to have problems when ...Will Read2012-04-011-1/+0
| * | last changes before release of 1.0.6v1.0.6Kornelius Kalnbach2012-04-062-0/+2
| |/
| * update changelog, bump version to 1.0.6v1.0.6.rc1Kornelius Kalnbach2012-04-022-1/+3
| * Merge branch 'master' into independent-linesKornelius Kalnbach2012-04-021-0/+1
| |\
| | * ignore .DS_StoreKornelius Kalnbach2012-04-021-0/+1
| * | rename :independent_lines option to :break_linesKornelius Kalnbach2012-04-022-8/+9
| * | here come the white-space nazisKornelius Kalnbach2012-04-013-32/+32
| * | Merge remote-tracking branch 'emassip/master' into independent-linesKornelius Kalnbach2012-04-013-19/+134
| |\ \ | | |/ | |/|
| | * Added a unit test for HTML encoder (with a test for :line_independent option)Etienne Massip2012-03-291-0/+104
| | * Fixed handling of eols inside token content.Etienne Massip2012-03-291-6/+10
| | * Extracted code making HTML lines independent from numbering code to a specifi...Etienne Massip2012-01-262-18/+25
| * | specify encoding of PHP scanner file (fails when RUBYOPT=-Ku is set)Kornelius Kalnbach2012-03-311-0/+1
| * | fix tests for #16Kornelius Kalnbach2012-03-311-3/+3
| * | Merge remote-tracking branch 'dslh/master'Kornelius Kalnbach2012-03-311-3/+3
| |\ \
| | * | Fixing automatic type selection for html files.Doug Hammond2012-02-231-3/+3
| | |/
| * | remove rbx-19mode from travis for nowKornelius Kalnbach2012-03-021-1/+1
| * | replace weird regexp that confuses ruby-headKornelius Kalnbach2012-03-021-1/+1
| * | update .travis.ymlKornelius Kalnbach2012-03-021-3/+5
| * | changelogKornelius Kalnbach2012-01-211-0/+4
| |/
* | Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2012-01-212-2/+3
|\ \ | |/
| * Merge pull request #13 from noprompt/masterKornelius Kalnbach2012-01-212-2/+3
| |\
| | * fix whitespace changesJoel Holdbrooks2012-01-201-38/+38
| | * begin/end with group :function instead of :stringJoel Holdbrooks2012-01-131-40/+40
| | * ignore vim swp filesJoel Holdbrooks2012-01-131-0/+1
| |/
* | yikesKornelius Kalnbach2011-12-271-1/+0
* | Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2011-12-2716-113/+64
|\ \ | |/
| * also thank tvon for reposting the autoload issuev1.0.5Kornelius Kalnbach2011-12-271-1/+1
| * update changelogv1.0.5.rc1Kornelius Kalnbach2011-12-271-0/+7
| * prepare CodeRay 1.0.5.rc1Kornelius Kalnbach2011-12-272-3/+4
| * use coderay_path on all autoload callsKornelius Kalnbach2011-12-272-3/+3
| * let autoloading to the work (fix test warnings)Kornelius Kalnbach2011-12-272-4/+1
| * use coderay_path to load version.rbKornelius Kalnbach2011-12-271-2/+2
| * Bug #6: merge ConradIrwin's approach with korny'sKornelius Kalnbach2011-12-274-28/+24
| * add test for #6 (pry autoload issue)Kornelius Kalnbach2011-12-271-0/+16
| * Remove assumption about a stable $:Conrad Irwin2011-12-235-8/+19