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

Convert hipchat importer to js #7146

Merged
merged 6 commits into from
Jun 1, 2017
Merged

Convert hipchat importer to js #7146

merged 6 commits into from
Jun 1, 2017

Commits on Jun 1, 2017

  1. Convert hipchat importer to js

    @rodrigok
    rodrigok committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    8bee576 View commit details
    Browse the repository at this point in the history

  2. [FIX] Fix highlightjs bug (#6991) 

    * Update package.json

* Reference newest highlightjs
    @geekgonecrazy @sampaiodiego
    geekgonecrazy authored and sampaiodiego committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    ea8ce48 View commit details
    Browse the repository at this point in the history

  3. Update server.js

    @ggazzo
    ggazzo authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    1c2ca72 View commit details
    Browse the repository at this point in the history

  4. Update server.js

    @ggazzo
    ggazzo authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    ecd3f05 View commit details
    Browse the repository at this point in the history

  5. Update server.js

    @ggazzo
    ggazzo authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    b0f4404 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'hipchat2js' of https://github.com/RocketChat/Rocket.Chat … 

    …into hipchat2js
    @ggazzo
    ggazzo committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    c0a886f View commit details
    Browse the repository at this point in the history