Commit Graph

375 Commits

Author SHA1 Message Date
SBiOSoftWhare 575a32feda Merge pull request #5219 from vector-im/steve/5020_matrixkit_merge
Merge MatrixKit repository into Element
2021-12-03 15:44:30 +01:00
Stefan Ceriu c70c4fb70a vector-im/element-ios/issues/4753 - Allow audio file attachments to be played back inline by reusing the existing voice message UI. 2021-12-02 15:38:59 +02:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Doug 6dd471045f Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
Stefan Ceriu ba9c40cf2d vector-im/element-ios/issues/5114 - Poll creation screen
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
2021-11-11 11:24:28 +02:00
Stefan Ceriu 7c58fff01a vector-im/element-ios/pull/5014 - Forward original message content and remove the need to re-upload media. 2021-11-09 10:41:21 +02:00
Phl-Pro 31a99e2e09 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
Doug 6312c2eb95 Merge pull request #5074 from vector-im/doug/5071_fix_presented_views
Fix more button not working.
2021-11-03 16:35:03 +00:00
SBiOSoftWhare b2934662b7 Merge branch 'hotfix/1.6.7' into hotfix/1.6.7_2 2021-11-03 17:22:21 +01:00
Doug 6497cfd8e2 Ensure DisabledRoomInputToolbarView is used. Fix previewing rooms. Fix favourited DMs in Home. 2021-11-03 10:18:27 +00:00
Doug a18f6cead5 Present alerts before assigning to currentAlert. 2021-11-01 15:05:02 +00:00
Finn Behrens 530459d6bf Remember keyboard language for room
This adds a `textInputContextIdentifier` to the RoomViewController to save the current language per room.

Signed-off-by: Finn Behrens <me@kloenk.dev>
2021-10-31 19:58:21 +01:00
SBiOSoftWhare 773bf6ca28 RoomViewController: Fix a crash on before iOS 14. 2021-10-29 13:47:42 +02:00
SBiOSoftWhare e6866a2e7f Update weak views usage. 2021-10-29 10:50:24 +02:00
SBiOSoftWhare cb5e210bc4 RoomVC: Fix typo. 2021-10-28 18:51:25 +02:00
SBiOSoftWhare ddcf64a75e RoomVC: Prevent retain cycles. 2021-10-28 17:41:16 +02:00
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
SBiOSoftWhare 9666e20c8f Rename UniversalLinkPresentationParameters to ScreenPresentationParameters. 2021-10-21 10:00:37 +02:00
SBiOSoftWhare 2a22d75b2a Merge develop into 4734_room_stack 2021-10-20 11:14:52 +02:00
SBiOSoftWhare 4a1b405a9a RoomVC: Fix typo. 2021-10-20 09:21:02 +02:00
SBiOSoftWhare e294b98fed RoomVC: Update with UniversalLinkPresentationParameters. 2021-10-20 07:32:04 +02:00
ismailgulek 40fad95939 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 16:40:34 +03:00
SBiOSoftWhare d56b81a0e2 RoomVC: Remove temporary space universal link handling. 2021-10-19 12:29:59 +02:00
Stefan Ceriu 503b8bd599 vector-im/element-ios/issues/5009 - Implemented multi-room forwarding and added various tweaks following code review. 2021-10-18 16:40:53 +03:00
Stefan Ceriu 3836851448 vector-im/element-ios/issues/5009 - Refactored away the NSExtensionContext dependency from the ShareManager. Introduced different ShareItemProviders for the share extension and the main application. Improved item loading error handling. 2021-10-18 16:40:53 +03:00
Stefan Ceriu d700767bb5 vector-im/element-ios/issues/5009 - Fixed share extension setup and cleaned up code. 2021-10-18 16:40:53 +03:00
Stefan Ceriu 635ebea083 vector-im/element-ios/issues/5009 - Moved files around, cleaned up imports and logs. 2021-10-18 16:40:53 +03:00
Stefan Ceriu 967987f807 vector-im/element-ios/issues/5009 - Refactored share extension and started using the shared code directly in the main application. 2021-10-18 16:40:48 +03:00
SBiOSoftWhare 061d7ed0d9 Merge branch 'develop' into steve/4734_room_stack 2021-10-14 16:21:03 +02:00
ismailgulek 0eb5be1dcc Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-13 14:34:20 +03:00
Stefan Ceriu eacbcac1d3 #1098 - Added extra top padding on first list item. Fixed various merge problems. 2021-10-13 11:46:43 +03:00
Stefan Ceriu 71667de9b1 #1098 - Working real user suggestion inside the main application. 2021-10-13 11:26:22 +03:00
Stefan Ceriu 388e521a89 #1098 - Added user suggestions to the main app timeline. 2021-10-13 11:25:36 +03:00
Stefan Ceriu ccfdfa1fb8 #1098 - Generated UserSuggestion from template, got initial UI working and automatically updating. 2021-10-13 11:24:46 +03:00
SBiOSoftWhare 93075c8f34 RoomVC: Update universal link management with UniversalLinkParameters. 2021-10-12 19:12:08 +02:00
ismailgulek 1eb62fb392 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
SBiOSoftWhare c3731a2ec0 Merge pull request #4960 from vector-im/steve/4734_master_tab_bar_refacto
Split view: Improve detail view management and add possibility to stack views on it
2021-10-11 17:23:20 +02:00
ismailgulek 890540e349 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-08 16:59:25 +03:00
Stefan Ceriu 9ee68cb7d8 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-10-08 11:33:13 +03:00
SBiOSoftWhare aaec54896b Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02:00
ismailgulek cc46decec2 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek 05d71297b5 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
Gil Eluard 8fd88b2053 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard 96a3624cf6 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard bfe5835082 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
David Langley 5f046fbfe0 Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts
Voice message draft persistence
2021-09-23 11:21:26 +00:00
David Langley f539fbbc85 Remove space 2021-09-23 09:39:09 +01:00
David Langley 351e60780b Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
Gil Eluard 8ced741f66 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00