Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
7005 commits 46 branches 261 tags 144 MiB
Commit graph

729 commits

Author SHA1 Message Date
SBiOSoftWhare
fd2827220f SettingsViewController: Disable adding threepids if no IS configured. 2019-08-13 17:05:19 +02:00
SBiOSoftWhare
e9df6c9b28 AuthenticationViewController: When register do not propose to add 3rd party ids if there is no configured Identity Server. 2019-08-13 17:03:05 +02:00
SBiOSoftWhare
799b731642 AuthenticationViewController: Disable password reset action when Identity Server is not set. 2019-08-13 17:01:01 +02:00
manuroe
ffee457477 IM: Terms modal: Check checkboxes of already accepted terms urls 2019-08-13 15:54:21 +02:00
manuroe
0531b69f92 IM: Terms modal: Show the modal on widgets (Sticker Picker, ...) 2019-08-13 14:00:33 +02:00
manuroe
3575258920 IM: Terms modal: Reopen the IM UI once terms are accepted 2019-08-13 13:59:36 +02:00
manuroe
d37017430d IM: Terms modal: Make computation of baseUrl more generic 2019-08-13 11:35:56 +02:00
manuroe
9111bed534 IM: Terms modal: Add service purpose description 2019-08-12 15:00:06 +02:00
manuroe
8d4d2bf998 IM: Terms modal: Display terms page into a webview 2019-08-12 11:14:58 +02:00
manuroe
1461b14217 IM: Tweak terms view UI 2019-08-09 18:43:27 +02:00
manuroe
b80640eb3b IM: Display terms in table view 2019-08-09 17:58:02 +02:00
manuroe
f946e2b6d5 IM: Start flow for terms modal 2019-08-09 15:58:33 +02:00
manuroe
ec768b1202 BF: Fix crash for earch bar customisation in iOS13 
#2626
 2019-08-07 18:36:58 +02:00
SBiOSoftWhare
20a7b04743
Update Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2019-08-02 18:12:41 +02:00
SBiOSoftWhare
d4977deee0 Media picker: Fix theming issue on recent captures. 2019-08-02 18:06:55 +02:00
SBiOSoftWhare
35d3ff1e6a SettingsViewController: Use SingleImagePickerPresenter for profile avatar picture. 2019-08-02 17:27:49 +02:00
SBiOSoftWhare
ccc930ccc7 RoomSettingsViewController: Use SingleImagePickerPresenter for room avatar picture. 2019-08-02 17:26:34 +02:00
SBiOSoftWhare
7c81eb685e Create SingleImagePickerPresenter that enables to present an image picker with single selection. 2019-08-02 17:21:17 +02:00
SBiOSoftWhare
119d7239a8 RoomVC: Handle presentation for new native camera and media library actions. 2019-08-02 17:19:29 +02:00
SBiOSoftWhare
b31087ec12 RoomInputToolbarView: Add separate actions for camera and media library. 2019-08-02 17:16:06 +02:00
SBiOSoftWhare
edc03eeb48 Media picker: Create a coordinator. 2019-08-02 17:09:32 +02:00
SBiOSoftWhare
7602c57213 MediaAlbumContentViewController: Fix some retain cycle issues. 2019-08-02 17:07:36 +02:00
SBiOSoftWhare
c26800937c MediaPickerViewController: Remove camera preview and display only recent captures and media albums. 2019-08-02 17:04:14 +02:00
SBiOSoftWhare
a5ac57ca63 Create CameraPresenter that enables to present native camera. 2019-08-02 16:54:31 +02:00
SBiOSoftWhare
2bdd4d782e RoomDataSource: Do not display reactions when event is redacted. 2019-07-30 18:24:12 +02:00
SBiOSoftWhare
17775afd0e ReactionHistoryViewCell: Update copyright. 2019-07-30 18:06:13 +02:00
SBiOSoftWhare
58f485c56e Edit history: Fix some issues. 2019-07-30 17:24:46 +02:00
SBiOSoftWhare
06feb8e28b Reaction history: Handle presentation from room VC by long press on reactions or from contextual menu. 2019-07-30 17:24:46 +02:00
SBiOSoftWhare
1ad0d6908e Reaction history: Implement coordinator. 2019-07-30 17:24:46 +02:00
SBiOSoftWhare
8c83e1d51d Reaction history: Implement screen. 2019-07-30 17:24:45 +02:00
SBiOSoftWhare
f8cdb2afd6 Reaction history: Implement view model. 2019-07-30 17:24:45 +02:00
SBiOSoftWhare
8b9ca69836 Reactions: Add long press gesture on bubble cell reactions. 2019-07-30 17:24:45 +02:00
manuroe
a5760bc770 BF: Crash when leaving settings due to backup section refresh animation. 
The exception was:
*** Terminating app due to uncaught exception 'NSInternalInconsistencyException', reason: 'Invalid update: invalid number of rows in section 10.  The number of rows contained in an existing section after the update (0) must be equal to the number of rows contained in that section before the update (3), plus or minus the number of rows inserted or deleted from that section (0 inserted, 0 deleted) and plus or minus the number of rows moved into or out of that section (0 moved in, 0 moved out).'

