Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Mobile/Desktop Sidebar View + Restored Team Sidebar and Header #5016

Merged
merged 29 commits into from
Mar 10, 2020
Merged

Mobile/Desktop Sidebar View + Restored Team Sidebar and Header #5016

Changes from 2 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dd06305
[MM-22291] Additional functionality from old sidebar
devinbinnie Feb 7, 2020
cf4f4ec
PR feedback
devinbinnie Feb 13, 2020
ade23d4
PR feedback
devinbinnie Feb 13, 2020
52e347d
Merge branch 'feature/channel-sidebar-organization' into MM-22291
devinbinnie Feb 13, 2020
4224a8b
Merge branch 'MM-22291' of https://github.com/devinbinnie/mattermost-…
devinbinnie Feb 13, 2020
96f6a27
Lank bline
devinbinnie Feb 13, 2020
e15f9af
Lint again
devinbinnie Feb 13, 2020
0582350
PR feedback
devinbinnie Feb 27, 2020
a3be954
Merge branch 'feature/channel-sidebar-organization' into MM-22291
devinbinnie Feb 27, 2020
51e1d97
Merge'd
devinbinnie Feb 27, 2020
43729eb
Merge branch 'feature/channel-sidebar-organization' into MM-22291
devinbinnie Feb 28, 2020
6989b2e
Actual functioning sidebar!
devinbinnie Mar 4, 2020
f8260b3
Using react-custom-scrollbars again and fixed a few styling issues
devinbinnie Mar 4, 2020
d789e69
PR feedback
devinbinnie Mar 5, 2020
fbaddff
Merge branch 'feature/channel-sidebar-organization' into MM-22291
devinbinnie Mar 5, 2020
f12c97d
Merge branch 'MM-22291' into MM-22464
devinbinnie Mar 5, 2020
3f5e7a1
Merge branch 'feature/channel-sidebar-organization' into MM-22464
devinbinnie Mar 6, 2020
fff417d
Lint fixes
devinbinnie Mar 6, 2020
318038f
WIP
devinbinnie Mar 6, 2020
4ec5629
Added back original team sidebar and sidebar header for Phase 1
devinbinnie Mar 6, 2020
35fd9ae
Mobile bar fits, still styling issues
devinbinnie Mar 6, 2020
dc56a56
Style and lint fixes to make the sidebar work properly
devinbinnie Mar 9, 2020
7b220f8
Merge branch 'feature/channel-sidebar-organization' into MM-22464
mattermod Mar 9, 2020
ecfc38a
Merge branch 'MM-22464' into MM-22835
devinbinnie Mar 9, 2020
931ad97
Desktop and other mobile fixes
devinbinnie Mar 9, 2020
d272727
Merge branch 'feature/channel-sidebar-organization' into MM-22835
devinbinnie Mar 9, 2020
0d55b57
Merge'd
devinbinnie Mar 9, 2020
dcdd69d
Merge branch 'feature/channel-sidebar-organization' into MM-22835
devinbinnie Mar 9, 2020
8896373
Merge branch 'feature/channel-sidebar-organization' into MM-22835
devinbinnie Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.