Commit Graph

75 Commits

Author SHA1 Message Date
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri e3b1880f49 Fix: text color of the last event description was incorrect. 2023-05-12 17:15:20 +02: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
Flescio 1a33d6976d "Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352)
* fix green dot only to appear for marked action
2023-02-09 09:01:16 +01:00
Flavio Alescio 63faaaf19d room set manually unread style without notification count 2023-01-25 11:05:54 +01:00
Frank Rotermund d9057cd0cb Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Yoan Pintas f6670ec5d0 Update the room description in the rooms list in case of live broadcast (incoming or outgoing) (#7160) 2022-12-19 19:26:55 +01:00
Arnfried Griesert 4f407e6923 MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Arnfried Griesert 59abc062fc Patch from notification mentions bugfix in bwm 2022-09-22 16:36:18 +02:00
Arnfried Griesert c3faaf0d1d Feature/2611 Notifications on mentions 2022-09-22 06:18:25 +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 af26343723 MESSENGER-2611 color mentions buildfix 2022-09-19 11:59:51 +02:00
Frank Rotermund 485e663048 MESSENGER-2611 color mentions 2022-09-19 11:59:09 +02:00
Gil Eluard 5ec679c564 Updated empty states as per latest design update 2022-09-05 16:06:31 +02:00
Gil Eluard 379e959bfc Merge pull request #6669 from vector-im/gil/6512-Last_message_time_ellipsis
Last message time ellipsis
2022-09-05 12:43:29 +02:00
Gil Eluard bd91718840 Last message time ellipsis
- Fixed
2022-09-05 10:27:23 +02:00
Gil Eluard df083edd54 Fixed UI glitches in dark mode
- Update after review
- Better theme support for `RoundedToastView`
- Better theme support for `RecentsInvitesTableViewCell`
2022-09-03 22:03:54 +02:00
Gil Eluard c48121c499 Fixed UI glitches in dark mode 2022-09-02 14:23:46 +02:00
Gil Eluard 85ebac545a Glitchy room list header when scrolling
- fixed
2022-09-01 16:56:18 +02:00
Gil Eluard 6b555f5754 App Layout: last UI tweaks before RC 2022-08-23 20:50:12 +02:00
Gil Eluard a4c0ae2c34 New App Layout: added suppport for room invites in the all chats screen 2022-08-22 13:00:34 +02:00
Gil Eluard dda63fcf54 New App Layout: Added missing empty states in room list and space bottom sheet 2022-08-19 17:12:33 +02:00
Gil Eluard c88f3d9302 App Layout: reintroduced existing Notification left markers on room cells 2022-08-18 17:44:24 +02:00
Gil Eluard 4de0901f36 Delight edit layout experiment (#6384)
* Delight: Edit layout experiment #6079
* Feature flag new App Layout #6406
* Update All chats screen with latest design #6407
2022-08-02 17:27:33 +02: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
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
aringenbach 231fc52e45 Setup a dedicated listener owned by PresenceIndicatorView 2022-05-12 10:55:00 +02:00
aringenbach 99076d0606 Remove observers when needed 2022-05-11 15:51:12 +02:00
aringenbach 087242993c Presence: fix live updates on Home & DM list 2022-05-11 15:07:39 +02:00
Arnfried Griesert 1de0866158 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
aringenbach 4738263ad1 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach cbae09a364 Enable presence indicator border colour update 2022-04-04 18:52:07 +02:00
aringenbach d60b30b8b6 Setup IBInspectable for indicator border width 2022-04-04 18:52:07 +02:00
aringenbach b38333617e Display presence indicator on home & DM list 2022-04-04 18:52:07 +02:00
Arnfried Griesert 14cff7162f feature/1873_unread_messanges_marker 2022-03-29 06:06:22 +00:00
SBiOSoftWhare e6ef1be7b6 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Philippe Loriaux af20d24960 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
ismailgulek c415e2a0f0 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
Doug bf69a1dd7e Fix generated avatar colours not matching Element Web. 2021-10-11 16:06:15 +01:00
ismailgulek 8c7ec9eb1e Adapt changes 2021-10-02 02:09:36 +03:00
ismailgulek 6e6f14b246 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek 045a9a4b67 Fetch room from session when needed 2021-09-23 16:56:39 +03:00
ismailgulek 2c05daf27a Adapt sentStatus changes 2021-09-22 11:41:22 +03:00
Gil Eluard 068f4b3ce0 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
Gil Eluard 14c6741e1f [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
Gil Eluard 33ba0b3e90 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 10:33:10 +02:00
Doug 4f51cf0992 Remove green border from DM avatars. 2021-08-06 12:04:19 +01:00
Gil Eluard ac174fafda [Spaces] Show suggested in room lists #4501
- Show suggested rooms section in home screen (no actions)
- Show suggested rooms section in rooms screen (no actions)
2021-07-29 23:24:34 +02:00
manuroe 7d6ef07d5f Room lists: Do not encryptedRoomIcon in the code
Let it sleep hidden in the xib
2021-03-19 09:19:02 +01:00
manuroe c128a81792 Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00