Commit Graph

5797 Commits

Author SHA1 Message Date
manuroe 2b56446efb Merge pull request #2430 from vector-im/reactions_in_context_menu
RoomVC: ContextualMenu: Plug reactions menu
2019-05-17 13:33:57 +02:00
manuroe ed6684dbd8 Merge pull request #2429 from vector-im/reactions_placeholder
Reactions: Add placeholder for reactions list under message
2019-05-17 13:08:22 +02:00
manuroe 985595b440 pbxproj: Fix ReactionsMenu group after automatic merge 2019-05-17 12:21:33 +02:00
manuroe 15a9edabc7 RoomVC: ContextualMenu: Plug reactions menu 2019-05-17 12:17:59 +02:00
manuroe 8fb8cb85cb Reactions: Add placeholder for reactions list under message 2019-05-17 01:28:45 +02:00
manuroe 0afd48f5b5 RoomBubbleCellData: Do readReceiptVerticalWhitespace thing in one place 2019-05-16 18:27:48 +02:00
manuroe 9a73306657 Reactions: Follow small SDK change 2019-05-16 17:44:07 +02:00
manuroe fce3088835 Merge pull request #2423 from vector-im/riot_2393
Reactions: Add primary reactions as message actions
2019-05-16 16:08:18 +02:00
manuroe 092213af1f Reactions: Fix Steve's comments 2019-05-16 16:07:07 +02:00
manuroe ad78f4f5a5 Merge branch 'aggregations' into riot_2393 2019-05-16 14:51:14 +02:00
manuroe b85c9fd4cb Reactions: we cannot like & dislike at the same time 2019-05-16 14:45:42 +02:00
SBiOSoftWhare 28ecce4c8c Merge pull request #2424 from vector-im/riot_2394
New message actions
2019-05-16 14:08:18 +02:00
manuroe 2456273baa Reactions: notify coordinator for every reaction request steps
so that it can leave the view when it wants
2019-05-16 08:07:52 +02:00
manuroe aa639a6a20 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00
manuroe c06015eea5 Reactions: Customise primary reactions buttons 2019-05-15 23:35:09 +02:00
SBiOSoftWhare cb851310a4 Update changes 2019-05-15 23:34:21 +02:00
SBiOSoftWhare 391eff8a5a RoomViewController: Disable reply on single tap selection. 2019-05-15 23:30:33 +02:00
SBiOSoftWhare da1e659794 Update pbxproj 2019-05-15 23:24:54 +02:00
SBiOSoftWhare 900a219691 RoomViewController: Show contextual menu toolbar on long press. 2019-05-15 23:24:34 +02:00
SBiOSoftWhare 4a15db4754 Create RoomContextualMenuPresenter 2019-05-15 23:10:07 +02:00
SBiOSoftWhare 0c0fa0f451 Create RoomContextualMenuViewController 2019-05-15 23:09:03 +02:00
SBiOSoftWhare 8ed0eadf3c Create RoomContextualMenuToolbarView 2019-05-15 23:07:50 +02:00
SBiOSoftWhare 351deadd76 Create room contextual menu action enum 2019-05-15 23:02:25 +02:00
SBiOSoftWhare a30f68ff98 RoomDataSource: Add a property to show or hide timestamp when selecting an event. 2019-05-15 21:44:07 +02:00
SBiOSoftWhare 3544c50601 RoomBubbleCellData: Add a property to show or hide timestamp for selected component. 2019-05-15 21:34:32 +02:00
SBiOSoftWhare ca9ba8d366 Add convenient methods on UIGestureRecognizer, UIImage and UIStackView. 2019-05-15 21:29:47 +02:00
SBiOSoftWhare f6245cdc44 Make Themable protocol available for Obj-C 2019-05-15 21:18:02 +02:00
SBiOSoftWhare 2621c727d4 MXKRoomBubbleTableViewCell+Riot: Add possibility to hide timestamp when selecting a component. 2019-05-15 21:15:50 +02:00
SBiOSoftWhare cd7bccc2ca Add contextual menu strings 2019-05-15 21:11:55 +02:00
SBiOSoftWhare fcd74e3f41 Add room contextual menu images 2019-05-15 21:11:36 +02:00
manuroe 1f57e1bb95 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe 376d5cb5d6 Reactions: Add primary reactions as message actions 2019-05-15 16:00:36 +02:00
SBiOSoftWhare dda2d971f5 MXKRoomBubbleTableViewCell: Enable long press on event. 2019-05-07 18:24:05 +02:00
SBiOSoftWhare 3a99cbf0b5 MXKRoomBubbleTableViewCell+Riot: Add possibility to hide edit button on selection. 2019-05-07 16:49:12 +02:00
manuroe dca451206a Merge pull request #2407 from vector-im/riot_2404_1
RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
2019-04-30 17:35:46 +02:00
manuroe dd486e9f22 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe 2376de39b5 RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
because message editing (#2404) is coming
2019-04-30 17:08:52 +02:00
manuroe ca060479ce Merge pull request #2390 from fridtjof/patch-1
Readme: 'pod update' should be 'pod setup' for updating CocoaPods repos
2019-04-30 11:09:22 +02:00
SBiOSoftWhare 8760164582 Merge pull request #2391 from vector-im/fix_room_details_navigation
Fix room details navigation
2019-04-29 16:08:52 +02:00
SBiOSoftWhare 76efbd8f1f Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
SBiOSoftWhare d04146d095 Add restoreInitialDisplay parameter on -[AppDelegate showRoom:andEventId:withMatrixSession:] method to choose to display a room from home tab or not. 2019-04-29 14:22:01 +02:00
Fridtjof Mund 6a29923c68 Readme: 'pod update' should be 'pod setup' for updating CocoaPods repos 2019-04-29 14:21:40 +02:00
SBiOSoftWhare 369498cfd0 Merge pull request #2388 from vector-im/clean_build_settings
Project configuration: Clean search paths and flags build settings
2019-04-29 13:56:34 +02:00
SBiOSoftWhare 62b67a8c7b Clean search paths and flags build settings in all targets and use $(inherited) value where needed. 2019-04-26 18:04:03 +02:00
manuroe 47941b2697 Add a description for NSCalendarsUsageDescription
This permission has been introduced by the jitsi update.
2019-04-26 15:42:05 +02:00
manuroe 72bb37af7d Strings.swift 2019-04-26 15:11:20 +02:00
manuroe 7dc29edca1 Add a description for NSCalendarsUsageDescription
This permission has been introduced by the jitsi update.
2019-04-26 15:10:56 +02:00
SBiOSoftWhare 35aac68b79 Set project and share extension deployment target to iOS 10.0. 2019-04-26 14:58:49 +02:00
manuroe 06f6b937ca Merge pull request #2387 from vector-im/build_release
Build: Add a sh build script
2019-04-26 11:43:47 +02:00
manuroe 9272d92063 Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00