Commit Graph

484 Commits

Author SHA1 Message Date
SBiOSoftWhare 860e7dbae2 Merge develop into steve/5020_matrixkit_merge 2021-11-30 16:16:52 +01:00
SBiOSoftWhare e6ef1be7b6 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
SBiOSoftWhare fe84f0d862 Remove MatrixKit import from Swift files. 2021-11-29 17:50:30 +01:00
SBiOSoftWhare e3de692c85 Remove unnecessary MatrixKit imports. 2021-11-29 17:45:35 +01:00
David Langley 67c22b9c5e Update Riot/Managers/PushNotification/PushNotificationService.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-11-26 14:57:58 +00:00
David Langley f3938739fa Restore the pushkit token after login/logout when configuring PushKit 2021-11-26 12:52:40 +00:00
Doug c946f2962a Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
Stefan Ceriu 1ea0308895 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
Phl-Pro ea322e1526 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
SBiOSoftWhare 2a2f0fcfe9 Merge branch 'hotfix/1.6.7' into hotfix/1.6.7_2 2021-11-03 17:22:21 +01:00
Gil Eluard 26b41ca1d7 Set Show All Rooms to true by default #5076 2021-11-02 07:00:12 +01:00
SBiOSoftWhare 9568c29401 Weakify strong reference delegates. 2021-10-29 12:23:06 +02:00
Philippe Loriaux af20d24960 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Doug 0514b0bddc Address Steve's comments. 2021-10-20 19:29:23 +01:00
Doug af2f36a862 Use footers for app and discovery information.
Remove Invite Friends button from settings.
Reorganise Advanced and Other settings.
Rename Other to About.
2021-10-20 17:40:39 +01:00
ismailgulek eef9c43798 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 16:40:34 +03:00
ismailgulek 587bfc06d7 Introduce RiotSettings.showAllRoomsInHomeSpace and adapt changes in filter options 2021-10-19 16:36:43 +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
ismailgulek b5594dabac Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-15 12:07:21 +03:00
Doug 1249b8c172 Re-enable link detection in clearStore instead of via NotificationCenter. 2021-10-14 14:24:01 +01:00
Doug ca61b1cd04 Add observer to re-enable link detection when signing out of an account. 2021-10-13 16:01:19 +01:00
Doug 2080a28563 Use MXError and MXHTTPOperation where possible. 2021-10-13 14:51:50 +01:00
Doug 90b3b71874 Stop requesting URL previews if the feature has been disabled on the homeserver. 2021-10-13 12:51:15 +01:00
ismailgulek c415e2a0f0 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
ismailgulek e254ecc1c0 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-08 16:59:25 +03:00
Doug 4e0c76885d Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
Doug a50027e76d Track an analytics value on accept/decline of an identity server. 2021-10-05 17:19:19 +01:00
ismailgulek 6edcce1b23 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-05 13:48:25 +03:00
manuroe dff3da0b35 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
Doug 95868e50b0 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
ismailgulek 027a022300 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 010178f397 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +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
Doug 83db774313 Merge pull request #4924 from vector-im/doug/4896_url_previews_string_whitespace
Use attributed string whitespace for URL previews.
2021-09-29 16:18:31 +01:00
Doug a0af63131f Conform URLPreviewData to MXKURLPreviewDataProtocol. 2021-09-29 12:12:25 +01:00
Doug 0764252138 Check whether URL previews should be shown in a single location.
Reset all cell data when this setting is changed to force a refresh.
Rename `hasClosedPreview(from:)` to `shouldShowPreview(for:)` for clarity and potentially adding more rules at a later date.
2021-09-29 11:39:11 +01:00
ismailgulek 6e6f14b246 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
Gil Eluard 694dcfc891 App may not start in 1.6.0 #4919
- Update after review
2021-09-28 15:22:30 +02:00
Gil Eluard 7d90125309 App may not start in 1.6.0 #4919
- Update after review
2021-09-28 14:45:34 +02:00
Gil Eluard 4e31cd588d App may not start in 1.6.0 #4919
- Fixed
2021-09-28 13:07:10 +02:00
ismailgulek 761cb03e61 Post a notification when RiotSettings updated 2021-09-23 16:55:00 +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 9715eb35d9 Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
David Langley 3ffe69ffee Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-20 08:50:38 +01:00
Doug 0915d01b43 Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
David Langley 9724bfe8e8 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01: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
Gil Eluard d3da21f1d7 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Stefan Ceriu f1d3e5af9d Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
David Langley 8c9a00b688 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00