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

a5778bdf

Verified Commit a5778bdf authored 4 years ago by Joe Donofry

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into reactions

parents 6d2789f4 fca85bea

No related branches found

No related tags found

No related merge requests found

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 2 additions, 2 deletions

.travis.yml
CMakeLists.txt 2 additions, 7 deletions

CMakeLists.txt
README.md 2 additions, 9 deletions

README.md
io.github.NhekoReborn.Nheko.json 2 additions, 2 deletions

io.github.NhekoReborn.Nheko.json
resources/langs/.gitignore 1 addition, 0 deletions

resources/langs/.gitignore
resources/langs/nheko_de.ts 3 additions, 3 deletions

resources/langs/nheko_de.ts
resources/langs/nheko_en.qm 0 additions, 82 deletions

resources/langs/nheko_en.qm
resources/qml/TimelineRow.qml 5 additions, 1 deletion

resources/qml/TimelineRow.qml
resources/qml/TimelineView.qml 2 additions, 0 deletions

resources/qml/TimelineView.qml
src/ChatPage.cpp 2 additions, 2 deletions

src/ChatPage.cpp
src/Olm.cpp 39 additions, 34 deletions

src/Olm.cpp
src/Olm.h 2 additions, 2 deletions

src/Olm.h
src/UserSettingsPage.cpp 15 additions, 5 deletions

src/UserSettingsPage.cpp
src/UserSettingsPage.h 8 additions, 0 deletions

src/UserSettingsPage.h
src/main.cpp 1 addition, 0 deletions

src/main.cpp

with 86 additions and 149 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