manuroe
|
ca6b2f1298
|
Merge branch 'develop' into aggregations
|
2019-05-20 17:57:50 +02:00 |
|
manuroe
|
617c3f2d60
|
Reactions: Add a labs setting
#2441
|
2019-05-20 17:31:25 +02:00 |
|
manuroe
|
5af992a2a4
|
Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API
Fix Steve's comment
|
2019-05-20 17:00:57 +02:00 |
|
manuroe
|
2824372877
|
Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API
|
2019-05-20 16:04:54 +02:00 |
|
manuroe
|
71e8d104d6
|
Reactions: Reactions menu: highlight reactiosn only our user made
|
2019-05-20 15:00:47 +02:00 |
|
David Cordero
|
15d07c025f
|
Remove redundant code
|
2019-05-19 17:19:23 +02:00 |
|
David Cordero
|
54e6f19694
|
Fix text color for user display name and device id labels in dark theme
|
2019-05-19 17:14:41 +02:00 |
|
manuroe
|
3c512ee7e3
|
Reactions: Reactions menu: plug unreact
|
2019-05-17 17:39:31 +02:00 |
|
manuroe
|
d320124317
|
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
|
2401c7a129
|
RoomVC: ContextualMenu: Plug reactions menu
|
2019-05-17 12:17:59 +02:00 |
|
manuroe
|
d22e9beda6
|
Reactions: Add placeholder for reactions list under message
|
2019-05-17 01:28:45 +02:00 |
|
manuroe
|
a466493f7b
|
RoomBubbleCellData: Do readReceiptVerticalWhitespace thing in one place
|
2019-05-16 18:27:48 +02:00 |
|
manuroe
|
cc8862b6f1
|
Reactions: Follow small SDK change
|
2019-05-16 17:44:07 +02:00 |
|
manuroe
|
4a965ebf23
|
Reactions: Fix Steve's comments
|
2019-05-16 16:07:07 +02:00 |
|
manuroe
|
554747529d
|
Merge branch 'aggregations' into riot_2393
|
2019-05-16 14:51:14 +02:00 |
|
manuroe
|
48a3a1ce7b
|
Reactions: we cannot like & dislike at the same time
|
2019-05-16 14:45:42 +02:00 |
|
manuroe
|
1da2534834
|
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
|
948ced2568
|
Reactions: Plug button actions
|
2019-05-16 07:47:23 +02:00 |
|
manuroe
|
e4e7261360
|
Reactions: Customise primary reactions buttons
|
2019-05-15 23:35:09 +02:00 |
|
SBiOSoftWhare
|
1db09d6feb
|
RoomViewController: Disable reply on single tap selection.
|
2019-05-15 23:30:33 +02:00 |
|
SBiOSoftWhare
|
06fe9bf8ae
|
RoomViewController: Show contextual menu toolbar on long press.
|
2019-05-15 23:24:34 +02:00 |
|
SBiOSoftWhare
|
e12c5f64b0
|
Create RoomContextualMenuPresenter
|
2019-05-15 23:10:07 +02:00 |
|
SBiOSoftWhare
|
b05f7447da
|
Create RoomContextualMenuViewController
|
2019-05-15 23:09:03 +02:00 |
|
SBiOSoftWhare
|
a75d6eb942
|
Create RoomContextualMenuToolbarView
|
2019-05-15 23:07:50 +02:00 |
|
SBiOSoftWhare
|
3670267947
|
Create room contextual menu action enum
|
2019-05-15 23:02:25 +02:00 |
|
SBiOSoftWhare
|
8e03ebb56d
|
RoomDataSource: Add a property to show or hide timestamp when selecting an event.
|
2019-05-15 21:44:07 +02:00 |
|
SBiOSoftWhare
|
31828b7013
|
RoomBubbleCellData: Add a property to show or hide timestamp for selected component.
|
2019-05-15 21:34:32 +02:00 |
|
manuroe
|
7929b57bd0
|
Reactions: Translate primary reactions
|
2019-05-15 16:38:28 +02:00 |
|
manuroe
|
11cf7979f5
|
Reactions: Add primary reactions as message actions
|
2019-05-15 16:00:36 +02:00 |
|
manuroe
|
3951d7a45d
|
Device Verification: Fix buttons colors in dark theme
|
2019-05-06 08:21:30 +02:00 |
|
manuroe
|
948946727d
|
RoomVC: When replying, use a "Reply" button instead of "Send"
|
2019-04-30 17:27:57 +02:00 |
|
manuroe
|
16687b865f
|
RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
because message editing (#2404) is coming
|
2019-04-30 17:08:52 +02:00 |
|
SBiOSoftWhare
|
17421aea2e
|
Fix room details navigation from rooms list.
|
2019-04-29 14:24:20 +02:00 |
|
manuroe
|
58f2fd1d23
|
Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
|
2019-04-26 11:41:47 +02:00 |
|
SBiOSoftWhare
|
33387e15bb
|
Handle button title for restore action case in SettingsKeyBackupTableViewSection.
|
2019-04-25 16:10:22 +02:00 |
|
SBiOSoftWhare
|
1b820225e5
|
Merge develop into prepare_riot_2231
|
2019-04-25 15:59:32 +02:00 |
|
SBiOSoftWhare
|
084909583b
|
Remove check for +[UIFont systemFontOfSize:weight:] availability.
|
2019-04-25 12:27:31 +02:00 |
|
SBiOSoftWhare
|
cbe155a8cf
|
Remove iOS 10 availability condition in MasterTabBarController.
|
2019-04-25 11:53:38 +02:00 |
|
SBiOSoftWhare
|
e4dfbb48ca
|
Use a weak reference for mediaPicker property in RoomInputToobarView.
|
2019-04-24 17:56:59 +02:00 |
|
SBiOSoftWhare
|
e48aed12c8
|
[Media Picker] Fix some retain cycles and fix implicit self warnings.
|
2019-04-24 17:56:03 +02:00 |
|
SBiOSoftWhare
|
0c70565ee2
|
Merge develop into riot_1483
|
2019-04-24 16:28:51 +02:00 |
|
manuroe
|
70c8f161f0
|
Update Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
|
2019-04-24 15:55:51 +02:00 |
|
manuroe
|
6913fb0c55
|
Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
|
2019-04-24 14:51:04 +02:00 |
|
manuroe
|
554b3b1a68
|
Device Verification: Add a view model to DeviceVerificationDataLoadingViewController
|
2019-04-24 14:42:16 +02:00 |
|
manuroe
|
49b3880327
|
Device Verification: Update SDK constant names changes
|
2019-04-24 10:35:56 +02:00 |
|
manuroe
|
51cf40d3a0
|
Clarify key backup details when backup exists but is not trusted in banner too
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
|
2019-04-24 10:23:27 +02:00 |
|
manuroe
|
58dc082569
|
Device Verification: Make incoming requests dialogs dequeueing work without a random sleep
|
2019-04-24 08:55:45 +02:00 |
|
manuroe
|
d664159a14
|
Device Verification: Remove a TODO
|
2019-04-24 08:23:44 +02:00 |
|
manuroe
|
4d1b701ed0
|
Device Verification: Fix Steve's PR comments
|
2019-04-24 08:18:56 +02:00 |
|
Aaron Raimist
|
324a8757a5
|
home server -> homeserver (#2345)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
|
2019-04-19 21:27:10 -05:00 |
|