Commit Graph

5912 Commits

Author SHA1 Message Date
SBiOSoftWhare b4e994429b Update changes 2019-06-13 16:42:21 +02:00
SBiOSoftWhare 68dc4ca757 RoomViewController: Add message editing support. 2019-06-13 16:38:20 +02:00
SBiOSoftWhare 6a8dc8782f RoomInputToolbarView: Add editing mode. 2019-06-13 16:37:28 +02:00
SBiOSoftWhare 33d01da5c8 Merge pull request #2487 from vector-im/riot_2400
Message Editing: Annotate edited messages in timeline
2019-06-12 16:23:12 +02:00
SBiOSoftWhare e9a0291626 Update changes 2019-06-12 16:07:16 +02:00
SBiOSoftWhare 03b7570fc1 RoomViewController: Prepare message edited mention tap. 2019-06-12 16:06:27 +02:00
SBiOSoftWhare 1bfe006d76 EventFormatter: Add edit mention suffix for edited messages. 2019-06-12 16:05:34 +02:00
SBiOSoftWhare 525ce978d8 Add message edited mention string. 2019-06-12 15:35:30 +02:00
SBiOSoftWhare 65e290b947 Merge pull request #2482 from vector-im/ReactionsMenuViewModel_update
ReactionsMenuViewModel: Do not perform directly reaction requests
2019-06-11 17:51:28 +02:00
SBiOSoftWhare cd5190bf81 RoomViewController: Display an error when react or unreact on event fails. 2019-06-11 17:43:32 +02:00
SBiOSoftWhare 989581526b Merge pull request #2483 from vector-im/riot_2476
BF Reactions: It lets you react to join/leave events
2019-06-11 16:57:22 +02:00
SBiOSoftWhare 25d3db3b3b Update changes 2019-06-06 13:51:55 +02:00
SBiOSoftWhare 44784f79f8 [Reactions] Allow reaction only on room messages (Fix #2476). 2019-06-06 13:50:45 +02:00
SBiOSoftWhare 3f05c91257 RoomViewController: Conforms to ReactionsMenuViewModelCoordinatorDelegate. 2019-06-06 11:30:57 +02:00
SBiOSoftWhare fa2bfd184b [ReactionsMenuViewModel] Do not perform directly reaction requests and use delegation. 2019-06-06 11:29:28 +02:00
SBiOSoftWhare 2ff244b4b9 Merge pull request #2477 from vector-im/riot_2462
BF: Reactions: Bad position
2019-05-29 15:23:02 +02:00
SBiOSoftWhare 3b674c8b70 Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
Co-Authored-By: giomfo <giom@matrix.org>
2019-05-29 15:22:42 +02:00
SBiOSoftWhare 22db2a7da0 Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
Co-Authored-By: giomfo <giom@matrix.org>
2019-05-29 15:17:20 +02:00
SBiOSoftWhare 5963e3a683 Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
Co-Authored-By: giomfo <giom@matrix.org>
2019-05-29 15:16:38 +02:00
SBiOSoftWhare 3a8aa4bd4c Update changes 2019-05-29 13:01:25 +02:00
SBiOSoftWhare a51d2b13b8 MXKRoomBubbleTableViewCell: Display timestamp on left when select memberships. 2019-05-29 12:59:46 +02:00
SBiOSoftWhare dd1c299a95 RoomViewController: Use new component frame method calculation. 2019-05-29 12:26:48 +02:00
SBiOSoftWhare 7812aab835 RoomDataSource: Fix reactions and read receipts positions. 2019-05-29 12:25:57 +02:00
SBiOSoftWhare 90c83fdfe5 RoomBubbleCellData: Fix reactions height calculation. Fix timestamp position. 2019-05-29 12:24:43 +02:00
SBiOSoftWhare b71318127a MXKRoomBubbleTableViewCell: Add convenient method to get frame of a MXKRoomBubbleComponent in cell contentView. Update timestamp label frame calculation. 2019-05-29 12:18:56 +02:00
SBiOSoftWhare 8f193833bf Create RoomBubbleCellLayout class to handle MXKRoomBubbleTableViewCell layout constants. 2019-05-29 12:15:31 +02:00
SBiOSoftWhare 43451e8f1e Merge pull request #2469 from vector-im/fix_time_formatter
EventFormatter: Fix 24 hour time format
2019-05-24 10:41:20 +02:00
SBiOSoftWhare 0b118980ae EventFormatter: Fix 24 hour time format. 2019-05-23 18:26:38 +02:00
manuroe e1673ff5b3 Merge pull request #2438 from dcordero/verification_id_labels_fix
Verification id labels fix
2019-05-23 17:57:49 +02:00
SBiOSoftWhare 42d005c892 Merge pull request #2468 from vector-im/riot_2466
Context menu polish
2019-05-23 17:57:17 +02:00
SBiOSoftWhare 066a8733d1 Update changes 2019-05-23 17:50:59 +02:00
SBiOSoftWhare ddd882249c Room contextual menu: Update button titles color and disabled opacity. 2019-05-23 17:48:52 +02:00
SBiOSoftWhare 721cb630c6 Merge pull request #2467 from vector-im/riot_2417
BF: Registration with an email is broken
2019-05-23 17:44:10 +02:00
SBiOSoftWhare 64df1edc67 Update changes 2019-05-23 16:49:13 +02:00
SBiOSoftWhare 7eb40933bd Registration: Fix infinite loop when register with email and validate from mobile. 2019-05-23 16:46:00 +02:00
SBiOSoftWhare c30de76aed Merge pull request #2465 from vector-im/riot_2447
Reactions Menu: Fix position
2019-05-22 23:09:39 +02:00
David Cordero 1a7afc9b02 Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare b284b0cf23 Update changes 2019-05-22 18:49:35 +02:00
SBiOSoftWhare d3be9bad43 Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +02:00
SBiOSoftWhare 770c1b3434 MXKRoomBubbleTableViewCell: Add convenient method to calculate a bubble component frame in table view. 2019-05-22 18:46:22 +02:00
SBiOSoftWhare 1f90be1243 Merge pull request #2464 from vector-im/riot_2446
BF: Menu actions: Display message time
2019-05-22 17:41:18 +02:00
SBiOSoftWhare 77c208f967 Merge pull request #2463 from vector-im/riot_2446
Menu actions: Display message time
2019-05-22 17:31:30 +02:00
SBiOSoftWhare e619247ea5 Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2019-05-22 17:28:08 +02:00
SBiOSoftWhare 9849682124 Update Riot/Modules/Room/CellData/RoomBubbleCellData.h
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2019-05-22 17:27:29 +02:00
SBiOSoftWhare 68c9b5b018 RoomVC: Display message time when contextual menu is shown. 2019-05-22 16:54:51 +02:00
manuroe 3f1a4b2a76 Merge pull request #2425 from vector-im/giomfo/third_party_licenses
Update third-party licences
2019-05-22 16:47:53 +02:00
manuroe 34b48ddc8f Merge pull request #2432 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-05-22 16:46:16 +02:00
manuroe 048b8a61bd Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-05-22 16:45:40 +02:00
manuroe 000da11fe4 Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-05-22 16:45:11 +02:00
SBiOSoftWhare 3da8d42062 Update changes 2019-05-22 16:43:28 +02:00