Commit graph

240 commits

Author SHA1 Message Date
trilene
55fb00c67b Merge remote-tracking branch 'upstream/master' into screenshare-x11 2021-02-25 12:10:12 -05:00
Jedi18
68c999e5f4 remove old quick switcher 2021-02-24 19:50:36 +05:30
Jedi18
ee232c5c60 fix timeline focus 2021-02-23 00:46:40 +05:30
Jedi18
b1dec6f6ac enter key now works, fix room highlighting and add overlay 2021-02-23 00:18:31 +05:30
trilene
70c77cdc44 Display screen sharing content locally 2021-02-21 16:30:10 -05:00
Jedi18
32d419d14f add quick switcher qml file and moved completerFor from inputbar to timeline view class 2021-02-21 23:10:21 +05:30
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
rnhmjoj
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
Nicolas Werner
4179be427f Fix binding loop when trying to reply 2020-09-20 08:59:35 +02:00
Jussi Kuokkanen
13658d536e make typing Rectangle extents cleaner 2020-09-18 16:18:31 +03:00
Lurkki14
8741e5f36a
Set typing Rectangle color directly instead of Connection
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
2020-09-18 14:55:48 +03:00
Jussi Kuokkanen
1f71f7227a make Rectangle to fill the gap between input widget and typing users 2020-09-17 17:52:40 +03:00
Jussi Kuokkanen
c463568031 simplify check for no typing users 2020-09-17 17:50:39 +03:00
Jussi Kuokkanen
7d72356318 Merge branch 'master' of https://github.com/Nheko-Reborn/nheko 2020-09-17 16:51:50 +03:00
Jussi Kuokkanen
e49691fe3b use Rectangle for typing users so it doesn't overlap with the timeline 2020-09-17 16:49:56 +03:00
Nicolas Werner
b05c101021 Fix null errors in qml 2020-09-16 23:49:17 +02:00
Nicolas Werner
77e241b9e5 Reenable top bar room settings menus on avatar or title clicks
Also fixes a bug with an empty room settings window introduced in the
port.
2020-09-16 23:49:17 +02:00
Nicolas Werner
640b0ee405 Port top bar to Qml
Also fixes some resize issues with stupid workarounds to our resize
logic. This really needs to be cleaned up at some point!
2020-09-16 23:49:17 +02:00
Chethan2k1
e70b4e4268 Fix wrong tran_id issue 2020-09-10 11:09:21 +05:30
CH Chethan Reddy
b174bd9380 Merge remote-tracking branch 'upstream/master' into device-verification 2020-08-30 22:27:14 +05:30
Nicolas Werner
de7ec4d2b3 Merge remote-tracking branch 'origin/master' into new-event-store
Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp
2020-08-17 20:40:33 +02:00
CH Chethan Reddy
2e20049b36 [WIP] Room-Verification Messages 2020-08-09 08:35:15 +05:30
CH Chethan Reddy
3635c185e9 Add Room Verification Messages 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
1103cc15cf Adding icons to UserProfile 2020-07-30 22:10:27 +05:30
Nicolas Werner
08028d5c57 Refactor UserProfile 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
6fae36abc4 [WIP] Add Caching for users 2020-07-30 22:10:27 +05:30
Nicolas Werner
4862be06be Fix presence indicator 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
1633650303 Some more changes
- remove unnecessary field sender in userprofile.qml
    - cover user facing string with qsTr to get picked by translations
    - add spacing and fix theming issue
    - increase and add color to username
    - change back to QVector from QLinkedList cause I have mistaken
    better time complexity to give better benchmark

red
2020-07-30 22:10:27 +05:30
CH Chethan Reddy
d49ab15656 Some Improvements
- DeviceVerificationList change to LinkedList to improve time
    complexity while deleting
    - Downgrade the flow to not use key.verification.done and
    key.verification.ready
2020-07-30 22:10:27 +05:30
CH Chethan Reddy
67367d0004 Shared secret with decimal and emoji works! 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
41b6ef0c32 Add DeviceVerificationList to keep track of all flows and Popup on
recieving start or request
2020-07-30 22:10:27 +05:30
CH Chethan Reddy
f9c0f4dd54 Add C++ Model for DeviceList 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
64f204d984 Rewrite UserProfile in qml 2020-07-30 22:10:27 +05:30
Nicolas Werner
2088053d26 Add DeviceVerificationFlow dummy and verification test button 2020-07-30 22:10:27 +05:30
Nicolas Werner
8bf26917ad Make long press menu actually work 2020-07-26 02:06:38 +02:00
Nicolas Werner
6f557c19a1 Optimize scrolling a little bit 2020-07-25 23:10:02 +02:00
Nicolas Werner
fdcf91f5eb Fix binding loop and non integer text height 2020-07-25 22:08:02 +02:00
Nicolas Werner
19f27236ea Fix reactions 2020-07-20 00:42:48 +02:00
Lorem
e86c1cc79f Make dateBubble's text vertically aligned to vertical center 2020-07-19 12:22:47 +05:30
Nicolas Werner
530c531c4b WIP: Event Store split out 2020-07-09 23:15:22 +02:00
Nicolas Werner
fe12e63c7c Fix parent undefined warning 2020-07-08 02:02:48 +02:00
Nicolas Werner
cded494cb5 Try to make text rendering in qml sharper 2020-06-19 19:34:03 +02:00
Joseph Donofry
7afb164244
Merge remote-tracking branch 'origin/master' into presence 2020-06-11 22:27:30 -04:00
Joseph Donofry
5e355c36fd
Fix build issue on some versions of clang 2020-06-10 22:34:14 -04:00
Joseph Donofry
0078c72a37
Remove signals in favor of direct function calls 2020-06-09 21:28:15 -04:00
Joseph Donofry
07ffd9e7e9
Fix UserSettings in QML 2020-06-09 21:05:27 -04:00
Joseph Donofry
6bb73f84a3
Merge master and fix conflicts 2020-06-09 20:51:36 -04:00
Nicolas Werner
96f4169be9 Show presence and set custom status messages 2020-06-08 01:59:05 +02:00
Nicolas Werner
f452bdf2b0 Make settings update immediately in qml and allow limiting timeline width
Limiting improves readability on wide monitors.

The immediate update of the settings is done by just exposing settings
as properties and then setting the settings as a context property.
2020-05-26 22:54:51 +02:00
Joseph Donofry
5228861b88
Add reaction/redaction for in-line Reactions 2020-05-21 21:21:35 -04:00
lkito
d8b89e2ef0 Added an optional feature to show bigger emoji-only messages with 3 or less emoji 2020-05-21 16:31:27 +04:00
Joseph Donofry
f4ea0b215d
Attach emoji picker picked to reaction sender 2020-05-16 15:52:51 -04:00
Joseph Donofry
a5778bdf40
Merge remote-tracking branch 'origin/master' into reactions 2020-05-16 15:10:49 -04:00
lkito
2c21f6e3fa Implemented optional message body highlighting feature. 2020-05-16 17:15:43 +04:00
Joseph Donofry
6d2789f4d5
Merge master into reactions 2020-05-14 20:53:01 -04:00