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
02a0b64ec6
MESSENGER-3681 Updated birthday banner for second anniversary campaign
2022-11-16 13:32:04 +00:00
86aa5365bb
MESSENGER-3352 build settings
2022-10-27 09:06:24 +00:00
966f5299d9
merged from element 1.8.13
2022-05-05 06:57:45 +02:00
990962285a
merged element 1.8.10
2022-05-03 12:48:01 +02:00
7b690aa967
Fix vector-im/element-ios/issues/6004 - Reset home filters when switching tabs.
2022-04-12 12:49:53 +03:00
6b78ec6cae
Fix vector-im/element-ios/issues/6004 - Reset home filters when switching tabs.
2022-04-12 12:49:53 +03:00
3f34fd655a
Refactor sections as enum types
2022-04-04 09:40:26 +01:00
95284762c8
Refactor sections as enum types
2022-04-04 09:40:26 +01:00
c2108a2178
MESSENGER-2762 Initial Merge
2022-03-17 15:51:23 +01:00
32bc67e130
Fix crash when pressing tabs
2022-03-17 12:37:42 +00:00
9ade55e100
Fix crash when pressing tabs
2022-03-17 12:37:42 +00: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
4f43793313
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
24de57bb58
Instrument missing screen metrics ( #5764 )
...
* Instrument missing screen metrics
- Done
2022-03-08 10:13:46 +01:00
72e280652a
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
0abef4312e
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
fe7cdaebc2
Move invites to dedicated sections and enable section collapse ( #5683 )
...
* Display invites in dedicated sections
* Activate shrinkable and fix home number of rows for section
* Rework section header
* Display badge in people and room tabs
* Add changelog & remove useless todo
* Improve isSectionShrinked condition, remove useless import and shrinkable sets
* Restore invitation count in tab bar badge
* Display badge for invites section
* Add comment on invites count
* Update right accessory view on data source update
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr >
2022-02-28 13:48:07 +01:00
60f2355e54
Move invites to dedicated sections and enable section collapse ( #5683 )
...
* Display invites in dedicated sections
* Activate shrinkable and fix home number of rows for section
* Rework section header
* Display badge in people and room tabs
* Add changelog & remove useless todo
* Improve isSectionShrinked condition, remove useless import and shrinkable sets
* Restore invitation count in tab bar badge
* Display badge for invites section
* Add comment on invites count
* Update right accessory view on data source update
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr >
2022-02-28 13:48:07 +01:00
9c53cfd4e3
Use protocol to get title from child VCs.
2022-02-23 11:41:05 +00:00
3fd31f3c7b
Use protocol to get title from child VCs.
2022-02-23 11:41:05 +00: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
ceb74c2f6e
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
7964d314c8
Add objective C support to SwiftGen assets helpers ( #5533 )
...
* Add objective C support to SwiftGen assets helpers
* Use dot notation in ObjC & fix minor issues
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr >
2022-02-10 17:13:23 +01:00
2f6546799e
Add objective C support to SwiftGen assets helpers ( #5533 )
...
* Add objective C support to SwiftGen assets helpers
* Use dot notation in ObjC & fix minor issues
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr >
2022-02-10 17:13:23 +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
d23f24b9ce
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
1bd43f1726
Call pagination api from appropriate points
2022-01-04 04:31:18 +03:00
c938a604de
Call pagination api from appropriate points
2022-01-04 04:31:18 +03:00
315f5a9cc4
Add AnalyticsScreenTimer and track more screens.
...
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
47348b7f34
Add AnalyticsScreenTimer and track more screens.
...
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
33ef957053
Use matrix-analytics-events generated stubs (locally for now).
...
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00
d43bf82bca
Use matrix-analytics-events generated stubs (locally for now).
...
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00
a067a06071
Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
...
# Conflicts:
# Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
2a09ca3947
Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
...
# Conflicts:
# Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
d0a6b2dd11
Implement FAB journeys & rough edge warnings element-ios#5226
...
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
2021-12-10 09:59:10 +01:00
de4ed81bbc
Implement FAB journeys & rough edge warnings element-ios#5226
...
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
2021-12-10 09:59:10 +01:00
d555b0190b
vector-im/element-ios/issues/5190 - Fix crash when trying to scroll the people's tab to the top.
2021-12-09 09:39:40 +02:00
f5410b2060
vector-im/element-ios/issues/5190 - Fix crash when trying to scroll the people's tab to the top.
2021-12-09 09:39:40 +02:00
216924165d
Improve the Obj-C Generated Interface Header Name definition
2021-10-26 17:42:33 +02:00
eaa2450be7
Improve the Obj-C Generated Interface Header Name definition
2021-10-26 17:42:33 +02:00
7b0679c3ed
Simplify empty view logic
2021-10-04 17:29:04 +03:00
e17627d61c
Simplify empty view logic
2021-10-04 17:29:04 +03:00
cc46decec2
Merge branch 'develop' into ismail/4384_room_summary_store
2021-09-30 12:35:46 +03:00
6761404d2d
Merge branch 'develop' into ismail/4384_room_summary_store
2021-09-30 12:35:46 +03:00
8b80b3f4c7
vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.
2021-09-30 09:40:12 +03:00
7b75dec011
vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.
2021-09-30 09:40:12 +03:00
05d71297b5
Merge branch 'develop' into ismail/4384_room_summary_store
2021-09-28 17:30:39 +03:00
JanNiklas Grabowski
Mauro Romito
Arnfried Griesert
Stefan Ceriu
Andy Uhnak
Frank Rotermund
Gil Eluard
aringenbach
David Langley
ismailgulek
Doug
Philippe Loriaux