Skip to content
Snippets Groups Projects
  • Marcelo Schmidt's avatar
    f1998099
    Merge branch 'master' into rocket-mailer · f1998099
    Marcelo Schmidt authored
    * master: (28 commits)
      preventDefault on shift + esc shortcut
      Close #1222; Fix shared variable with username info when generate avatar
      Merging .travis.yml
      meteor update
      Updating meteor
      Applying velocity-cli for application test in CI mode
      Add add ons per #1045
      New attempt for application test.
      Test attempt.
      Added application tests
      Final updated versions
      Updating versions
      Explicitly declaring sanjo:jasmine version.
      Simplifying rocketchat:markdown tests since its falling because of underscore.string
      Fixing call to underscore.string 'trim' method to avoid conflicts with Underscore test stubs.
      Fixed path for velocity-cli execution
      Added correct velocity-cli package
      Setting up Travis CI for test execution and removing test dependencies
      Updating to support ServiceConfiguration.configurations stub method (meteor-velocity/meteor-stubs/#11)
      Settings file should only be available on server.
      ...
    f1998099
    History
    Merge branch 'master' into rocket-mailer
    Marcelo Schmidt authored
    * master: (28 commits)
      preventDefault on shift + esc shortcut
      Close #1222; Fix shared variable with username info when generate avatar
      Merging .travis.yml
      meteor update
      Updating meteor
      Applying velocity-cli for application test in CI mode
      Add add ons per #1045
      New attempt for application test.
      Test attempt.
      Added application tests
      Final updated versions
      Updating versions
      Explicitly declaring sanjo:jasmine version.
      Simplifying rocketchat:markdown tests since its falling because of underscore.string
      Fixing call to underscore.string 'trim' method to avoid conflicts with Underscore test stubs.
      Fixed path for velocity-cli execution
      Added correct velocity-cli package
      Setting up Travis CI for test execution and removing test dependencies
      Updating to support ServiceConfiguration.configurations stub method (meteor-velocity/meteor-stubs/#11)
      Settings file should only be available on server.
      ...