Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | fix Sass highlighting in diff | Kornelius Kalnbach | 2013-06-09 | 1 | -3/+0 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into sass-scanner | Kornelius Kalnbach | 2013-06-09 | 7 | -5/+5 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/coderay/scanners/css.rb | |||||
| | | * | | | do not warn about plugin fallback | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+0 | |
| | | | | | | ||||||
| | | * | | | don't allow \x00 in diff filenames | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | bump version to 1.1.0 | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | avoid empty tokens in Diff output, fix split_into_parts | Kornelius Kalnbach | 2013-06-09 | 2 | -1/+2 | |
| | | | | | | ||||||
| | | * | | | treat empty token as error in Debug encoder | Kornelius Kalnbach | 2013-06-09 | 1 | -0/+1 | |
| | | | | | | ||||||
| | | * | | | two fixes for CSS scanner | Kornelius Kalnbach | 2013-06-09 | 1 | -2/+2 | |
| | | | | | | ||||||
| | | * | | | unfreeze TokenKinds hash, allow changes | Kornelius Kalnbach | 2013-06-09 | 1 | -2/+0 | |
| | | | | | | ||||||
| | | * | | | PHP is a better highlight for phtml files | Alexandre Vezina | 2013-04-17 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Support for phtml files | Alexandre Vezina | 2013-03-23 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | fix order of SASS_FUNCTIONs | Kornelius Kalnbach | 2013-04-11 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into sass-scanner | Kornelius Kalnbach | 2013-03-11 | 7 | -8/+8 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | minor tweaks to generator and scanner edge cases | Kornelius Kalnbach | 2013-03-11 | 7 | -8/+8 | |
| | | | | | | ||||||
| | * | | | | added Sass scanner (work in progress) | Kornelius Kalnbach | 2013-03-11 | 4 | -17/+220 | |
| | |/ / / | ||||||
| | * | | | vastly improve Debug encoder speed on Ruby 1.9.3 | Kornelius Kalnbach | 2013-03-11 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | support multi-line comments in JavaScript diff | Kornelius Kalnbach | 2013-03-10 | 1 | -4/+27 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' into lua-scanner | Kornelius Kalnbach | 2013-03-10 | 8 | -82/+117 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | cleanup | Kornelius Kalnbach | 2013-03-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2013-03-10 | 7 | -53/+66 | |
| |\ \ \ | ||||||
| | * | | | fix #41 by removing special case | Kornelius Kalnbach | 2013-03-10 | 1 | -17/+22 | |
| | | | | | | | | | | | | | | | | | | | | Also, clean up some code. | |||||
| | * | | | remove ondblclick handler from HTML output | Kornelius Kalnbach | 2013-03-10 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | bump version to 1.0.9v1.0.9.rc1 | Kornelius Kalnbach | 2013-02-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | fix PHP scanner for Ruby 1.8 | Kornelius Kalnbach | 2013-02-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | fix #40 (PHP unicode) | Kornelius Kalnbach | 2013-02-17 | 1 | -3/+2 | |
| | | | | | ||||||
| | * | | | fix #83 (XML DTD) | Kornelius Kalnbach | 2013-02-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | match Ruby 1.9 hash syntax even without space after colon | Kornelius Kalnbach | 2013-02-17 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Merge branch 'fix-ruby-unicode' into fix-ruby-new-hash-syntax | Kornelius Kalnbach | 2013-02-17 | 1 | -3/+3 | |
| | |\ \ \ | ||||||
| | | * | | | improve support for Unicode non-alphanumeric characters in Ruby names | Kornelius Kalnbach | 2013-02-17 | 1 | -3/+3 | |
| | | | |/ | | | |/| | ||||||
| | * | | | cleanup: value_expected should be boolean | Kornelius Kalnbach | 2013-02-17 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into fix-ruby-new-hash-syntax | Kornelius Kalnbach | 2013-02-17 | 1 | -15/+15 | |
| | |\ \ \ | ||||||
| | | * | | | whitespace | Kornelius Kalnbach | 2013-02-17 | 1 | -15/+15 | |
| | | |/ / | ||||||
| | * | | | fix #106: re-introduce highlightinging of { key: value } in Ruby 1.9 hashes | Kornelius Kalnbach | 2013-02-17 | 1 | -11/+20 | |
| | |/ / | ||||||
| * | | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-10-11 | 3 | -3/+6 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-09-07 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-06-25 | 2 | -9/+1 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-04-13 | 7 | -20/+33 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-01-21 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2011-12-27 | 7 | -19/+17 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coderay.gemspec | |||||
| * | | | | | | | simplify multiline diff regexp | Kornelius Kalnbach | 2011-12-12 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | inline diff highlighting for multi-line changes (#227) | Kornelius Kalnbach | 2011-11-02 | 2 | -30/+52 | |
| | | | | | | | | ||||||
* | | | | | | | | :map token kind | Nathan Youngman | 2012-10-27 | 3 | -21/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | bump version to 1.0.8 | Kornelius Kalnbach | 2012-10-07 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix HTML scanner: Don't crash if HTML in a diff contains a JavaScript tag. | Kornelius Kalnbach | 2012-10-07 | 1 | -1/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | escape = in regex (my editor gets confused:-) | Nathan Youngman | 2012-09-11 | 1 | -10/+10 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge remote-tracking branch 'origin/lua-scanner-faster' into lua-scanner | Nathan Youngman | 2012-09-11 | 1 | -27/+25 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | use case+when instead of send and methods | Kornelius Kalnbach | 2012-06-19 | 1 | -33/+31 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into lua-scanner | Nathan Youngman | 2012-09-11 | 3 | -7/+2 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Update lib/coderay/encoders/html/numbering.rb | shura | 2012-08-28 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ | |/| | | | | | |