Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

latest from upstream #1

Merged
merged 39 commits into from Jul 27, 2013
Merged

latest from upstream #1

merged 39 commits into from Jul 27, 2013

Commits on Jan 9, 2013

  1. Bump license date

    @tnm
    tnm committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    cf90dde View commit details
    Browse the repository at this point in the history

  2. Bump license date in readme

    @tnm
    tnm committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    bc6b306 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2013

  1. Fix year

    @tnm
    tnm committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    257c870 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2013

  1. Bump to latest pygments upstream

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    b3fe04d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from tmm1/pygments16 

    Bump to latest pygments upstream
    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    f2a45b7 View commit details
    Browse the repository at this point in the history

  3. Update lexers

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    ab0f363 View commit details
    Browse the repository at this point in the history

  4. Bump to 0.4.0, with pygments upstream upgrade

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    81a6f1d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #62 from tmm1/pygments16 

    More lexers
    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    3f82677 View commit details
    Browse the repository at this point in the history

  6. Update tests to reflect latest pygments

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    92f0cce View commit details
    Browse the repository at this point in the history

  7. Bump to 0.4.1

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    4fee47a View commit details
    Browse the repository at this point in the history

  8. Add custom TOML lexer

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    d460ba6 View commit details
    Browse the repository at this point in the history

  9. Update lexers

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    b8fd4da View commit details
    Browse the repository at this point in the history

  10. Merge pull request #63 from tmm1/toml 

    Add TOML custom lexer
    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    2216328 View commit details
    Browse the repository at this point in the history

  11. Bump to 0.4.2

    @tnm
    tnm committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    3f2881a View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2013

  1. Update README.md 

    Hey, wanted to add how to use the pygments styles, since I was using some time myself finding out. Thanks.
    @kayloos
    kayloos committed Feb 28, 2013
    Configuration menu
    Copy the full SHA
    ae8baf5 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2013

  1. Merge pull request #65 from kayloos/patch-1 

    Update README.md
    @tnm
    tnm committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    d524f77 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @tnm
    tnm committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    f82642a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2013

  1. Use rstrip to deal with table mode.

    @tnm
    tnm committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    c7ddb4a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #70 from tmm1/rstrip 

    Use rstrip to deal with table mode.
    @tnm
    tnm committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    d5f6a5e View commit details
    Browse the repository at this point in the history

  3. Bump to 0.5.0

    @tnm
    tnm committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    3cdb346 View commit details
    Browse the repository at this point in the history

  4. Update CHANGELOG

    @tnm
    tnm committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    198d5ce View commit details
    Browse the repository at this point in the history

  5. Whitespace in Rakefile

    @tnm
    tnm committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    4af1298 View commit details
    Browse the repository at this point in the history

  6. Minor Rakefile style

    @tnm
    tnm committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    9604a54 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2013

  1. detect if python2 is available or else fall back to python

    Charlie Somerville committed May 19, 2013
    Configuration menu
    Copy the full SHA
    f03df35 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #74 from charliesome/detect-python-vs-python2 

    Detect if `python2` is available or else fall back to `python`
    @tmm1
    tmm1 committed May 19, 2013
    Configuration menu
    Copy the full SHA
    84c69a1 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2013

  1. Bump to 0.5.1

    @tnm
    tnm committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    370ac25 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @tnm
    tnm committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    72d8d5d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2013

  1. Remove the pygments lexer in favor of @rodjek's better one

    @tnm
    tnm committed Jun 27, 2013
    Configuration menu
    Copy the full SHA
    d646705 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2013

  1. Update rubygems source

    @tnm
    tnm committed Jul 1, 2013
    Configuration menu
    Copy the full SHA
    514e984 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2013

  1. add Slash lexer

    Charlie Somerville committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    b8de159 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #84 from charliesome/add-slash-lexer 

    Add Slash lexer
    @tnm
    tnm committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    a3a2555 View commit details
    Browse the repository at this point in the history

  3. Latest bump

    @tnm
    tnm committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    07231a1 View commit details
    Browse the repository at this point in the history

  4. PYTHOOOOOOOOOOON 

    This was dying when rendered through the HTML formatter because
the HTML formatter calls translate on returned strings. Turns out
the implementation of translate on 'unicode' objects is COMPLETELY
different to the implementation on 'str' objects AND THIS IS ONLY
VAGUELY MENTIONED IN THE DOCUMENTATION
    Charlie Somerville committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    21560d0 View commit details
    Browse the repository at this point in the history

  5. don't expect nkw after a \ or λ

    Charlie Somerville committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    dbb074c View commit details
    Browse the repository at this point in the history

  6. prettier highlighting for classes and defs

    Charlie Somerville committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    2a44fd7 View commit details
    Browse the repository at this point in the history

  7. highlight singleton methods properly

    Charlie Somerville committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    1dc0045 View commit details
    Browse the repository at this point in the history

  8. highlight string interpolation properly

    Charlie Somerville committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    c69a920 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #86 from charliesome/fix-slash-lexer 

    Fix slash lexer
    @tnm
    tnm committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    c02c050 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2013

  1. Mention logging in README

    @tnm
    tnm committed Jul 27, 2013
    Configuration menu
    Copy the full SHA
    e87424c View commit details
    Browse the repository at this point in the history