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

CSS/components for custom presence controls #5286

Merged
merged 9 commits into from
Nov 14, 2017
Merged

CSS/components for custom presence controls #5286

merged 9 commits into from
Nov 14, 2017

Commits on Oct 14, 2017

  1. CSS for presence member avatar 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    9d17ed7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into travis/presence

    @turt2live
    turt2live committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    6f96852 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2017

  1. CSS for more positioning options on context menus 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    1ca041c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into travis/presence

    @turt2live
    turt2live committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    e2b02ad View commit details
    Browse the repository at this point in the history

  3. Add presence context menu and styling 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    deb50b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2017

  1. Don't update presence status if the user is clicks twice 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    ef5fc73 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Remove i18n for making the merge easier 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    53185fc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'vector-im/develop' into travis/presence

    @turt2live
    turt2live committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    45ca890 View commit details
    Browse the repository at this point in the history

  3. Re-add i18n post-merge 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    6c796cd View commit details
    Browse the repository at this point in the history