To raise this exception:
- Execute the removed code after a delay (2s)
- Enter and leave the settings page
-> Crash
 2019-07-29 17:31:07 +02:00
SBiOSoftWhare
ca7779ae58 Emoji picker: Handle Manu's comments. 2019-07-26 14:06:19 +02:00
SBiOSoftWhare
46434d7596
Update Riot/Modules/Room/RoomViewController.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2019-07-25 19:16:15 +02:00
SBiOSoftWhare
39629a6638 RoomVC: Handle Emoji picker. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
7066c58a0b Emoji picker: Implement coordinator bridge presenter. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
a769f6290e Emoji picker: Implement Emoji picker screen. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
04d142ab65 Emoji picker: Implement cell and header view. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
c9d4b4193a Emoji picker: Implement Emoji store, view model and view data. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
e4df031451 Contextual menu: Fix reactions menu theme update. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
01b9b483c6 Emoji picker: Handle Emoji parsing with EmojiService. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare
2f9419f0bc Reactions menu: Add more reactions button. 2019-07-25 16:58:14 +02:00
manuroe
9579b59bba Soft logout: SSO support: Make sure the "Sign in with SSO" button does not overlap the explanation of the soft logout 2019-07-24 15:24:37 +02:00
manuroe
d126db5e49 Soft logout: SSO support: Display the clear data section upper 2019-07-24 14:59:40 +02:00
manuroe
3fa4de6722 Soft logout: Retain MXFileStore instance while getting user display name 2019-07-24 12:14:31 +02:00
manuroe
45f864b90c Soft logout: Display the message about keys only if there are keys not yet backed ip 2019-07-23 17:36:10 +02:00
manuroe
3fc4ed9884 Soft logout: Do not show the clear data section on the forgot password flow 2019-07-23 17:17:05 +02:00
manuroe
18d7ca6b62 Soft logout: Do not try to log against matrix.org if the password was wrong 2019-07-23 17:03:24 +02:00
manuroe
f7e2da7b1b Soft logout: Implement the clear data button 
#2540
 2019-07-23 16:20:07 +02:00
manuroe
f182073551 Soft logout: Implement design for the clear data section 
#2540
 2019-07-23 14:45:51 +02:00
manuroe
400b9c140e Soft logout: Implement design 
This is an adapted version of the zeplin design. It uses the current app login look and feel with the copy of the zeplin design

#2540
 2019-07-23 11:51:46 +02:00
manuroe
07505b08dc Soft logout: Support soft logout 
#2540
 2019-07-19 14:25:45 +02:00
manuroe
9b63577447 BF: Edits history: Original event is missing 
#2585

The original event is not an edit event. It must be processed a bit differently
 2019-07-17 13:58:09 +02:00
manuroe
8ecf5e73cc Push: Update code to follow API break 
#2348
 2019-07-16 14:42:25 +02:00
manuroe
5e0b61b034
Update Riot/Modules/Room/DataSources/RoomDataSource.h 2019-07-12 09:51:12 +02:00
SBiOSoftWhare
6d63d704f7 RoomVC: Handle external file upload. 2019-07-11 19:17:55 +02:00
SBiOSoftWhare
20458bca20 MXKRoomDataSource: Handle video thumbnail generation with MXKVideoThumbnailGenerator. 2019-07-11 19:07:45 +02:00
SBiOSoftWhare
928eb0c69e RoomInputToolbarView: Add file upload action. 2019-07-11 19:03:32 +02:00
manuroe
47c05e9ce9
Merge pull request #2570 from vector-im/riot_2559 
Edits history: Display original event
 2019-07-10 15:58:41 +02:00
