b298dedc22
chore: update from foss 1.11.19 (MESSENGER-6656)
...
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19
* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
finish version++
version++
comments
update submodule
remove obsolete tests
removed unused code
update submodule
fix
Libolm removal
update license macro
update license
Prepare for new sprint
# Conflicts:
# Config/AppVersion.xcconfig
# IDETemplateMacros.plist
# LICENSE
# README.md
# Riot/Categories/MXSession+Riot.m
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
# Riot/Managers/KeyValueStorage/KeyValueStore.swift
# Riot/Managers/KeyValueStorage/KeychainStore.swift
# Riot/Managers/KeyValueStorage/MemoryStore.swift
# Riot/Managers/PushNotification/PushNotificationService.m
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Managers/Settings/Shared/RiotSharedSettings.swift
# Riot/Modules/Analytics/AnalyticsUIElement.swift
# Riot/Modules/Application/AppCoordinator.swift
# Riot/Modules/Application/LegacyAppDelegate.h
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
# Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
# Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
# Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
# Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Common/WebViewController/WebViewViewController.m
# Riot/Modules/Contacts/Details/ContactDetailsViewController.m
# Riot/Modules/Contacts/Views/ContactTableViewCell.m
# Riot/Modules/Favorites/FavouritesViewController.h
# Riot/Modules/Favorites/FavouritesViewController.m
# Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
# Riot/Modules/People/PeopleViewController.h
# Riot/Modules/People/PeopleViewController.m
# Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
# Riot/Modules/Room/DataSources/RoomDataSource.m
# Riot/Modules/Room/Files/RoomFilesViewController.m
# Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
# Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
# Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
# Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
# Riot/Modules/Rooms/RoomsViewController.h
# Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
# Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
# Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
# Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
# Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
# Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
# Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
# Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
# Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
# Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
# Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
# Riot/Modules/SetPinCode/PinCodePreferences.swift
# Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
# Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
# Riot/Modules/Settings/Security/SecurityViewController.m
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/SplitView/SplitViewCoordinator.swift
# Riot/Modules/SplitView/SplitViewCoordinatorType.swift
# Riot/Modules/StartChat/StartChatViewController.m
# Riot/Modules/TabBar/MasterTabBarController.h
# Riot/Modules/TabBar/MasterTabBarController.m
# Riot/Utils/EventFormatter.m
# Riot/Utils/HTMLFormatter.swift
# Riot/Utils/Tools.m
# RiotNSE/NotificationService.swift
2024-10-18 15:45:54 +02:00
12837d4b89
update license
2024-09-25 12:24:52 +02:00
6c22fa37f1
Merge commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5' into feature/6076_foss_merge
...
* commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5': (79 commits)
finish version++
version++
Translated using Weblate (Hungarian)
Translated using Weblate (Italian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Hungarian)
Translated using Weblate (Slovak)
Translated using Weblate (Swedish)
Translated using Weblate (Indonesian)
Translated using Weblate (Albanian)
Translated using Weblate (Estonian)
Translated using Weblate (Estonian)
updated the submodule
updated SDK
Update the SDK. (#7819 )
Prepare for new sprint
finish version++
version++
fix
Changelog.
...
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Modules/Analytics/Analytics.swift
# Riot/Modules/Analytics/DecryptionFailure.swift
# Riot/Modules/Analytics/PHGPostHogConfiguration.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewAction.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift
# Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Utils/EventFormatter.m
# Riot/Utils/Tools.m
# RiotNSE/target.yml
# fastlane/Fastfile
# project.yml
2024-08-19 12:52:38 +02:00
b691d02a20
Add support for reporting rooms on the room details screen too
2024-06-12 17:55:36 +03:00
e5d97ed154
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
fc1c22c08c
refactor completed
2023-03-06 14:59:03 +01:00
1768fb5eee
Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
...
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# fastlane/Fastfile
2023-02-15 14:56:55 +01:00
2f51f66d5e
code restyle for poll detail
2023-01-31 16:03:38 +01:00
5ea70aacd8
added view in timeline action, added tests
2023-01-27 15:07:32 +01:00
226e55caf7
MESSENGER-3304 string in separate files
2022-09-19 11:53:45 +02:00
ce4c8b186c
Expand all if and guard constructs involving @available(iOS 14... or #available(iOS 14...
...
Signed-off-by: Johannes Marbach <johannesm@element.io >
2022-06-23 10:05:46 +02:00
868fd7e0c8
Remove all @available(iOS 14... annotations
2022-06-23 09:47:38 +02:00
b2a2dba2ba
Merge develop in 6081_lls_screen_integration
2022-05-04 16:53:49 +02:00
ff11b016ed
RoomCoordinator: Handle live location viewer and stop sharing.
2022-05-03 16:04:36 +02:00
cbe2e135ba
Fail to open a sub space #5965 ( #6080 )
...
* Fail to open a sub space #5965
- Fixed
2022-05-03 11:22:15 +02:00
2a4534b4ef
RoomCoordinator: Handle live location viewer showing.
2022-04-29 11:08:09 +02:00
c0f8458371
Wrong copy for upgrade room message ( #6003 )
...
* Wrong copy for upgrade room message
- fixed
2022-04-11 15:46:08 +02:00
1adfa904ae
Add support for Apple context menus in matrix items list screens ( #5963 )
2022-04-04 20:07:06 +02:00
cd965b6db9
Not possible to join an empty room on some suggested rooms ( #5950 )
...
* “It is not possible to join an empty room” on suggested rooms in a space #5170
- Fixed
2022-03-30 19:38:05 +02:00
fadfa48f9f
Join room loading indicators
2022-03-29 15:03:09 +01:00
2cc1d3ac2e
Update suggested room preview to behave the same way in all cases #5771
...
- Done
2022-03-23 10:58:41 +01:00
7e34d777bf
RoomCoordinator: Update with new RoomViewControllerDelegate methods.
2022-03-17 16:59:30 +01:00
c747ff86ac
Add trigger to join and view room metrics events #5769
...
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
cdd66146d8
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.h
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
acf7d0de13
Instrument missing screen metrics ( #5764 )
...
* Instrument missing screen metrics
- Done
2022-03-08 10:13:46 +01:00
cf015c4ef2
selection impossible when filtering in add room screen #5757 ( #5758 )
...
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
59038e18c1
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Config/BuildSettings.swift
# Riot/Generated/Strings.swift
# Riot/Modules/Home/HomeViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
3347354216
SP4: space settings ( #5730 )
...
* SP4: Space Settings
- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
ee04e94e8b
Merge pull request #5702 from vector-im/gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
...
SP3.2 long press on rooms in space room lists
2022-03-01 08:48:20 +01:00
c84285955b
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
d38c3e51da
SP3.2: Long press on rooms in space room lists #5232
...
- Update after review
2022-02-27 23:13:14 +01:00
90456491bb
Update Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2022-02-27 22:57:27 +01:00
5df9a66a12
Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
2022-02-25 14:31:22 +01:00
f9b008e684
Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Podfile.lock
2022-02-21 17:57:58 +01:00
ff685a4c37
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/People/PeopleViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
b6fca44b8f
Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
# RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
2022-02-21 15:27:05 +01:00
c62bb5398a
SP2: Adding Rooms to Spaces #523o
...
- update after review
2022-02-17 14:02:52 +01:00
a09436978a
SP2: Adding Rooms to Spaces #523o
...
- update after review
2022-02-17 10:47:44 +01:00
269b2f5aa5
SP2: Adding Rooms to Spaces #523o
...
- update after review
2022-02-15 22:23:12 +01:00
1ab7643de1
Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.
2022-02-10 08:43:18 +02:00
383f199aee
SP3.2: Long press on rooms in space room lists #5232
...
- Small tweaks
2022-02-06 21:29:25 +01:00
d62549141d
Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
...
# Conflicts:
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
2022-02-06 21:22:28 +01:00
ae27b06f0d
Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces
2022-02-05 21:43:29 +01:00
eaea03a256
SP2: Adding Rooms to Spaces #523o
...
- check permission before adding room
- Added join button in explore room screens
2022-02-05 08:20:39 +01:00
57999c30db
Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces
2022-02-04 16:43:43 +01:00
a71f800579
SP1.2: Invite to Space in room landing element-ios#5225
...
- Update after review
2022-02-03 23:44:07 +01:00
b9512352a6
Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
...
# Conflicts:
# Riot/Generated/Strings.swift
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
# Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
0df14b165b
SP3.2: Long press on rooms in space room lists #5232
...
- Added context menu for spaces and rooms in Explore rooms screen
2022-01-17 16:44:40 +01:00
f7ac4ee17d
Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
086afb1835
SP3.1: Update room settings for Spaces element-ios#5231
...
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
JanNiklas Grabowski
Mauro Romito
Stefan Ceriu
Arnfried Griesert
Flavio Alescio
Frank Rotermund
Johannes Marbach
SBiOSoftWhare
Gil Eluard
Andy Uhnak