Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Merge branch 'master' into sass-scanner | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: lib/coderay/scanners/css.rb | ||||
| * | don't allow \x00 in diff filenames | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+1 |
| | | |||||
| * | avoid empty tokens in Diff output, fix split_into_parts | Kornelius Kalnbach | 2013-06-09 | 1 | -1/+1 |
| | | |||||
| * | two fixes for CSS scanner | Kornelius Kalnbach | 2013-06-09 | 1 | -2/+2 |
| | | |||||
* | | 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 | 2 | -17/+217 |
|/ | |||||
* | cleanup | Kornelius Kalnbach | 2013-03-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2013-03-10 | 4 | -34/+42 |
|\ | |||||
| * | 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 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Fix HTML scanner: Don't crash if HTML in a diff contains a JavaScript tag. | Kornelius Kalnbach | 2012-10-07 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-06-25 | 1 | -4/+1 |
|\ \ | |/ | |||||
| * | HTML scanner accepts boolean attributes; fixes issue #26 | Kornelius Kalnbach | 2012-06-19 | 1 | -4/+1 |
| | | |||||
* | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-04-13 | 2 | -1/+2 |
|\ \ | |/ | |||||
| * | specify encoding of PHP scanner file (fails when RUBYOPT=-Ku is set) | Kornelius Kalnbach | 2012-03-31 | 1 | -0/+1 |
| | | |||||
| * | replace weird regexp that confuses ruby-head | Kornelius Kalnbach | 2012-03-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2012-01-21 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | fix whitespace changes | Joel Holdbrooks | 2012-01-20 | 1 | -38/+38 |
| | | |||||
| * | begin/end with group :function instead of :string | Joel Holdbrooks | 2012-01-13 | 1 | -40/+40 |
| | | |||||
* | | Merge branch 'master' into multiline-inline-diff | Kornelius Kalnbach | 2011-12-27 | 3 | -6/+4 |
|\ \ | |/ | | | | | | | Conflicts: coderay.gemspec | ||||
| * | let autoloading to the work (fix test warnings) | Kornelius Kalnbach | 2011-12-27 | 1 | -3/+1 |
| | | |||||
| * | Bug #6: merge ConradIrwin's approach with korny's | Kornelius Kalnbach | 2011-12-27 | 2 | -3/+3 |
| | | |||||
| * | Remove assumption about a stable $: | Conrad Irwin | 2011-12-23 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | In some environments (e.g. [1]) $: can change between loading the library and using it. To avoid this problem, we always pass an absolute path to autoload internal modules. [1] https://github.com/pry/pry/issues/280 | ||||
* | | 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 | 1 | -29/+51 |
|/ | |||||
* | css scanner fixes; preparing 1.0.4 | Kornelius Kalnbach | 2011-11-02 | 1 | -7/+14 |
| | |||||
* | minor fix in diff scanner, .tmproj filetype: 1.0.3v1.0.3 | Kornelius Kalnbach | 2011-10-26 | 1 | -1/+1 |
| | |||||
* | allow - and / in YAML keys | Kornelius Kalnbach | 2011-10-13 | 1 | -1/+1 |
| | |||||
* | cleanups, documentation for TokensProxy | Kornelius Kalnbach | 2011-09-21 | 1 | -0/+2 |
| | |||||
* | less spaces mean more code on 13" screens | Kornelius Kalnbach | 2011-09-09 | 1 | -3/+3 |
| | |||||
* | #353 New scanner: HAML! | Kornelius Kalnbach | 2011-09-09 | 1 | -0/+168 |
| | |||||
* | Ruby scanner accepts :state options and provides #interpreted_string_state ↵ | Kornelius Kalnbach | 2011-09-09 | 1 | -1/+5 |
| | | | | method | ||||
* | HTML scanner ignores <% tags and accepts :state option | Kornelius Kalnbach | 2011-09-09 | 1 | -2/+2 |
| | |||||
* | refactor erb scanner open tag matching to fix a minor bug | Kornelius Kalnbach | 2011-09-09 | 1 | -8/+12 |
| | |||||
* | diff scanner: highlight "\ No newline" as :comment | Kornelius Kalnbach | 2011-09-09 | 1 | -5/+2 |
| | |||||
* | fixed YAML scanner (Scanner#column rewrite broke it) | Kornelius Kalnbach | 2011-08-29 | 1 | -6/+5 |
| | |||||
* | fix HTML scanner to correctly highlight embedded Ruby inside of attribute values | Kornelius Kalnbach | 2011-08-21 | 1 | -6/+6 |
| |