Commit Graph

45 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
Arnfried Griesert 1196cee418 MESSENGER-5695 remove borders from avatar photos 2024-03-04 06:57:19 +00:00
JanNiklas Grabowski 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
JanNiklas Grabowski 8a53e455c7 MESSENGER-5204 fix federation pill appearance 2024-01-12 16:42:03 +01:00
JanNiklas Grabowski 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
JanNiklas Grabowski 72e027cd76 MESSENGER-5410 add room federation setting 2024-01-11 11:07:35 +01:00
JanNiklas Grabowski 7a378ed99c MESSENGER-5204 us05 add federation icons user details view 2023-12-18 16:17:40 +01:00
Arnfried Griesert 84a087e951 Removed adress label and enabled multiline for room names 2023-11-24 06:44:27 +01:00
Arnfried Griesert 12087babd4 Pill heigh set to 20px 2023-11-14 12:49:19 +01:00
Arnfried Griesert f662d519be Set federation pill height to 16px 2023-11-14 11:14:03 +01:00
Arnfried Griesert 9054a802d8 Small gap removed at the bottom of the federation icon 2023-11-14 11:01:23 +01:00
Arnfried Griesert 03312447ce Pill size adjustment 2023-11-14 06:40:31 +01:00
Arnfried Griesert 55084fd91a Added federation indicator to room info screen 2023-11-13 12:39:33 +01:00
JanNiklas Grabowski a1ba3a8c9b MESSENGER-4883 fix update room avatar 2023-07-10 18:12:31 +02:00
JanNiklas Grabowski 6da2e871d0 MESSENGER-4743 fix removing room avatar 2023-06-20 12:19:28 +02:00
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Frank Rotermund ecdd1e3a48 MESSENGER-3310 use local personal note avatar and remove url of old rooms 2022-07-22 16:50:46 +02:00
aringenbach 5691c5669e Setup a dedicated listener owned by PresenceIndicatorView 2022-05-12 10:55:00 +02:00
aringenbach a5fd8f7417 Setup a dedicated listener owned by PresenceIndicatorView 2022-05-12 10:55:00 +02:00
aringenbach e634d181ad Update MXPresence to NS_ENUM 2022-04-06 15:23:36 +02:00
aringenbach 8a9315c220 Update MXPresence to NS_ENUM 2022-04-06 15:23:36 +02:00
aringenbach 38363b1832 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach 10cebea479 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach f776b335ef Display presence in RoomInfoBasicView 2022-04-04 18:52:07 +02:00
aringenbach a64f2f7eac Display presence in RoomInfoBasicView 2022-04-04 18:52:07 +02:00
Stefan Ceriu 03874a0f92 Removed unnecessary and cropped room info avatar shadow. 2022-03-01 16:43:46 +02:00
Stefan Ceriu b657e51267 Removed unnecessary and cropped room info avatar shadow. 2022-03-01 16:43:46 +02:00
ismailgulek c111ba9caf Remove unnecessary layoutIfNeeded 2020-10-07 15:30:41 +03:00
ismailgulek 38376cdbeb Remove unnecessary layoutIfNeeded 2020-10-07 15:30:41 +03:00
ismailgulek e5a6075cf1 Read constants from an enum 2020-10-07 15:26:30 +03:00
ismailgulek f032a23f0d Read constants from an enum 2020-10-07 15:26:30 +03:00
ismailgulek cce9a52607 Apply design decisions 2020-10-06 22:48:04 +03:00
ismailgulek 54557ab071 Apply design decisions 2020-10-06 22:48:04 +03:00
ismailgulek bff0e15be9 Use ReadMoreTextView for room tpic 2020-10-06 17:32:28 +03:00
ismailgulek 6dcfcf7d7b Use ReadMoreTextView for room tpic 2020-10-06 17:32:28 +03:00
ismailgulek 2d85a78896 Replace label with a text view 2020-10-06 00:53:58 +03:00
ismailgulek 69fa2fdb90 Replace label with a text view 2020-10-06 00:53:58 +03:00
ismailgulek 53bedc9c63 Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-09-23 18:24:25 +03:00
ismailgulek ffeaa1e32e Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-09-23 18:24:25 +03:00
ismailgulek 4a945082a7 Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-09-23 18:24:12 +03:00
ismailgulek 5499619eb8 Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-09-23 18:24:12 +03:00
ismailgulek 7ab0cfe3b0 Stop using a cell for basic info, remove unneccessary GroupedTableViewCell 2020-09-23 13:35:34 +03:00
ismailgulek 4c161752c4 Stop using a cell for basic info, remove unneccessary GroupedTableViewCell 2020-09-23 13:35:34 +03:00