Commit graph

5929 commits

Author SHA1 Message Date
SBiOSoftWhare
d866db76a5
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
61f777faba Update changes 2019-06-12 16:07:16 +02:00
SBiOSoftWhare
d751af48ff RoomViewController: Prepare message edited mention tap. 2019-06-12 16:06:27 +02:00
SBiOSoftWhare
b6d7a14e75 EventFormatter: Add edit mention suffix for edited messages. 2019-06-12 16:05:34 +02:00
SBiOSoftWhare
3625bc439a Add message edited mention string. 2019-06-12 15:35:30 +02:00
SBiOSoftWhare
3a2162f46c
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
310c5cc581 RoomViewController: Display an error when react or unreact on event fails. 2019-06-11 17:43:32 +02:00
SBiOSoftWhare
8e34b86394
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
c1b1e5c730 Update changes 2019-06-06 13:51:55 +02:00
SBiOSoftWhare
daab6950d4 [Reactions] Allow reaction only on room messages (Fix #2476). 2019-06-06 13:50:45 +02:00
SBiOSoftWhare
6f7400840d RoomViewController: Conforms to ReactionsMenuViewModelCoordinatorDelegate. 2019-06-06 11:30:57 +02:00
SBiOSoftWhare
940680ed75 [ReactionsMenuViewModel] Do not perform directly reaction requests and use delegation. 2019-06-06 11:29:28 +02:00
SBiOSoftWhare
5e964ff531
Merge pull request #2477 from vector-im/riot_2462
BF: Reactions: Bad position
2019-05-29 15:23:02 +02:00
SBiOSoftWhare
4e9cb9d52f
Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
Co-Authored-By: giomfo <giom@matrix.org>
2019-05-29 15:22:42 +02:00
SBiOSoftWhare
dc61c7dee1
Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
Co-Authored-By: giomfo <giom@matrix.org>
2019-05-29 15:17:20 +02:00
SBiOSoftWhare
bd78e32cc7
Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.h
Co-Authored-By: giomfo <giom@matrix.org>
2019-05-29 15:16:38 +02:00
SBiOSoftWhare
c81c3fb9e8 Update changes 2019-05-29 13:01:25 +02:00
SBiOSoftWhare
599bab3967 MXKRoomBubbleTableViewCell: Display timestamp on left when select memberships. 2019-05-29 12:59:46 +02:00
SBiOSoftWhare
6e90168a1c RoomViewController: Use new component frame method calculation. 2019-05-29 12:26:48 +02:00
SBiOSoftWhare
ee15eccb40 RoomDataSource: Fix reactions and read receipts positions. 2019-05-29 12:25:57 +02:00
SBiOSoftWhare
99b746681b RoomBubbleCellData: Fix reactions height calculation. Fix timestamp position. 2019-05-29 12:24:43 +02:00
SBiOSoftWhare
550f3aac9e 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
b0fbcde9dd Create RoomBubbleCellLayout class to handle MXKRoomBubbleTableViewCell layout constants. 2019-05-29 12:15:31 +02:00
SBiOSoftWhare
db5ff9ddc7
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
c2be2b5af9 EventFormatter: Fix 24 hour time format. 2019-05-23 18:26:38 +02:00
manuroe
90784d13a0
Merge pull request #2438 from dcordero/verification_id_labels_fix
Verification id labels fix
2019-05-23 17:57:49 +02:00
SBiOSoftWhare
7e11f923c0
Merge pull request #2468 from vector-im/riot_2466
Context menu polish
2019-05-23 17:57:17 +02:00
SBiOSoftWhare
2252561088 Update changes 2019-05-23 17:50:59 +02:00
SBiOSoftWhare
31feca6f17 Room contextual menu: Update button titles color and disabled opacity. 2019-05-23 17:48:52 +02:00
SBiOSoftWhare
5eb5a8eb70
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
cc188209a7 Update changes 2019-05-23 16:49:13 +02:00
SBiOSoftWhare
f14cbf759e Registration: Fix infinite loop when register with email and validate from mobile. 2019-05-23 16:46:00 +02:00
SBiOSoftWhare
28ec193011
Merge pull request #2465 from vector-im/riot_2447
Reactions Menu: Fix position
2019-05-22 23:09:39 +02:00
David Cordero
627291529b Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare
4edf817a5d Update changes 2019-05-22 18:49:35 +02:00
SBiOSoftWhare
366d27ebab Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +02:00
SBiOSoftWhare
4cb166072a MXKRoomBubbleTableViewCell: Add convenient method to calculate a bubble component frame in table view. 2019-05-22 18:46:22 +02:00
SBiOSoftWhare
09991e53c7
Merge pull request #2464 from vector-im/riot_2446
BF: Menu actions: Display message time
2019-05-22 17:41:18 +02:00
SBiOSoftWhare
f1bb0ba8a0
Merge pull request #2463 from vector-im/riot_2446
Menu actions: Display message time
2019-05-22 17:31:30 +02:00
SBiOSoftWhare
4e1e95fd2c
Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2019-05-22 17:28:08 +02:00
SBiOSoftWhare
a62548c545
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
0fb13febee RoomVC: Display message time when contextual menu is shown. 2019-05-22 16:54:51 +02:00
manuroe
48beed140a
Merge pull request #2425 from vector-im/giomfo/third_party_licenses
Update third-party licences
2019-05-22 16:47:53 +02:00
manuroe
50cc260010
Merge pull request #2432 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-05-22 16:46:16 +02:00
manuroe
3d671feb07
Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-05-22 16:45:40 +02:00
manuroe
e594155fe5
Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-05-22 16:45:11 +02:00
SBiOSoftWhare
60a9644a7e Update changes 2019-05-22 16:43:28 +02:00
SBiOSoftWhare
f271a08be2 EventFormatter: Use a 24 hour date format for time. 2019-05-22 16:39:11 +02:00
SBiOSoftWhare
6ce4a826be RoomVC: Show contextual menu on single tap. 2019-05-22 16:37:06 +02:00
SBiOSoftWhare
4bde8a435b Room contextual menu: Dismiss when swipe up or down. 2019-05-22 16:35:46 +02:00