manuroe
54af44d2ad Room upgrade: Autojoin the upgraded room when the user taps on the tombstone banner 
#2486
 2019-07-10 14:58:47 +02:00
manuroe
c09faea091 Edits history: Display original event 
#2559
 2019-07-10 09:53:29 +02:00
SBiOSoftWhare
cece0404ba
Merge pull request #2567 from vector-im/riot_2553 
Reactions: Reinstate the ability to react with non-unicode keys
 2019-07-09 14:20:03 +02:00
SBiOSoftWhare
436f501a91 LABS: Remove reaction settings, reactions are enabled by default. 2019-07-09 13:51:14 +02:00
SBiOSoftWhare
012ea5b9c3 Bubble reaction view: Handle emoji label theme color. 2019-07-09 11:23:46 +02:00
SBiOSoftWhare
3b45885143 Reactions: Limit Emoji string length in reaction bubble. 2019-07-09 11:02:52 +02:00
SBiOSoftWhare
81b30b4916
Merge pull request #2564 from vector-im/riot_2538 
BF: Quick reactions menu hide time and user display name
 2019-07-09 10:37:40 +02:00
SBiOSoftWhare
24f6d03e4c RoomVC: Fix reactions menu timestamp and display name overlap (Fix #2538). 2019-07-08 18:43:55 +02:00
SBiOSoftWhare
593e3b3765 RoomBubbleCellData: Add a method to get first visible component index. 2019-07-08 18:34:08 +02:00
manuroe
3a80274bc4
Merge pull request #2555 from vector-im/riot_2548 
BF: Reactions: Unexpected padding after event selection
 2019-07-08 16:26:43 +02:00
manuroe
138d03d5b2
Merge pull request #2557 from vector-im/riot_2547 
Join Room: Support via parameters to better handle federation
 2019-07-08 14:53:02 +02:00
manuroe
0d5eac4cf6 Room upgrade: Use the server_name parameter when joining the new room 
#2550
 2019-07-08 11:46:10 +02:00
manuroe
87b1e15f36 Join Room: Support via parameters to better handle federation 
#2547
 2019-07-08 11:15:44 +02:00
SBiOSoftWhare
4f6f5a771f Reactions: Fix unexpected padding after event selection (Fix #2548). 2019-07-05 20:56:37 +02:00
SBiOSoftWhare
12896ffc36 Message editing: Handle encrypted message edits history. 2019-07-05 14:14:46 +02:00
SBiOSoftWhare
3a8122bdb1 Message edits history: Handle message edits history display from RoomViewController. 2019-07-04 19:24:15 +02:00
SBiOSoftWhare
11012933ae Message edits history: Update EditHistoryViewController to use UITableView to display messages and dates. 2019-07-04 19:22:29 +02:00
SBiOSoftWhare
8ae74d507d Message edits history: Update view model to handle message history grouping by day. 2019-07-04 19:18:13 +02:00
SBiOSoftWhare
8fe0213c44 Message edits history: Create edit history section struct. 2019-07-04 19:04:53 +02:00
SBiOSoftWhare
884f47b33e Message edits history: Create header view. 2019-07-04 19:03:39 +02:00
SBiOSoftWhare
a943361051 Message edits history: Create edit message cell. 2019-07-04 19:02:54 +02:00
manuroe
2a22e4c0a9 Reactions: Show at most 8 reactions 
#2510
 2019-07-04 11:38:48 +02:00
SBiOSoftWhare
78351941e4 Message editing: Handle reply edition. 2019-07-03 11:13:53 +02:00
manuroe
63aca2b130 Edits history: Manage date 2019-07-01 14:39:39 +02:00
manuroe
4c7a652fd9 EventFormatter: add showEditionMention setting 2019-07-01 12:42:42 +02:00
manuroe
26a8a6fd8d Edits history: Use a dedicated event formatter 2019-07-01 12:34:20 +02:00
manuroe
4f6986c0ea Edits history: Improve temporary UX a bit 2019-07-01 10:51:07 +02:00
manuroe
54e3155763 Edits history: Fix missing navigation bar 2019-07-01 10:34:02 +02:00
manuroe
d09ff5961c Edits: Start history 2019-06-28 19:27:46 +02:00
SBiOSoftWhare
2980e0fd99
Merge pull request #2534 from vector-im/context_menu_UX_improvements 
Room: Improve context menu UX
 2019-06-27 16:36:17 +02:00
SBiOSoftWhare
9a217a1098 RoomVC: Improve RoomContextualMenuPresenter loading speed. 2019-06-27 14:37:17 +02:00
manuroe
3eda67435e BF: Edits: editing an unsent msg gets cancelled if the original msg send completes during the edit 
#2495
 2019-06-27 12:25:01 +02:00
SBiOSoftWhare
392d2ae972 RoomVC: Reduce animation duration when presenting contextual menu. Make animation quicker for a single tap. 2019-06-27 11:41:25 +02:00
SBiOSoftWhare
32de513df5 RoomViewController: Improve additional event actions menu behavior. Remove more action. 2019-06-27 10:23:20 +02:00
manuroe
f63d2e1398
Merge pull request #2531 from vector-im/riot_2449 
Edits: Support edits in e2e rooms
 2019-06-26 12:14:25 +02:00
manuroe
3db1cffe28 Edits: Support edits in e2e rooms 2019-06-25 18:32:34 +02:00
SBiOSoftWhare
066927c4d4 Bubble cell reactions: Fix BubbleReactionViewCell clipped at bottom in selected state (Fix #2515). 2019-06-25 16:21:48 +02:00
SBiOSoftWhare
cd57ed1f9b RoomViewController: Handle updated RoomContextualMenuViewController. 2019-06-25 14:00:12 +02:00
SBiOSoftWhare
dab7d224eb RoomContextualMenuPresenter: Handle new reactions menu animations, reduce context menu show/hide animation duration. 2019-06-25 13:56:44 +02:00
SBiOSoftWhare
77d27d5fce RoomContextualMenuViewController: Handle updated ReactionsMenuView and new animations instructions. 2019-06-25 13:48:16 +02:00
SBiOSoftWhare
96c771bbfe Update ReactionsMenuView layout. 2019-06-25 13:40:59 +02:00
SBiOSoftWhare
833ba360ee Update ReactionsMenuViewModel to handle a list of reactions. 2019-06-25 13:23:07 +02:00
SBiOSoftWhare
af92b98065 Update ReactionsMenuButton UI 2019-06-25 12:06:54 +02:00
manuroe
f7554aaa88
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
948105b03d Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
manuroe
afd37fa9fb 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
98361afa6f e2e room message: Fix padlock position on last message with sender name. 2019-06-20 12:07:04 +02:00
SBiOSoftWhare
4e6c1c36af RoomDataSource: Fix bubble cell data additional content height update. 2019-06-19 14:22:38 +02:00
SBiOSoftWhare
2b28f25883 Merge develop into fix_riot_attachmentview_reactions 2019-06-19 11:44:42 +02:00
SBiOSoftWhare
8e50ff08c1 Fix bubble cell height for cells with attachment view and reactions. 2019-06-18 18:36:22 +02:00
SBiOSoftWhare
3295b649c9 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
0809c8af55 RoomBubbleCellData: Fix bubble component position when display last message timestamp. 2019-06-18 17:42:00 +02:00
manuroe
872976f798 Read receipts: Manage live update in the kit too 2019-06-18 14:06:23 +02:00
manuroe
ba6d5939a3 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare
8aea88139e
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
82f52378dd Menu actions: Display the keyboard once the users tap on reply or edit 
This also fixes the local echo issues we had when this screen stayed displayed
 2019-06-14 16:29:25 +02:00
manuroe
6a3cfc0172 Reactions menu: leave the menu once the user tapped a reaction 2019-06-14 16:15:27 +02:00
manuroe
5836ebb97e
Merge pull request #2490 from vector-im/reaction_echo 
Local echo for reactions
 2019-06-13 17:50:31 +02:00
SBiOSoftWhare
e610bd96e8 RoomViewController: Add message editing support. 2019-06-13 16:38:20 +02:00
SBiOSoftWhare
3c4961af8f RoomInputToolbarView: Add editing mode. 2019-06-13 16:37:28 +02:00
manuroe
84cd3d5e9d Reactions: Change reaction and unreaction methods signatures 2019-06-12 18:25:47 +02:00
manuroe
531cc4b68f Reactions local echoes: Do not show reactions with 0 count (case of reaction being removed) 2019-06-12 18:03:21 +02:00
SBiOSoftWhare
d751af48ff RoomViewController: Prepare message edited mention tap. 2019-06-12 16:06:27 +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
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
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
b0fbcde9dd Create RoomBubbleCellLayout class to handle MXKRoomBubbleTableViewCell layout constants. 2019-05-29 12:15:31 +02:00
SBiOSoftWhare
55f3a68afb RoomVC: Prevent user interaction in timeline while presenting context menu. 2019-05-24 11:33:44 +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
31feca6f17 Room contextual menu: Update button titles color and disabled opacity. 2019-05-23 17:48:52 +02:00
SBiOSoftWhare
f14cbf759e Registration: Fix infinite loop when register with email and validate from mobile. 2019-05-23 16:46:00 +02:00
David Cordero
627291529b Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare
366d27ebab Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +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
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
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
SBiOSoftWhare
b234a09bf1 RoomBubbleCellData: Add a property to display the timestamp of the selected component on the left when there is enough space. 2019-05-22 16:17:55 +02:00
manuroe
98c95fb849 Reactions menu: Patch RoomContextualMenuPresenter while we have a retain cycle 2019-05-21 02:12:14 +02:00
SBiOSoftWhare
3117c4322c Theme: Remove non needed reaction colors 2019-05-21 01:09:42 +02:00
SBiOSoftWhare
321811283a BubbleReactionsView: Use a UICollectionViewFlowLayout subclass with left alignement. 2019-05-21 00:43:10 +02:00
SBiOSoftWhare
d2cfe4891a RoomDataSource: Handle reactions display on bubble cell. 2019-05-20 21:59:18 +02:00
SBiOSoftWhare
75d7b26bfc RoomBubbleCellData: Improve reactions view vertical space calculation 2019-05-20 21:57:29 +02:00
SBiOSoftWhare
4ababf957e Create BubbleReactionsView 2019-05-20 21:54:23 +02:00
SBiOSoftWhare
2caf4e326f Create BubbleReactionsViewModel 2019-05-20 21:52:07 +02:00
SBiOSoftWhare
e5d8910a92 Create BubbleReactionViewCell 2019-05-20 21:51:24 +02:00
SBiOSoftWhare
2d118853a7 Create AutosizedCollectionView a convenient UICollectionView that makes dynamic sizing easier when using Auto Layout 2019-05-20 21:49:57 +02:00
manuroe
aadac45de6 Reactions menu: Do not notify delegate if reaction requires an unreaction 
Fix Steve's remark
 2019-05-20 20:41:05 +02:00
manuroe
86808b16e2 Reactions menu: Do not notify delegate if reaction requires an unreaction 
This avoids to call the delegate twice.
Note: In a short future, we will no more have those 3 state buttons
 2019-05-20 19:48:29 +02:00
manuroe
d72f2eb762 Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe
f105fadc48
Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe
6866fe8e2c Reactions: Add a labs setting 
#2441
 2019-05-20 17:31:25 +02:00
manuroe
2b7b2c5a6c 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
4a7677a667 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
0973d3886b Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
David Cordero
8dfa395647 Remove redundant code 2019-05-19 17:19:23 +02:00
David Cordero
10c1624f7e Fix text color for user display name and device id labels in dark theme 2019-05-19 17:14:41 +02:00
manuroe
80d817c98e Reactions: Reactions menu: plug unreact 2019-05-17 17:39:31 +02:00
manuroe
443b886a34
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
b1ebf79e50 RoomVC: ContextualMenu: Plug reactions menu 2019-05-17 12:17:59 +02:00
manuroe
00bebecc29 Reactions: Add placeholder for reactions list under message 2019-05-17 01:28:45 +02:00
manuroe
3249751dc2 RoomBubbleCellData: Do readReceiptVerticalWhitespace thing in one place 2019-05-16 18:27:48 +02:00
manuroe
0ed0d8cef5 Reactions: Follow small SDK change 2019-05-16 17:44:07 +02:00
manuroe
0bc5c28390 Reactions: Fix Steve's comments 2019-05-16 16:07:07 +02:00
manuroe
8d7f535581
Merge branch 'aggregations' into riot_2393 2019-05-16 14:51:14 +02:00
manuroe
ec758a84b7 Reactions: we cannot like & dislike at the same time 2019-05-16 14:45:42 +02:00
manuroe
13beb50abb 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
65ec1e9988 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00
manuroe
7cd5e79bc6 Reactions: Customise primary reactions buttons 2019-05-15 23:35:09 +02:00
SBiOSoftWhare
f5887c4774 RoomViewController: Disable reply on single tap selection. 2019-05-15 23:30:33 +02:00
SBiOSoftWhare
c0e313f156 RoomViewController: Show contextual menu toolbar on long press. 2019-05-15 23:24:34 +02:00
SBiOSoftWhare
1f43a8ee5e Create RoomContextualMenuPresenter 2019-05-15 23:10:07 +02:00
SBiOSoftWhare
d682b97441 Create RoomContextualMenuViewController 2019-05-15 23:09:03 +02:00
SBiOSoftWhare
cd238cc2f0 Create RoomContextualMenuToolbarView 2019-05-15 23:07:50 +02:00
SBiOSoftWhare
444a2ee452 Create room contextual menu action enum 2019-05-15 23:02:25 +02:00
SBiOSoftWhare
3be7a5274a RoomDataSource: Add a property to show or hide timestamp when selecting an event. 2019-05-15 21:44:07 +02:00
SBiOSoftWhare
c808ae5057 RoomBubbleCellData: Add a property to show or hide timestamp for selected component. 2019-05-15 21:34:32 +02:00
manuroe
52a480db92 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe
e419eecfeb Reactions: Add primary reactions as message actions 2019-05-15 16:00:36 +02:00
manuroe
97ffa9bf1e Device Verification: Fix buttons colors in dark theme 2019-05-06 08:21:30 +02:00
manuroe
ef4fed1bb2 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe
16dc04e18d RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode 
because message editing (#2404) is coming
 2019-04-30 17:08:52 +02:00
SBiOSoftWhare
3e430e7b45 Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
manuroe
08d83114fe
Merge pull request #2378 from aaronraimist/homeserver 
home server -> homeserver (#2345)
 2019-04-26 11:41:47 +02:00
SBiOSoftWhare
3da89a05ce Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare
cdede7fcce Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare
24d7c087fb Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare
04b5dd0b58 Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare
42ddca925f Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare
87a6d13855 [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare
84660597fb Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe
8d68da4da8
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
cab15e7477
Merge pull request #2372 from vector-im/riot_2323 
E2E: SAS Verification
 2019-04-24 14:51:04 +02:00
manuroe
b4c0a77ca1 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe
a1901e6238 Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
manuroe
c987e80d54 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
7bc6ba25af Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe
6eadbbdae0 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00
manuroe
3c0237a4bd Device Verification: Fix Steve's PR comments 2019-04-24 08:18:56 +02:00
Aaron Raimist
d710b3788d
home server -> homeserver (#2345) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-04-19 21:27:10 -05:00
SBiOSoftWhare
b4c1cd0376 Update JistiViewController to use new JitsiMeet SDK API 2019-04-19 18:34:44 +02:00
SBiOSoftWhare
b6e847c638 Create JitsiService to abstract and configure Jisti Meet SDK 2019-04-19 18:29:53 +02:00
manuroe
e90fa1c323 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
manuroe
bffe14f760 Device Verification: Manage display of SAS decimals 2019-04-19 11:31:19 +02:00
manuroe
b838e1c2d5 Device Verification: Clean dev code 2019-04-19 10:35:02 +02:00
manuroe
1df16d8ac7 Device Verification: Start: Fix missing cancelledByMe state 2019-04-18 23:12:01 +02:00
J. Ryan Stinnett
b5ee4a6aa9 Clarify key backup details when backup exists but is not trusted 
This ports the wording changes from Riot Web
https://github.com/matrix-org/matrix-react-sdk/pull/2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
 2019-04-18 13:30:32 +01:00
manuroe
771444573d Device Verification: MXUser.displayname and avatar can be nil 2019-04-17 13:54:51 +02:00
manuroe
bcacc78b3c Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe
5cad9743fb Device Verification: Removed unused code from templates 2019-04-17 12:52:45 +02:00
manuroe
d49dce7dcb Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe
ce47ea0277 Device Verification: Hack EncryptionInfoView to display the new device verification flow when the user taps on "Verify" 2019-04-17 09:51:32 +02:00
manuroe
8a50ccb077 SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00
manuroe
01e699fdf1 Device Verification: Plug it in the code more 2019-04-17 08:09:43 +02:00
manuroe
dd34bfe716 Device Verification: Plug it in the code 2019-04-16 17:55:40 +02:00
manuroe
e8ed9a19f9 Device Verification: Plug the legacy verification modal 2019-04-16 15:00:57 +02:00
manuroe
4889690698 Device Verification: Do not show back button 2019-04-16 11:36:51 +02:00
manuroe
b12c2af145 Device Verification: Translate emoji 2019-04-16 09:33:25 +02:00
manuroe
aeb0031fda Device Verification: Verified screen 2019-04-15 18:40:04 +02:00
manuroe
1a7d642325 Device Verification: Verified screen 2019-04-15 18:22:24 +02:00
manuroe
e721b6cf60 Device Verification: Incoming screen: UI: Use a rounded MXKImageView 2019-04-15 15:28:59 +02:00
manuroe
a4a2064970 Device Verification: Incoming screen: UI: plug data 2019-04-15 14:18:44 +02:00
manuroe
bdefacff0e Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe
db8b3c5648 Device Verification: Incoming screen: working on UI 2019-04-13 00:19:01 +02:00
manuroe
a9502603d6 Device Verification: Incoming screen: beginning 2019-04-12 23:19:07 +02:00
manuroe
785bc7f176 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe
d7d78b063b Device Verification: Verify screen: Try to make emoji names fit in their cell 2019-04-11 18:13:55 +02:00
manuroe
b88d4d4f2d Device Verification: Verify screen: bind transaction.confirmSASMatch() 2019-04-11 18:12:30 +02:00
SBiOSoftWhare
5292d2cbaa Update SettingsKeyBackupTableViewSection to prepare restore button removal when all keys are stored on device. 2019-04-11 10:40:26 +02:00
SBiOSoftWhare
7263b268e1
Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +02:00
SBiOSoftWhare
a40988fbc7 [SettingsViewController] Avoid some crashes when reload rows animated. 2019-04-10 14:50:47 +02:00
SBiOSoftWhare
bf3750f254 [RoomSettingsViewController] Avoid some crashes when reload sections animated. 2019-04-10 14:50:14 +02:00
SBiOSoftWhare
24e74f3577 Make read receipt label text color use primary text color (Fix #2294). 2019-04-10 12:10:15 +02:00
manuroe
b934b26f25 Device Verification: Verify screen: Theme emojis names 2019-04-08 17:10:40 +02:00
manuroe
3b6e230c86 Device Verification: Verify screen: Make emojis fit on 2 lines on SE 2019-04-08 16:50:55 +02:00
manuroe
aee917a00d Device Verification: Verify screen: We do not need scrolling for that screen 2019-04-08 16:05:28 +02:00
manuroe
b0a8f8167e Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 15:47:34 +02:00
SBiOSoftWhare
afedb617ec Use one external entry point on AppDelegate to navigate to a room 2019-04-08 13:32:46 +02:00
manuroe
f14b92ba5d Device Verification: Verify screen: display emojis 2019-04-07 00:04:36 +02:00
manuroe
d5102d1611 Device Verification: Start screen: Improve a bit layout (maybe) 2019-04-07 00:00:49 +02:00
manuroe
e32f32668b Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +02:00
manuroe
7269e2fc8b Device Verification: Start verify screen 2019-04-05 19:09:29 +02:00
manuroe
befc960714 Device Verification: Start screen: add transaction cancel 2019-04-05 18:39:57 +02:00
manuroe
b8ee5d7cd6 Device Verification: Start screen: add "Waiting for partner to accept..." 2019-04-05 18:15:05 +02:00