Commit Graph

748 Commits

Author SHA1 Message Date
Stefan Ceriu fc3e70891a 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 e6327eb955 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 b41cd1e1a4 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
Stefan Ceriu 9957f8f59a 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 4068c1a55f Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard 3c0a4c0633 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Gil Eluard 1403d464ee [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 cc8b6a8d75 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
Stefan Ceriu 4dd70594cc 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 e8ff4e9154 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
David Langley d189c4d618 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 6335acc0cd 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 9279d17226 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 21f5d73b6f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Gil Eluard 5f8de45e25 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Doug cf9b69c266 Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Doug e0bda2360b Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Gil Eluard 6caad7f61c [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard 99cbeab6f3 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard aa931a3c1a [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Gil Eluard de09af397f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Stefan Ceriu ee417c21d8 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Stefan Ceriu 62cdb29331 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
David Langley a962dfff29 Always get the identifier from the theme. 2021-09-10 11:14:42 +01:00
David Langley 0d241ddf84 Always get the identifier from the theme. 2021-09-10 11:14:42 +01:00
David Langley ebcaa37568 get theme id from theme, always republish theme updates. 2021-09-10 10:54:50 +01:00
David Langley 869c45c11f get theme id from theme, always republish theme updates. 2021-09-10 10:54:50 +01:00
David Langley eaedefa3c2 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00
David Langley 59a54654b1 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00
Doug 60108e8ef8 Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01:00
Doug 546c1e10ca Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01:00
Doug 13ddb8cfaf Merge pull request #4790 from vector-im/doug/888_add_url_previews
Add URL previews as a Labs feature
2021-09-08 17:19:41 +01:00
Doug a1e508c4ce Merge pull request #4790 from vector-im/doug/888_add_url_previews
Add URL previews as a Labs feature
2021-09-08 17:19:41 +01:00
Doug ecf9503dc9 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
Doug 1963f35d30 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
ismailgulek 591b29b644 Remove forgotten Jitsi call property and function 2021-09-08 14:07:19 +03:00
ismailgulek 58bb1cafe7 Remove forgotten Jitsi call property and function 2021-09-08 14:07:19 +03:00
ismailgulek fff8bb63ac Wait for sync response when clearing cache 2021-09-08 14:06:41 +03:00
ismailgulek bb827470a6 Wait for sync response when clearing cache 2021-09-08 14:06:41 +03:00
ismailgulek cd7b75a30c Listen for recents data ready notification in an async method 2021-09-08 11:21:04 +03:00
ismailgulek 7fe5b9c6c8 Listen for recents data ready notification in an async method 2021-09-08 11:21:04 +03:00
Doug f92fae96d0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug bb98bbe1c0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
ismailgulek c22527b9f6 Wait for the room list data to be ready to hide launch animation 2021-09-07 18:23:23 +03:00
ismailgulek c86ced6dc4 Wait for the room list data to be ready to hide launch animation 2021-09-07 18:23:23 +03:00
Stefan Ceriu 7d6a1cac40 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
Stefan Ceriu 8f46e037f2 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
Doug 1781258416 Clear the URL preview manager's store when clearing caches. 2021-09-03 12:12:44 +01:00
Doug 29daec8173 Clear the URL preview manager's store when clearing caches. 2021-09-03 12:12:44 +01:00