Commit Graph

197 Commits

Author SHA1 Message Date
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
JanNiklas Grabowski 6bf886499d MESSENGER-4390 fix private room sharing 2023-06-15 10:21:50 +02:00
Arnfried Griesert e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Arnfried Griesert d5d299a357 More tint color changes 2023-03-06 22:11:23 +01:00
Mauro Romito fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
Nicolas Mauri 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
JanNiklas Grabowski 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
Flavio Alescio 2f51f66d5e code restyle for poll detail 2023-01-31 16:03:38 +01:00
Flavio Alescio 9d0f5c208b added alert to show possible error, improved tests 2023-01-27 17:10:16 +01:00
Flavio Alescio 5ea70aacd8 added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
JanNiklas Grabowski 73ded73d25 MESSENGER-4039 new layout - add last admin function 2023-01-25 11:06:00 +00:00
Flavio Alescio 84e8d879bd added poll detail scene with mock data 2023-01-23 16:38:53 +01:00
Alfonso Grillo b582b32827 Begin PollHistoryService 2023-01-23 12:09:46 +01:00
Frank Rotermund 3aa886fb49 MESSENGER-4078 permalinks only in open rooms, better texts and icons 2023-01-16 08:06:13 +01:00
Alfonso Grillo 55714f44c7 Add changelog.d file 2023-01-13 11:04:40 +01:00
Alfonso Grillo 441e287607 Cleanup scaffolding 2023-01-12 12:06:15 +01:00
Alfonso Grillo 9385eb90cd Add poll history scaffolding 2023-01-12 11:43:29 +01:00
Alfonso Grillo 815e2fb0a3 Add poll history in room’s settings 2023-01-12 10:42:56 +01:00
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 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
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
ismailgulek c878088bdd Fix a race in room data source initializer, by adding threadId parameter in every case 2022-08-26 14:12:13 +03: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 e071ec789a Update Room Info screen back button text 2022-06-22 15:56:31 +02:00
aringenbach 137d840d11 Handle long press on back buttons 2022-06-22 15:56:31 +02:00
Frank Rotermund 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
Yoan Pintas 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
Yoan Pintas 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
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
Arnfried Griesert 966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
yostyle 5a4798be8e Hide or disable search in the encrypted rooms 2022-05-02 22:30:39 +02:00
yostyle 723ac16f34 Hide or disable search in the encrypted rooms 2022-05-02 22:30:39 +02:00
Gil Eluard c0f8458371 Wrong copy for upgrade room message (#6003)
* Wrong copy for upgrade room message

- fixed
2022-04-11 15:46:08 +02:00
Gil Eluard 4f5c8fdb9a Wrong copy for upgrade room message (#6003)
* Wrong copy for upgrade room message

- fixed
2022-04-11 15:46:08 +02:00
aringenbach 08faf850e5 Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView 2022-04-06 16:01:49 +02:00
aringenbach e21a81366e Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView 2022-04-06 16:01:49 +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 967b4429f5 Observe presence changes to update RoomInfoBasicView 2022-04-04 18:52:07 +02:00
aringenbach 781131d8f0 Observe presence changes to update RoomInfoBasicView 2022-04-04 18:52:07 +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
Frank Rotermund 61d260a8e0 Feature/2581 permalinks 2022-03-31 05:51:40 +00:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +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