Commit Graph

67 Commits

Author SHA1 Message Date
JanNiklas Grabowski 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
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Gil Eluard 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
Gil Eluard 9dfa20f767 Fail to open a sub space #5965 (#6080)
* Fail to open a sub space #5965

- Fixed
2022-05-03 11:22:15 +02:00
Gil Eluard 1adfa904ae Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
Gil Eluard 75a5be19e9 Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
Gil Eluard 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
Gil Eluard 67b0df922f 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
Gil Eluard 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
Gil Eluard 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
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 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
Gil Eluard dcebd89fdf selection impossible when filtering in add room screen #5757 (#5758)
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
Gil Eluard d38c3e51da SP3.2: Long press on rooms in space room lists #5232
- Update after review
2022-02-27 23:13:14 +01:00
Gil Eluard 03ed36fc7e SP3.2: Long press on rooms in space room lists #5232
- Update after review
2022-02-27 23:13:14 +01:00
Gil Eluard 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
Gil Eluard 3d5bec683f 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
Gil Eluard 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
Gil Eluard 802ba5f2e6 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
Gil Eluard a09436978a SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 10:47:44 +01:00
Gil Eluard 28ed10c309 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 10:47:44 +01:00
Gil Eluard 269b2f5aa5 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Gil Eluard 408527e106 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Gil Eluard 383f199aee SP3.2: Long press on rooms in space room lists #5232
- Small tweaks
2022-02-06 21:29:25 +01:00
Gil Eluard 3f08a5afd3 SP3.2: Long press on rooms in space room lists #5232
- Small tweaks
2022-02-06 21:29:25 +01:00
Gil Eluard 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
Gil Eluard 1153e2ec6f 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
Gil Eluard 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
Gil Eluard cb7b581fc8 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
Gil Eluard 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
Gil Eluard ea2b6af636 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
Stefan Ceriu 7161b99d1c vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 49c787d987 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Gil Eluard 1fb13415f9 SP2: Adding Rooms to Spaces element-ios#5230
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
2021-12-23 14:08:00 +01:00
Gil Eluard 7e09ccbf6e SP2: Adding Rooms to Spaces element-ios#5230
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
2021-12-23 14:08:00 +01:00
Gil Eluard 02883d81ce Invite to Space in room landing #5225
- UI tweaks for members and explore rooms screens
2021-12-15 15:53:21 +01:00
Gil Eluard 6817548452 Invite to Space in room landing #5225
- UI tweaks for members and explore rooms screens
2021-12-15 15:53:21 +01:00
Gil Eluard 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
Gil Eluard 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
Gil Eluard e399cb5652 Support pagination in the Space Summary API
- Update after review
2021-10-27 10:27:13 +02:00
Gil Eluard 5ecfc32ace Support pagination in the Space Summary API
- Update after review
2021-10-27 10:27:13 +02:00
Gil Eluard 73d829d10b Support pagination in the Space Summary API
- Revert test tweaks
2021-10-26 14:44:51 +02:00
Gil Eluard d413c4310f Support pagination in the Space Summary API
- Revert test tweaks
2021-10-26 14:44:51 +02:00
Gil Eluard a6625e6ab3 Support pagination in the Space Summary API
- Move back to default iOS activity indicator
2021-10-26 14:40:51 +02:00
Gil Eluard 49b48b3e05 Support pagination in the Space Summary API
- Move back to default iOS activity indicator
2021-10-26 14:40:51 +02:00
Gil Eluard 9c0184fdc5 Support pagination in the Space Summary API 2021-10-12 20:48:30 +02:00
Gil Eluard b34418e328 Support pagination in the Space Summary API 2021-10-12 20:48:30 +02:00
Gil Eluard 49f815ce9d [spaces] several fixes for pre release
- [When switching spaces, user and room tabs are not populated](https://github.com/vector-im/element-ios/issues/4889)
- [Explore rooms list in space has odd ordering](https://github.com/vector-im/element-ios/issues/4890)
- Fixed Coming Soon error for Explore rooms
2021-09-22 16:57:31 +02:00