Commit Graph

6085 Commits

Author SHA1 Message Date
manuroe dba3a0bbd7 Merge pull request #2531 from vector-im/riot_2449
Edits: Support edits in e2e rooms
2019-06-26 12:14:25 +02:00
manuroe f499412599 Edits: Support edits in e2e rooms 2019-06-25 18:32:34 +02:00
SBiOSoftWhare a276e13d1b Merge pull request #2529 from vector-im/riot_2515
BF: Reactions: Frames bottoms are clipped
2019-06-25 16:29:34 +02:00
SBiOSoftWhare 456aa56474 Bubble cell reactions: Fix BubbleReactionViewCell clipped at bottom in selected state (Fix #2515). 2019-06-25 16:21:48 +02:00
SBiOSoftWhare 01c1fded67 Merge pull request #2528 from vector-im/riot_2459
Reactions: Update quick reactions
2019-06-25 16:08:55 +02:00
SBiOSoftWhare 917d590728 Update changes 2019-06-25 14:04:54 +02:00
SBiOSoftWhare e157eefcb8 Update pbxproj 2019-06-25 14:00:20 +02:00
SBiOSoftWhare 2c24c3ba27 RoomViewController: Handle updated RoomContextualMenuViewController. 2019-06-25 14:00:12 +02:00
SBiOSoftWhare 69ece32a5d RoomContextualMenuPresenter: Handle new reactions menu animations, reduce context menu show/hide animation duration. 2019-06-25 13:56:44 +02:00
SBiOSoftWhare df05577aeb RoomContextualMenuViewController: Handle updated ReactionsMenuView and new animations instructions. 2019-06-25 13:48:16 +02:00
SBiOSoftWhare 03cf6bef41 Update ReactionsMenuView layout. 2019-06-25 13:40:59 +02:00
SBiOSoftWhare 86e11131df Update ReactionsMenuViewModel to handle a list of reactions. 2019-06-25 13:23:07 +02:00
SBiOSoftWhare 8e2d1d6bc9 Update ReactionsMenuButton UI 2019-06-25 12:06:54 +02:00
manuroe 516be40462 Merge pull request #2527 from vector-im/riot_2526
Device Verification: Name for 🔒 is "Lock"
2019-06-24 16:16:33 +02:00
manuroe d7ad10ebb4 Device Verification: Name for 🔒 is "Lock"
#2526
2019-06-24 15:46:16 +02:00
manuroe db882f0f57 Merge pull request #2524 from vector-im/riot_2518
Make sure there are no ugly edge cases running Riot without an integrations manager
2019-06-24 15:01:00 +02:00
manuroe e910455e3a Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe 53afe41f9a Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
manuroe 089835f3f4 Integrations: Make code support use of an integration manager other than modular/scalar.
The default value is still modular/scalar.
2019-06-21 11:26:34 +02:00
SBiOSoftWhare 9389e20343 Merge pull request #2519 from vector-im/fix_e2e_padlock
e2e room message: Fix padlock position on last message with sender name
2019-06-21 10:02:35 +02:00
SBiOSoftWhare c69d19bb35 e2e room message: Fix padlock position on last message with sender name. 2019-06-20 12:07:04 +02:00
SBiOSoftWhare 88f7f8d792 Merge pull request #2517 from vector-im/cocoapods_1.7.2
Use CocoaPods 1.7.2
2019-06-20 10:05:30 +02:00
SBiOSoftWhare f7cea12582 Use CocoaPods 1.7.2 2019-06-19 16:48:16 +02:00
manuroe 354e3ce97c Merge pull request #2437 from dcordero/Bundler
Update build instructions to make use of Bundler
2019-06-19 16:47:24 +02:00
SBiOSoftWhare 93c400781c Merge pull request #2514 from vector-im/swift_5
Migrate to Swift 5.0
2019-06-19 16:28:25 +02:00
SBiOSoftWhare 9b7efaa2a5 Update SwiftLint pod. 2019-06-19 16:16:30 +02:00
SBiOSoftWhare 033894d7ed Use CocoaPods 1.7.1 and update Podfile.lock 2019-06-19 16:03:40 +02:00
SBiOSoftWhare cfa36ec219 Update changes 2019-06-19 15:48:40 +02:00
SBiOSoftWhare 1f45d64852 Update Reusable pod 2019-06-19 15:46:58 +02:00
SBiOSoftWhare c9f4682165 Migrate project to Swift 5 2019-06-19 15:46:58 +02:00
manuroe f920e9fac3 Merge pull request #2473 from dcordero/create_button_size
Adjust size of the insert button in the People tab
2019-06-19 15:44:00 +02:00
manuroe 5b8443c5cd Update CHANGES.rst 2019-06-19 15:43:42 +02:00
manuroe 4d906712f0 Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
manuroe f27b56373c Merge pull request #2159 from fridtjof/matomo-v6
Rename PiwikTracker to MatomoTracker and update to version 6.0.1
2019-06-19 15:31:53 +02:00
manuroe 3fb0d941c8 Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
SBiOSoftWhare 769793f09b Merge pull request #2513 from vector-im/fix_RoomDataSource_additional_content_height
RoomDataSource: Fix bubble cell data additional content height update
2019-06-19 14:29:44 +02:00
SBiOSoftWhare 2e80cc2a5e RoomDataSource: Fix bubble cell data additional content height update. 2019-06-19 14:22:38 +02:00
SBiOSoftWhare 98f5ad4b91 Merge pull request #2505 from vector-im/fix_riot_attachmentview_reactions
Fix reactions positioning for cells with attachment
2019-06-19 11:45:44 +02:00
SBiOSoftWhare bc88febd8d Merge develop into fix_riot_attachmentview_reactions 2019-06-19 11:44:42 +02:00
manuroe 51208baf46 Merge pull request #2506 from vector-im/aggregation_and_readreceipts
Read receipts: They are now counted at the MatrixKit level.
2019-06-19 11:25:00 +02:00
SBiOSoftWhare 9edbd4dd88 Fix bubble cell height for cells with attachment view and reactions. 2019-06-18 18:36:22 +02:00
SBiOSoftWhare ccdb278611 RoomBubbleCellData: Add additionalContentHeight property to cache additional views height like reactions view and read receipts container. 2019-06-18 18:30:39 +02:00
SBiOSoftWhare 3edf3c4578 MXKRoomBubbleTableViewCell: Add convenient method to compute bubble cell height for cell with attachment view. 2019-06-18 18:29:12 +02:00
SBiOSoftWhare c7cab57c15 RoomBubbleCellData: Fix bubble component position when display last message timestamp. 2019-06-18 17:42:00 +02:00
SBiOSoftWhare e886fa0e66 MXKRoomBubbleTableViewCell: Improve timestamp label positioning. 2019-06-18 17:41:09 +02:00
manuroe 271cfc3578 Read receipts: Manage live update in the kit too 2019-06-18 14:06:23 +02:00
manuroe b500e10586 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare ab5b773296 Merge pull request #2471 from vector-im/fix_show_context_menu_interaction_when_animate
RoomVC: Prevent user interaction in timeline while presenting context menu
2019-06-18 11:49:44 +02:00
manuroe 13dde05920 Merge pull request #2501 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-06-17 10:23:07 +02:00
Weblate 4215887d0e Merge branch 'origin/develop' into Weblate. 2019-06-17 08:21:53 +00:00