Commit Graph

187 Commits

Author SHA1 Message Date
Nicolas Werner a6f0d2ea7d
Update license headers 2021-03-05 01:04:07 +01:00
trilene 55fb00c67b Merge remote-tracking branch 'upstream/master' into screenshare-x11 2021-02-25 12:10:12 -05:00
trilene 70c77cdc44 Display screen sharing content locally 2021-02-21 16:30:10 -05:00
trilene 8df10eeeca Support desktop screen sharing on X11 2021-02-18 15:55:29 -05:00
Akhil Nair 8400540428
Merge branch 'master' into room_settings_qml 2021-02-14 00:04:27 -05:00
Jedi18 f044e2d2a1 fix avatar update on timeline sync 2021-02-11 23:50:45 +05:30
Jedi18 7401bd13b2 added notifications and encryption for the new roomsettings 2021-02-11 19:54:09 +05:30
Jedi18 b70f37194f ui almost looks the same, midway between transition from old room settings to new room settings 2021-02-10 21:22:42 +05:30
Nicolas Werner a62276c289 Fix UI allowing edits of foreign messages in some cases 2021-02-10 14:32:16 +01:00
Nicolas Werner 6e2ae1d812 Add edit shortcuts and fix some focus stuff 2021-02-09 20:22:53 +01:00
Jedi18 37679ac57e added room settings qml 2021-02-09 23:11:39 +05:30
Nicolas Werner 3433cc3be7 Cleanup privacy screen, no more grabImage 2021-02-03 03:14:43 +01:00
Loren Burkholder 5109dc5e0f Fix QML layout warnings 2021-02-02 19:30:03 -05:00
Nicolas Werner aeec1e12fc Merge branch 'master' into 'privacy_screen'
# Conflicts:
#   resources/qml/TimelineView.qml
2021-02-02 13:00:53 -05:00
Loren Burkholder 1c3e113d4e Allow drag/drop of files on whole timeline 2021-02-01 20:44:47 -05:00
Joseph Donofry 53c653a228
Merge remote-tracking branch 'nheko-im/master' into privacy_screen 2021-02-01 18:42:38 -05:00
Joseph Donofry d59910a8f2
Remove redundant import and fix visible warning 2021-02-01 18:42:18 -05:00
Nicolas Werner d1280af2e4 Autoclose completer when space is pressed and no suggestion available 2021-01-27 19:19:21 +01:00
Joseph Donofry cb93ac3402
Fix formatting 2021-01-26 00:03:09 -05:00
Joseph Donofry 0794f0a3fd
Initial commit for privacy screen
Missing window focus event and knowing when room is encryption
2021-01-25 23:46:55 -05:00
Nicolas Werner 2165eb8cb8 Focus input area on room switch and reply change again
fixes #412
fixes #413
2021-01-25 16:17:14 +01:00
Michele Guerini Rocco c569ab24bc
Add "open in external program" action 2021-01-24 01:50:23 +01:00
Nicolas Werner 07e71e6eae Fix crash with ScrollView 2021-01-17 04:05:02 +01:00
trilene a85823b68a Add call invite screen for mobile 2021-01-12 14:22:52 -05:00
Nicolas Werner 6090d00251 Revert "Update QtQuick versions to match Qt 5.10"
This reverts commit 74e32dd96b.
2021-01-12 15:03:39 +01:00
Joseph Donofry 74e32dd96b
Update QtQuick versions to match Qt 5.10 2021-01-11 22:17:00 -05:00
Joseph Donofry 3ff8b3ad8c
Merge master and fix conflicts 2021-01-11 17:51:39 -05: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
kirillpt 22997439ba change 'redacted' for 'removed' 2020-11-26 11:50:37 +03:00
Nicolas Werner 08e9461611 Fix input focus when pressing reply button 2020-11-25 19:05:12 +01:00
Nicolas Werner 29625ae253 Fix some issues with completer 2020-11-25 19:05:12 +01:00
Nicolas Werner 82c441dddd Move emoji picker to qml 2020-11-25 19:05:12 +01:00
Nicolas Werner a31d3d0816 Add file uploading 2020-11-25 19:05:12 +01:00
Nicolas Werner 7a74b86340 Pasteable textinput 2020-11-25 19:05:11 +01:00
kamathmanu eb72fd2cf9 Make compatible with qt 5.12 2020-11-14 16:38:17 -05:00
trilene d9ca5309ac Merge remote-tracking branch 'upstream/master' into webrtc-video 2020-10-27 15:29:53 -04:00
trilene d1f3a3ef40 Support video calls 2020-10-27 13:14:06 -04:00
Nicolas Werner 7f2d18c36d Fix small scope issue 2020-10-26 21:45:00 +01:00
Nicolas Werner 0e7baa21ab Disable new MessageInput, until you can paste images 2020-10-26 21:34:34 +01:00
Nicolas Werner 3d64df41da Split up TimelineView into separate components 2020-10-26 21:34:34 +01:00
Nicolas Werner 3a0e55e97b Qml message input mockup 2020-10-26 21:34:34 +01:00
Nicolas Werner b3a7f0b888 Hide room name, if not loaded yet 2020-10-18 22:30:42 +02:00
Nicolas Werner 1a029112d9 Lint qml with qml-format 2020-10-08 21:11:21 +02:00
Nicolas Werner 99ba1f17d3 Merge remote-tracking branch 'origin/master' into cross-signing 2020-10-08 16:57:03 +02:00
Nicolas Werner bca29a4227 Make steps in verification flow explicit 2020-10-05 22:12:10 +02:00
Nicolas Werner d4dccc8e36 Fix room name 2020-10-02 16:58:13 +02:00
trilene 3f73853e4b Move ActiveCallBar Qml to separate file 2020-09-25 10:26:36 -04:00
Nicolas Werner 4802c34009 Merge remote-tracking branch 'origin/master' into cross-signing 2020-09-24 21:36:43 +02:00
trilene da27670cbe Port ActiveCallBar to Qml 2020-09-22 12:07:36 -04:00