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
44e46be8a0
docs: add comments
2024-09-27 13:33:23 +02:00
617d658d99
feat: change leave room info (MESSENGER-6526)
2024-09-27 11:00:03 +02:00
12837d4b89
update license
2024-09-25 12:24:52 +02:00
a3a9fc2c66
feat: foss merge changes from review
2024-08-20 12:58:18 +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
1196cee418
MESSENGER-5695 remove borders from avatar photos
2024-03-04 06:57:19 +00:00
f1e6b04542
refactoring get federation status
2024-01-25 17:23:17 +01:00
5d71ab9fce
Merge branch 'develop' into feature/5204_fix_federation_pill_appearance
...
* develop:
MESSENGER-5410 change default setting
fix pipeline
MESSENGER-5410 add room federation setting
MESSENGER-5410 add toggle to room settings and refactor toggle view
MESSENGER-5410 refactor set federation acls when creating room
# Conflicts:
# Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
2024-01-15 13:59:48 +01:00
8a53e455c7
MESSENGER-5204 fix federation pill appearance
2024-01-12 16:42:03 +01:00
ae892ca5f4
Merge branch 'develop' into 'feature/5410_federation_us15_room_settings'
...
# Conflicts:
# bwi/Federation/MXRoom+Federation.swift
2024-01-11 11:57:57 +00:00
72e027cd76
MESSENGER-5410 add room federation setting
2024-01-11 11:07:35 +01:00
7a378ed99c
MESSENGER-5204 us05 add federation icons user details view
2023-12-18 16:17:40 +01:00
84a087e951
Removed adress label and enabled multiline for room names
2023-11-24 06:44:27 +01:00
12087babd4
Pill heigh set to 20px
2023-11-14 12:49:19 +01:00
f662d519be
Set federation pill height to 16px
2023-11-14 11:14:03 +01:00
9054a802d8
Small gap removed at the bottom of the federation icon
2023-11-14 11:01:23 +01:00
03312447ce
Pill size adjustment
2023-11-14 06:40:31 +01:00
55084fd91a
Added federation indicator to room info screen
2023-11-13 12:39:33 +01:00
628d420dd9
MESSENGER 5236 remove grey green and red shield for room and user avatar
2023-10-27 14:37:22 +02:00
a1ba3a8c9b
MESSENGER-4883 fix update room avatar
2023-07-10 18:12:31 +02:00
6da2e871d0
MESSENGER-4743 fix removing room avatar
2023-06-20 12:19:28 +02:00
6bf886499d
MESSENGER-4390 fix private room sharing
2023-06-15 10:21:50 +02:00
e5d97ed154
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
d5d299a357
More tint color changes
2023-03-06 22:11:23 +01:00
fc1c22c08c
refactor completed
2023-03-06 14:59:03 +01:00
71281ce1cc
Direct Message: manage encrypted DM in case of invite by email
...
- Don’t allow to invite more than one contact by email
- The DM will be created by enabling the encryption when the HS promotes the encryption
- The chat composer is disabled until a matrix account is created by using the invited email
2023-02-27 18:42:18 +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
9d0f5c208b
added alert to show possible error, improved tests
2023-01-27 17:10:16 +01:00
5ea70aacd8
added view in timeline action, added tests
2023-01-27 15:07:32 +01:00
73ded73d25
MESSENGER-4039 new layout - add last admin function
2023-01-25 11:06:00 +00:00
84e8d879bd
added poll detail scene with mock data
2023-01-23 16:38:53 +01:00
b582b32827
Begin PollHistoryService
2023-01-23 12:09:46 +01:00
3aa886fb49
MESSENGER-4078 permalinks only in open rooms, better texts and icons
2023-01-16 08:06:13 +01:00
55714f44c7
Add changelog.d file
2023-01-13 11:04:40 +01:00
441e287607
Cleanup scaffolding
2023-01-12 12:06:15 +01:00
9385eb90cd
Add poll history scaffolding
2023-01-12 11:43:29 +01:00
815e2fb0a3
Add poll history in room’s settings
2023-01-12 10:42:56 +01:00
86aa5365bb
MESSENGER-3352 build settings
2022-10-27 09:06:24 +00:00
f9409804b1
Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
...
# Conflicts:
# Config/AppVersion.xcconfig
# Config/BuildSettings.swift
# DesignKit/Source/ColorsSwiftUI.swift
# DesignKit/Source/FontsSwiftUI.swift
# DesignKit/Source/ThemeV2.swift
# DesignKit/Variants/Colors/Dark/DarkColors.swift
# DesignKit/Variants/Colors/Light/LightColors.swift
# Podfile.lock
# Riot/Assets/de.lproj/InfoPlist.strings
# Riot/Assets/de.lproj/Vector.strings
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Images.swift
# Riot/Generated/Strings.swift
# Riot/Managers/PushNotification/PushNotificationService.m
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Communities/Home/GroupHomeViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/SetPinCode/PinCodePreferences.swift
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/TabBar/MasterTabBarController.h
# Riot/Modules/TabBar/MasterTabBarController.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
# fastlane/Fastfile
# project.yml
2022-09-19 14:42:25 +02:00
226e55caf7
MESSENGER-3304 string in separate files
2022-09-19 11:53:45 +02:00
c878088bdd
Fix a race in room data source initializer, by adding threadId parameter in every case
2022-08-26 14:12:13 +03:00
ecdd1e3a48
MESSENGER-3310 use local personal note avatar and remove url of old rooms
2022-07-22 16:50:46 +02:00
e071ec789a
Update Room Info screen back button text
2022-06-22 15:56:31 +02:00
137d840d11
Handle long press on back buttons
2022-06-22 15:56:31 +02:00
1ab51f37f8
Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
...
# Conflicts:
# Config/AppIdentifiers.xcconfig
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot/Assets/de.lproj/Vector.strings
# Riot/Generated/Images.swift
# Riot/Modules/Analytics/DecryptionFailureTracker.m
# Riot/Modules/Application/LegacyAppDelegate.h
# Riot/Modules/Onboarding/OnboardingCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/RoomViewController.m
# Riot/SupportingFiles/Info.plist
# Riot/Utils/EventFormatter.m
# Riot/Utils/Tools.h
# Riot/Utils/Tools.m
# Riot/target.yml
# RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
# fastlane/Fastfile
# project.yml
2022-06-12 19:49:46 +02:00
5a69c01274
Merge pull request #6098 from vector-im/yostyle/disable_search_encrypted_rooms
...
Hide or disable search in the encrypted rooms
2022-05-16 23:24:06 +02:00
46930060ec
Merge pull request #6098 from vector-im/yostyle/disable_search_encrypted_rooms
...
Hide or disable search in the encrypted rooms
2022-05-16 23:24:06 +02:00
JanNiklas Grabowski
Mauro Romito
Stefan Ceriu
Arnfried Griesert
Arnfried Griesert
Nicolas Mauri
Flavio Alescio
Alfonso Grillo
Frank Rotermund
ismailgulek
aringenbach
Yoan Pintas