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

fd479a91

Commit fd479a91 authored 4 years ago by trilene

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into webrtc-video

parents b1300aff 21438819

No related branches found

No related tags found

No related merge requests found

Changes 37

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 1 deletion

CMakeLists.txt
cmake/Hunter/config.cmake 4 additions, 0 deletions

cmake/Hunter/config.cmake
io.github.NhekoReborn.Nheko.json 1 addition, 1 deletion

io.github.NhekoReborn.Nheko.json
resources/langs/nheko_et.ts 56 additions, 56 deletions

resources/langs/nheko_et.ts
resources/langs/nheko_fi.ts 58 additions, 58 deletions

resources/langs/nheko_fi.ts
resources/langs/nheko_fr.ts 100 additions, 100 deletions

resources/langs/nheko_fr.ts
resources/langs/nheko_ru.ts 4 additions, 4 deletions

resources/langs/nheko_ru.ts
resources/qml/TopBar.qml 2 additions, 0 deletions

resources/qml/TopBar.qml
src/Cache.cpp 48 additions, 8 deletions

src/Cache.cpp
src/Cache.h 8 additions, 20 deletions

src/Cache.h
src/CacheCryptoStructs.h 2 additions, 4 deletions

src/CacheCryptoStructs.h
src/Cache_p.h 7 additions, 3 deletions

src/Cache_p.h
src/CallManager.cpp 3 additions, 2 deletions

src/CallManager.cpp
src/CallManager.h 1 addition, 1 deletion

src/CallManager.h
src/ChatPage.cpp 73 additions, 113 deletions

src/ChatPage.cpp
src/ChatPage.h 22 additions, 17 deletions

src/ChatPage.h
src/CommunitiesList.cpp 1 addition, 0 deletions

src/CommunitiesList.cpp
src/DeviceVerificationFlow.cpp 4 additions, 2 deletions

src/DeviceVerificationFlow.cpp
src/DeviceVerificationFlow.h 1 addition, 0 deletions

src/DeviceVerificationFlow.h
src/EventAccessors.cpp 2 additions, 0 deletions

src/EventAccessors.cpp

with 399 additions and 390 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