Commit Graph

111 Commits

Author SHA1 Message Date
Arnfried Griesert 28852aa790 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Arnfried Griesert 8f8741c903 More tint color changes 2023-03-06 22:11:23 +01:00
Mauro Romito 09daa04dd4 refactor completed 2023-03-06 14:59:03 +01:00
Nicolas Mauri de2819ae60 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 b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' 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 7b4333e9af code restyle for poll detail 2023-01-31 16:03:38 +01:00
Flavio Alescio bb384f837e added alert to show possible error, improved tests 2023-01-27 17:10:16 +01:00
Flavio Alescio 21eafa2383 added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
JanNiklas Grabowski 0f22ac9855 MESSENGER-4039 new layout - add last admin function 2023-01-25 11:06:00 +00:00
Flavio Alescio 333cba0606 added poll detail scene with mock data 2023-01-23 16:38:53 +01:00
Alfonso Grillo 3f343a028b Begin PollHistoryService 2023-01-23 12:09:46 +01:00
Frank Rotermund cc5a9ed847 MESSENGER-4078 permalinks only in open rooms, better texts and icons 2023-01-16 08:06:13 +01:00
Alfonso Grillo bd85e7aa20 Add changelog.d file 2023-01-13 11:04:40 +01:00
Alfonso Grillo e7adb92b77 Cleanup scaffolding 2023-01-12 12:06:15 +01:00
Alfonso Grillo b9bf4376db Add poll history scaffolding 2023-01-12 11:43:29 +01:00
Alfonso Grillo 5b47b99dce Add poll history in room’s settings 2023-01-12 10:42:56 +01:00
Arnfried Griesert 4f407e6923 MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 09a0f6334c Merge commit '80bda1906235b6007b98f18fb13681fff587f4a3' 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 0a2fd53134 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
ismailgulek e5db15af08 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 a6d9e8e8c5 MESSENGER-3310 use local personal note avatar and remove url of old rooms 2022-07-22 16:50:46 +02:00
aringenbach bbf6fd2254 Update Room Info screen back button text 2022-06-22 15:56:31 +02:00
aringenbach e18a58846c Handle long press on back buttons 2022-06-22 15:56:31 +02:00
Frank Rotermund ec12c42c54 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 4d96e478bd 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 231fc52e45 Setup a dedicated listener owned by PresenceIndicatorView 2022-05-12 10:55:00 +02:00
Arnfried Griesert 1de0866158 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Arnfried Griesert f1becdd999 merged element 1.8.10 2022-05-03 12:48:01 +02:00
yostyle 9ed151cbfd Hide or disable search in the encrypted rooms 2022-05-02 22:30:39 +02:00
Gil Eluard 728a80f328 Wrong copy for upgrade room message (#6003)
* Wrong copy for upgrade room message

- fixed
2022-04-11 15:46:08 +02:00
aringenbach 2dc926a253 Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView 2022-04-06 16:01:49 +02:00
aringenbach 16c95c1b3d Update MXPresence to NS_ENUM 2022-04-06 15:23:36 +02:00
aringenbach 4738263ad1 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach 282b433bba Observe presence changes to update RoomInfoBasicView 2022-04-04 18:52:07 +02:00
aringenbach fb81076ca1 Display presence in RoomInfoBasicView 2022-04-04 18:52:07 +02:00
Frank Rotermund 11589b1626 Feature/2581 permalinks 2022-03-31 05:51:40 +00:00
Frank Rotermund 37d97d09db MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard 6dce767666 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 27571866b5 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 25c21e9653 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 da9c921efb Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard dfda5f09d9 Merge branch 'gil/SP1_space_creation' of github.com:vector-im/element-ios into gil/SP1_space_creation 2022-03-04 13:06:27 +01:00
Gil Eluard bc55dbb11b SP4: space settings (#5730)
* SP4: Space Settings

- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
Andy Uhnak e39456f758 Enable home and room user indicators 2022-03-01 15:50:24 +00:00
Stefan Ceriu 42e83d5d0d Removed unnecessary and cropped room info avatar shadow. 2022-03-01 16:43:46 +02:00
Gil Eluard cfb9021b92 Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 5387a96f1a SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Andy Uhnak 3f82e61723 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 8fd164bfc5 Rename properties and arguments 2022-02-22 16:44:22 +00:00
Andy Uhnak e4993d8ef1 Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00