summary refs log tree commit diff
path: root/src/timeline/TimelineViewManager.h (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix crash on exitNicolas Werner2020-10-171-4/+1
* Merge remote-tracking branch 'origin/master' into cross-signingNicolas Werner2020-10-081-1/+14
|\
| * Move ActiveCallBar Qml to separate filetrilene2020-09-251-5/+10
| * clang-formattrilene2020-09-221-3/+5
| * Port ActiveCallBar to Qmltrilene2020-09-221-0/+6
* | Show different verification errorsNicolas Werner2020-10-051-0/+1
* | Make steps in verification flow explicitNicolas Werner2020-10-051-20/+5
* | Merge remote-tracking branch 'origin/master' into cross-signingNicolas Werner2020-09-241-1/+32
|\|
| * Fix null errors in qmlNicolas Werner2020-09-161-0/+1
| * Port top bar to QmlNicolas Werner2020-09-161-1/+31
* | Merge remote-tracking branch 'upstream/master' into device-verificationCH Chethan Reddy2020-08-301-2/+19
|\|
| * Merge remote-tracking branch 'origin/master' into new-event-storeNicolas Werner2020-08-171-2/+13
| |\
| | * Merge remote-tracking branch 'upstream/master' into voiptrilene2020-07-101-0/+2
| | |\
| | | * Open url using QDesktopServices from QmlNicolas Werner2020-07-091-0/+2
| | * | Support voice callstrilene2020-07-101-2/+11
| | |/
| * | Add /clear-timeline commandNicolas Werner2020-08-091-0/+6
* | | Add Room Verification MessagesCH Chethan Reddy2020-07-301-1/+2
* | | Adding Room Key Verification StuffCH Chethan Reddy2020-07-301-1/+8
* | | Adding icons to UserProfileCH Chethan Reddy2020-07-301-0/+2
* | | Fix presence indicatorNicolas Werner2020-07-301-2/+2
* | | Some more changesCH Chethan Reddy2020-07-301-2/+1
* | | Some ImprovementsCH Chethan Reddy2020-07-301-1/+2
* | | Shared secret with decimal and emoji works!CH Chethan Reddy2020-07-301-1/+4
* | | Add DeviceVerificationList to keep track of all flows and Popup onCH Chethan Reddy2020-07-301-3/+17
* | | Add DeviceVerificationFlow dummy and verification test buttonNicolas Werner2020-07-301-0/+3
|/ /
* / Fix reactionsNicolas Werner2020-07-201-7/+1
|/
* Merge remote-tracking branch 'origin/master' into presenceJoseph Donofry2020-06-111-2/+12
|\
| * Add reaction/redaction for in-line ReactionsJoseph Donofry2020-05-211-0/+4
| * Add new QML-based emoji picker (work in progress)Joseph Donofry2020-05-131-1/+5
| * merge master into reactionsJoseph Donofry2020-05-071-1/+3
* | Show presence and set custom status messagesNicolas Werner2020-06-081-0/+3
|/
* Add signal/slot for decryption changes in last patchJoseph Donofry2020-04-221-0/+1
* Fix reply not closingNicolas Werner2020-04-131-25/+5
* Experimental blurhash implementation (MXC2448)Nicolas Werner2020-03-031-0/+3
* Reset user colors on theme change (in qml timeline)Nicolas Werner2020-02-201-0/+2
* Make closing the reply popup actually clear the reply messageJoseph Donofry2020-02-041-0/+6
* modernize: use nullptrNicolas Werner2020-02-041-1/+1
* Merge branch 'plain-text-messages' into 0.7.0-devNicolas Werner2020-01-291-1/+4
|\
| * Allow sending messages as plain textNicolas Werner2020-01-271-1/+4
* | Add initial QML Reply PopupJoseph Donofry2020-01-271-0/+12
|/
* Allow replying with an imageNicolas Werner2020-01-121-6/+9
* Update to c++17Nicolas Werner2019-12-141-4/+4
* Implement sending encrypted filesNicolas Werner2019-12-051-0/+5
* Add encrypted file downloadNicolas Werner2019-12-031-26/+1
* Add loading spinner and restore message send queueNicolas Werner2019-11-231-7/+7
* Remove old timelineNicolas Werner2019-11-231-46/+65
* Further Improve Reply FunctionalityJoseph Donofry2019-06-131-1/+3
* Fix linting issueJoseph Donofry2019-06-111-2/+1
* Add initial support for rich replies to nhekoJoseph Donofry2019-06-091-0/+2
* Mark own read messages with a double checkmark (#377)Konstantinos Sideris2018-07-171-0/+1
* Move all files under src/Konstantinos Sideris2018-07-171-0/+94