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

53518ccd

Verified Commit 53518ccd authored 3 years ago by Joe Donofry

Downloads
- Plain Diff

Merge remote-tracking branch 'nheko-im/master' into redaction_updates

parents b9b5c87a 1ab4d355

No related branches found

No related tags found

1 merge request!16Change QML UI for redactions

Checking pipeline status

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

resources/icons/ui/volume-up.png 5 additions, 0 deletions

resources/icons/ui/volume-up.png
resources/qml/CommunitiesList.qml 6 additions, 7 deletions

resources/qml/CommunitiesList.qml
resources/qml/delegates/PlayableMediaMessage.qml 69 additions, 181 deletions

resources/qml/delegates/PlayableMediaMessage.qml
resources/qml/dialogs/ReadReceipts.qml 4 additions, 3 deletions

resources/qml/dialogs/ReadReceipts.qml
resources/qml/ui/NhekoSlider.qml 50 additions, 0 deletions

resources/qml/ui/NhekoSlider.qml
resources/qml/ui/media/MediaControls.qml 244 additions, 0 deletions

resources/qml/ui/media/MediaControls.qml
resources/qml/ui/media/qmldir 3 additions, 0 deletions

resources/qml/ui/media/qmldir
resources/qml/ui/qmldir 1 addition, 0 deletions

resources/qml/ui/qmldir
resources/res.qrc 3 additions, 0 deletions

resources/res.qrc
src/ui/MxcMediaProxy.cpp 31 additions, 2 deletions

src/ui/MxcMediaProxy.cpp

with 416 additions and 193 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