Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nheko
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

aa63e50c

Verified Commit aa63e50c authored 2 years ago by Nicolas Werner

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/perSpaceNotifs' into perSpaceNotifs

parents 9056ca86 e2e5e492

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

resources/qml/CommunitiesList.qml 68 additions, 20 deletions

resources/qml/CommunitiesList.qml
resources/qml/RoomList.qml 26 additions, 59 deletions

resources/qml/RoomList.qml
resources/qml/components/NotificationBubble.qml 46 additions, 0 deletions

resources/qml/components/NotificationBubble.qml
resources/res.qrc 1 addition, 0 deletions

resources/res.qrc
src/UserSettingsPage.cpp 46 additions, 7 deletions

src/UserSettingsPage.cpp
src/UserSettingsPage.h 13 additions, 3 deletions

src/UserSettingsPage.h
src/Utils.cpp 19 additions, 0 deletions

src/Utils.cpp
src/Utils.h 5 additions, 0 deletions

src/Utils.h
src/timeline/CommunitiesModel.cpp 120 additions, 25 deletions

src/timeline/CommunitiesModel.cpp
src/timeline/CommunitiesModel.h 11 additions, 4 deletions

src/timeline/CommunitiesModel.h
src/timeline/RoomlistModel.cpp 4 additions, 1 deletion

src/timeline/RoomlistModel.cpp
src/timeline/TimelineModel.cpp 15 additions, 5 deletions

src/timeline/TimelineModel.cpp

with 374 additions and 124 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment