Commit Graph

360 Commits

Author SHA1 Message Date
SBiOSoftWhare 896f78930b RoomVC: Fix typo. 2021-10-28 18:51:25 +02:00
SBiOSoftWhare 988dff272e RoomVC: Prevent retain cycles. 2021-10-28 17:41:16 +02:00
SBiOSoftWhare 38514553c1 Rename UniversalLinkPresentationParameters to ScreenPresentationParameters. 2021-10-21 10:00:37 +02:00
SBiOSoftWhare c49fe6cd7c Merge develop into 4734_room_stack 2021-10-20 11:14:52 +02:00
SBiOSoftWhare 3959b40d12 RoomVC: Fix typo. 2021-10-20 09:21:02 +02:00
SBiOSoftWhare 9418f93230 RoomVC: Update with UniversalLinkPresentationParameters. 2021-10-20 07:32:04 +02:00
ismailgulek eef9c43798 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 16:40:34 +03:00
SBiOSoftWhare cd6534e219 RoomVC: Remove temporary space universal link handling. 2021-10-19 12:29:59 +02:00
Stefan Ceriu ab30801310 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 0621efbf21 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 b396a8dde3 vector-im/element-ios/issues/5009 - Fixed share extension setup and cleaned up code. 2021-10-18 16:40:53 +03:00
Stefan Ceriu 44d8b1762a vector-im/element-ios/issues/5009 - Moved files around, cleaned up imports and logs. 2021-10-18 16:40:53 +03:00
Stefan Ceriu 1ea5bae14a 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 4e4e0bd9be Merge branch 'develop' into steve/4734_room_stack 2021-10-14 16:21:03 +02:00
ismailgulek a3a78cdbf2 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-13 14:34:20 +03:00
Stefan Ceriu 6f49fbc1bb #1098 - Added extra top padding on first list item. Fixed various merge problems. 2021-10-13 11:46:43 +03:00
Stefan Ceriu 1ce7195abd #1098 - Working real user suggestion inside the main application. 2021-10-13 11:26:22 +03:00
Stefan Ceriu c06e682e23 #1098 - Added user suggestions to the main app timeline. 2021-10-13 11:25:36 +03:00
Stefan Ceriu ee9553fee5 #1098 - Generated UserSuggestion from template, got initial UI working and automatically updating. 2021-10-13 11:24:46 +03:00
SBiOSoftWhare e6c4b4342f RoomVC: Update universal link management with UniversalLinkParameters. 2021-10-12 19:12:08 +02:00
ismailgulek c415e2a0f0 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
SBiOSoftWhare a100a51249 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 e254ecc1c0 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-08 16:59:25 +03:00
Stefan Ceriu 715d1382ed vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-10-08 11:33:13 +03:00
SBiOSoftWhare 7eaaa2ed13 Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02:00
ismailgulek 027a022300 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 04bc95a85c 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 6e6f14b246 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
Gil Eluard 3a09ee688c [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard 2e2f4c638e Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard c3e2bb6880 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
David Langley 8efeae2562 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 98f73c261c Remove space 2021-09-23 09:39:09 +01:00
David Langley 35bb840d74 Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
Gil Eluard 63a4494569 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Stefan Ceriu c68bdc54b9 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Stefan Ceriu f9a4178f2a Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard 9a7a16220a Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard ba3f71ebe1 [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Stefan Ceriu c69d364ad1 Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
David Langley 8a1acece2f Merge pull request #4876 from vector-im/langleyd/4773_pause_resume_voice_messages
Add Pause/Resume support between rooms.
2021-09-22 09:38:35 +00:00
ismailgulek 2c05daf27a Adapt sentStatus changes 2021-09-22 11:41:22 +03:00
David Langley a178f587c2 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
Stefan Ceriu f94dee6025 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Gil Eluard 9715eb35d9 Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
SBiOSoftWhare 9fceb073ab Merge pull request #4814 from vector-im/steve/4734_room_vc_refacto
RoomVC: Add a delegate, factorize and reduce usage of AppDelegate
2021-09-17 15:58:05 +02:00
Gil Eluard 068f4b3ce0 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
Stefan Ceriu f1d3e5af9d Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
SBiOSoftWhare 559462003b Merge branch 'develop' into steve/4734_nav_room_stack
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
2021-09-09 16:45:35 +02:00
Doug 4a33f7f1e6 Update for PR feedback.
URLPreviewManager becomes URLPreviewService.
addVerticalWhitespaceToString used instead of heightForCellData multiple times.
All newline characters removed.
2021-09-08 15:10:13 +01:00