Commit graph

3519 commits

Author SHA1 Message Date
Joseph Donofry
a8877c39f4
Merge branch 'master' of ssh://github.com/Nheko-Reborn/nheko 2021-01-11 20:22:57 -05:00
Joseph Donofry
9be466754e
Add ripple to completer 2021-01-11 20:22:40 -05:00
Joseph Donofry
9a604d3821
Clean up Avatar click event handling 2021-01-11 20:02:39 -05:00
DeepBlueV7.X
b6f2acfed5
Merge pull request #373 from Nheko-Reborn/misc-fixes
Misc fixes
2021-01-12 00:07:20 +01:00
Nicolas Werner
2a19783f99 Fix timeline becoming corrupted on backfill
Fixes #273
2021-01-12 00:02:18 +01:00
Joseph Donofry
22f7841848
Forgot to save res.qrc 2021-01-11 17:54:04 -05:00
Joseph Donofry
3ff8b3ad8c
Merge master and fix conflicts 2021-01-11 17:51:39 -05:00
Joseph Donofry
1bc2db4bdf
Add Ripple effects to qml buttons and avatar 2021-01-11 17:50:26 -05:00
Nicolas Werner
947e40bd70 Allow joins via other servers from a matrix: uri 2021-01-11 19:15:43 +01:00
DeepBlueV7.X
b8b642219d
Merge pull request #372 from deepbluev7/fix-pr-CI
Fix branch name in PRs
2021-01-11 00:57:32 +01:00
Nicolas Werner
c1d5df44d9 Fix branch name in PRs 2021-01-11 00:02:19 +01:00
DeepBlueV7.X
d8fb5daac1
Merge pull request #370 from Nheko-Reborn/matrix-scheme
Handle matrix scheme
2021-01-10 23:29:30 +01:00
Nicolas Werner
39f9b7d90a Handle matrix scheme
Link opening only works on Linux for now.

See https://github.com/matrix-org/matrix-doc/pull/2312
2021-01-10 22:41:56 +01:00
DeepBlueV7.X
fcedfac597
Merge pull request #369 from trilene/master
Fix call invite declined on another device
2021-01-10 18:46:57 +01:00
trilene
3572c111f3 Fix call invite declined on another device 2021-01-10 12:23:58 -05:00
Nicolas Werner
cc9de7f3b0 Fix some nulls in relations 2021-01-08 12:48:39 +01:00
Nicolas Werner
e9519689f1 Bump gstreamer requirement 2021-01-07 16:13:33 +01:00
DeepBlueV7.X
49abcb24b5
Merge pull request #356 from trilene/call-dialogs-qml
Port call dialogs to Qml
2021-01-07 15:56:46 +01:00
trilene
cf8a47503f Fix device discovery under GStreamer 1.16 2021-01-07 09:48:25 -05:00
trilene
2bd8a386e2 Color and icon button spacing fixes 2021-01-07 14:04:54 +01:00
trilene
9bbade37de Fix call answered on another device 2021-01-07 14:04:54 +01:00
trilene
2984d71971 Fix Qml control colors 2021-01-07 14:04:54 +01:00
trilene
4123e6aff1 Fix previous commit 2021-01-07 14:04:54 +01:00
trilene
1c4a86e502 Set Label text color explicitly 2021-01-07 14:04:54 +01:00
trilene
13a280df13 Finesse PlaceCall dialog 2021-01-07 14:04:54 +01:00
trilene
6427687d20 Add missing translation marks 2021-01-07 14:04:54 +01:00
trilene
87d2074c81 Add devices dialog to CallInviteBar 2021-01-07 14:04:54 +01:00
trilene
055c6f7248 Add device combos to PlaceCall dialog 2021-01-07 14:04:54 +01:00
trilene
d315d02ee6 Use Layout margins 2021-01-07 14:04:54 +01:00
trilene
07ac7b7e85 Port PlaceCall dialog to Qml 2021-01-07 14:04:50 +01:00
trilene
459c59901e Fix one-way video calls 2021-01-07 14:04:21 +01:00
trilene
7124024977 Make call invites less intrusive 2021-01-07 14:04:21 +01:00
trilene
ac410f46f2 Move call-related properties to CallManager 2021-01-07 14:04:21 +01:00
Nicolas Werner
4e6df2edcb Fix notification reply build on other platforms 2021-01-07 11:21:10 +01:00
Nicolas Werner
4b4c321397 Allow inline replies from notifications on linux 2021-01-07 10:44:59 +01:00
Nicolas Werner
236bf09a0e Explicitly mention, if call support is enabled at build time
fixes #366
2021-01-06 16:47:35 +01:00
Nicolas Werner
1db68109fc Merge branch 'macos-ci-fix' into 'master'
Macos ci fix

See merge request nheko-reborn/nheko!3
2021-01-06 08:02:00 -05:00
Nicolas Werner
4ead72fdc1 Remove sodium from flatpak 2021-01-06 12:47:13 +01:00
Nicolas Werner
f3b6e994d0 Remove useless capture 2021-01-06 11:24:35 +01:00
Nicolas Werner
0c0c69074d Fix shadowing in LoginPage.cpp 2021-01-06 11:01:41 +01:00
Nicolas Werner
03d817d277 Force override macos deps in CI 2021-01-06 10:39:07 +01:00
DeepBlueV7.X
133302d334
Merge pull request #365 from Nheko-Reborn/typing
Typing flickering fixes
2021-01-05 22:45:40 +01:00
Nicolas Werner
3a41bb9fff Fix typing notifications flickering sometimes 2021-01-05 22:38:21 +01:00
Nicolas Werner
5ca043ad87 Fix user status that got lost at some point 2021-01-04 15:14:40 +01:00
Nicolas Werner
a13502b881 lint 2021-01-01 04:14:34 +01:00
DeepBlueV7.X
aab7447d02
Merge pull request #364 from d42/d42/find-sso-flow
Try to find SSO flow in all of the server flows
2021-01-01 04:13:49 +01:00
d42
b732ea432b rename login_method -> loginMethod to fit the Nheko coding style 2020-12-31 17:57:09 +01:00
d42
4bc25ffb15 find sso flow in all of the flows 2020-12-31 17:30:13 +01:00
DeepBlueV7.X
afdd35db22
Merge pull request #363 from trilene/master
Add Fedora build requirements to README
2020-12-31 04:11:38 +01:00
trilene
6533269611 Add Fedora build requirements to README 2020-12-30 16:02:11 -05:00