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

Hotfix/#10 sidebar ie issue #78

Closed
wants to merge 30 commits into from
Closed

Hotfix/#10 sidebar ie issue #78

wants to merge 30 commits into from

Commits on Aug 22, 2017

  1. feature/#62-refresh-send-icon

    @vickyokrm
    vickyokrm committed Aug 22, 2017
    Configuration menu
    Copy the full SHA
    213e907 View commit details
    Browse the repository at this point in the history

  2. feature/#62-refresh-send-icon

    @vickyokrm
    vickyokrm committed Aug 22, 2017
    Configuration menu
    Copy the full SHA
    4f9295a View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2017

  1. Fixed function closure syntax allowing validation emails to be sent.

    @snoozan @geekgonecrazy
    snoozan authored and geekgonecrazy committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    3100b6f View commit details
    Browse the repository at this point in the history

  2. [FIX] Fixed function closure syntax allowing validation emails to be … 

    …sent.
    @snoozan @geekgonecrazy
    snoozan authored and geekgonecrazy committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    d8d386b View commit details
    Browse the repository at this point in the history

  3. Bump version 0.58.2

    @geekgonecrazy
    geekgonecrazy committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    a1da0bd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/0.58.2' of https://github.com/RocketChat/Rocket… 

    ….Chat into release/0.58.2
    @geekgonecrazy
    geekgonecrazy committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    8f8f2bb View commit details
    Browse the repository at this point in the history

  5. Add history

    @geekgonecrazy
    geekgonecrazy committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    cbaf9c1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request RocketChat#7841 from RocketChat/release/0.58.2 

    Release 0.58.2
    @rodrigok
    rodrigok authored Aug 23, 2017
    Configuration menu
    Copy the full SHA
    b613b6f View commit details
    Browse the repository at this point in the history

  7. Fix issue caused by merge

    @geekgonecrazy
    geekgonecrazy committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    988103d View commit details
    Browse the repository at this point in the history

  8. Merge pull request #83 from mrsimpson/feature/#62-refresh-send-icon 

    Feature/#62 refresh send icon
    @ruKurz
    ruKurz authored Aug 23, 2017
    Configuration menu
    Copy the full SHA
    cc4bf74 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. Make fix for input selection more robust (#84) 

    * use Meteor's internal selector instead of a global jQuery

* Make the focus input event a bit more robust

* Undo accidental cut

* code style
    @mrsimpson
    mrsimpson authored Aug 24, 2017
    Configuration menu
    Copy the full SHA
    15a18a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. Merge branch 'master' into develop

    @mrsimpson
    mrsimpson committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    d5a3eb2 View commit details
    Browse the repository at this point in the history

  2. smarti#87 add support area to smarti

    Thomas Kurz committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    3ac051d View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2017

  1. Deps update

    @rodrigok
    rodrigok committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    a494cf5 View commit details
    Browse the repository at this point in the history

  2. Bump version to 0.58.3

    @rodrigok
    rodrigok committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    bd33117 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #62 from assistify/smarti#87_add_support_area_to_s… 

    …marti_call

Add support-area to smarti
    @mrsimpson
    mrsimpson authored Sep 27, 2017
    Configuration menu
    Copy the full SHA
    93a6baf View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2017

  1. Merge branch 'hotfix/#63-global-announcement' into develop

    @mrsimpson
    mrsimpson committed Sep 29, 2017
    Configuration menu
    Copy the full SHA
    dfde313 View commit details
    Browse the repository at this point in the history

  2. disable smarti load if necessary parameters are not set

    Thomas Kurz committed Sep 29, 2017
    Configuration menu
    Copy the full SHA
    ca8e4b7 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2017

  1. fix

    @vickyokrm
    vickyokrm committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    6d096f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2017

  1. [FIX] Meteor accounts issue - function which caused users to be logge… 

    …d out shortly after logging in
    @rodrigok
    rodrigok committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    3a90df3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request RocketChat#8389 from RocketChat/fix-snap-npm-dep 

    [FIX] Add needed dependency for snaps
    @rodrigok
    rodrigok committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    3e69c89 View commit details
    Browse the repository at this point in the history

  3. Merge pull request RocketChat#8390 from RocketChat/fixes-for-slack-im… 

    …port

[FIX] Slack import failing and not being able to be restarted
# Conflicts:
#	packages/rocketchat-i18n/i18n/en.i18n.json
    @rodrigok
    rodrigok committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    c51011e View commit details
    Browse the repository at this point in the history

  4. Merge pull request RocketChat#8408 from RocketChat/rest-api-improve-j… 

    …son-query-helper

[FIX] Duplicate code in rest api letting in a few bugs with the rest api
# Conflicts:
#	packages/rocketchat-api/server/api.js
#	packages/rocketchat-api/server/v1/channels.js
#	packages/rocketchat-api/server/v1/groups.js
#	packages/rocketchat-api/server/v1/im.js
    @rodrigok
    rodrigok committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    cf1eef4 View commit details
    Browse the repository at this point in the history

  5. Bump version to 0.58.4

    @rodrigok
    rodrigok committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    60fa18c View commit details
    Browse the repository at this point in the history

  6. fixes #10 - tested in chrome and IE on windows

    @mrsimpson
    mrsimpson committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    1be4d95 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2017

  1. Merge remote-tracking branch 'origin/hotfix/#10-sidebar-IE-issue' int… 

    …o develop
    @mrsimpson
    mrsimpson committed Oct 10, 2017
    Configuration menu
    Copy the full SHA
    cd61929 View commit details
    Browse the repository at this point in the history

  2. Updated RC to 0.58.4

    @mrsimpson
    mrsimpson committed Oct 10, 2017
    Configuration menu
    Copy the full SHA
    1c43067 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2017

  1. Merge remote-tracking branch 'origin/master' into develop

    @mrsimpson
    mrsimpson committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    11b4b7d View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2017

  1. Merge branch 'develop' of https://github.com/assistify/Rocket.Chat in… 

    …to hotfix/#10-sidebar-IE-issue
    @vickyokrm
    vickyokrm committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    e5d81f2 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2017

  1. hotfix/#10: Fixes side nav scroll bar issue in IE

    @vickyokrm
    vickyokrm committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    c2deb61 View commit details
    Browse the repository at this point in the history