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

[NEW] New sidebar layout #9608

Merged
merged 37 commits into from
Feb 21, 2018
Merged

[NEW] New sidebar layout #9608

merged 37 commits into from
Feb 21, 2018

Commits on Jan 30, 2018

  1. new sidebar header

    @karlprieb
    karlprieb committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    d782ce6 View commit details
    Browse the repository at this point in the history

  2. fix sidebarHeader template

    @karlprieb
    karlprieb committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    ab5a59b View commit details
    Browse the repository at this point in the history

  3. fix set state

    @karlprieb
    karlprieb committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    ac43d75 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. Fix saveUserPreferences method

    @karlprieb
    karlprieb committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    b5e9c9c View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2018

  1. sort ;ist

    @ggazzo
    ggazzo committed Feb 1, 2018
    Configuration menu
    Copy the full SHA
    b52402d View commit details
    Browse the repository at this point in the history

  2. sidenav viewmode

    @karlprieb
    karlprieb committed Feb 1, 2018
    Configuration menu
    Copy the full SHA
    07226e2 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. migration sort sidenav

    @ggazzo
    ggazzo committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    5d879e5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into … 

    …new-sidebar
    @ggazzo
    ggazzo committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    2be7a45 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new-… 

    …sidebar
    @karlprieb
    karlprieb committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    fd36bc1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into … 

    …new-sidebar
    @karlprieb
    karlprieb committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    5f605af View commit details
    Browse the repository at this point in the history

  5. sidebar views

    @karlprieb
    karlprieb committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    3680fa8 View commit details
    Browse the repository at this point in the history

  6. new icons

    @karlprieb
    karlprieb committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    66790b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2018

  1. change sidenav preferences to sidebar preferences

    @karlprieb
    karlprieb committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    b3b3ac3 View commit details
    Browse the repository at this point in the history

  2. translations and big emoji

    @ggazzo
    ggazzo committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    0b80897 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into … 

    …new-sidebar
    @ggazzo
    ggazzo committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    d6c5381 View commit details
    Browse the repository at this point in the history

  4. search

    @karlprieb
    karlprieb committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    831634e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into … 

    …new-sidebar
    @karlprieb
    karlprieb committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    92858c9 View commit details
    Browse the repository at this point in the history

  6. star icon

    @karlprieb
    karlprieb committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    2863e58 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2018

  1. fix tests

    @karlprieb
    karlprieb committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    f87af93 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @karlprieb
    karlprieb committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    8239f0c View commit details
    Browse the repository at this point in the history

  3. fix user preferences/admin sidebar item icons

    @karlprieb
    karlprieb committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    905219c View commit details
    Browse the repository at this point in the history

  4. remove tooltip on click sidebarheader

    @ggazzo
    ggazzo committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    ab11cd2 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2018

  1. Merge branch 'develop' into new-sidebar

    @engelgabriel
    engelgabriel authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    1b7e3bb View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. Merge branch 'develop' into new-sidebar

    @karlprieb
    karlprieb committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    77698da View commit details
    Browse the repository at this point in the history

  2. new merged icon

    @karlprieb
    karlprieb committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    1ca598a View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. remove comments and logs

    @karlprieb
    karlprieb committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    a520e90 View commit details
    Browse the repository at this point in the history

  2. try to fix isRtl

    @karlprieb
    karlprieb committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    4a69d6e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into new-sidebar

    @karlprieb
    karlprieb authored Feb 19, 2018
    Configuration menu
    Copy the full SHA
    ea6c7a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

  1. Merge branch 'develop' into new-sidebar

    @engelgabriel
    engelgabriel authored Feb 20, 2018
    Configuration menu
    Copy the full SHA
    8fdb51e View commit details
    Browse the repository at this point in the history

  2. fix icon sizes

    @engelgabriel
    engelgabriel committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    6c35a9f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into … 

    …new-sidebar
    @engelgabriel
    engelgabriel committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    94efe9a View commit details
    Browse the repository at this point in the history

  4. Fix typo

    @engelgabriel
    engelgabriel committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    66e5626 View commit details
    Browse the repository at this point in the history

  5. reverting @engelgabriel commits

    @karlprieb
    karlprieb committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    01a9123 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into new-sidebar

    @karlprieb
    karlprieb committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    3fa23bb View commit details
    Browse the repository at this point in the history

  7. fix all diego's problems

    @karlprieb
    karlprieb committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    643ba1d View commit details
    Browse the repository at this point in the history

  8. Fix icon sizes

    @engelgabriel
    engelgabriel committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    8de37ff View commit details
    Browse the repository at this point in the history

  9. update Merge_Channels name

    @karlprieb
    karlprieb authored Feb 20, 2018
    Configuration menu
    Copy the full SHA
    7afb66e View commit details
    Browse the repository at this point in the history