Commit Graph

28 Commits

Author SHA1 Message Date
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
Gil Eluard c1f948dab6 App Layout: added space invites in space bottom sheet
- UI tweaks
2022-08-22 13:42:37 +02:00
Gil Eluard 03fc5676bb App Layout: added space invites in space bottom sheet 2022-08-21 11:07:21 +02:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard f3117fbe44 Accepting a Space Invite has shouty button labels #5175
- fixed
2022-02-01 16:41:57 +01:00
Gil Eluard ea9911cadd Accepting a Space Invite has shouty button labels #5175
- fixed
2022-02-01 16:41:57 +01:00
Gil Eluard 8fc3632863 [Spaces] M10.4.1 Home space data filtering #4570
- Added settings menu for Home space
2021-10-07 15:37:20 +02:00
Gil Eluard f9ae4f8efe [Spaces] M10.4.1 Home space data filtering #4570
- Added settings menu for Home space
2021-10-07 15:37:20 +02:00
Gil Eluard 87e2654a01 Fix performance issues with Spaces on very large accounts #4898
- Support optional `MXSpace.room` property
2021-10-07 08:48:41 +02:00
Gil Eluard 4cd31be92e Fix performance issues with Spaces on very large accounts #4898
- Support optional `MXSpace.room` property
2021-10-07 08:48:41 +02:00
Gil Eluard a04c0f5d8d Fix performance issues with Spaces on very large accounts #4898
- Support optional `MXSpace.room` property
2021-10-07 08:46:19 +02:00
Gil Eluard b9b0337985 Fix performance issues with Spaces on very large accounts #4898
- Support optional `MXSpace.room` property
2021-10-07 08:46:19 +02:00
Gil Eluard 8fd88b2053 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard 5521802bc2 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard 1403d464ee [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Gil Eluard 9279d17226 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 6335acc0cd 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 7d1d864edb [Spaces] M10.6 Space preview bottom sheet #4497
- Update after code review
2021-09-15 11:16:20 +02:00
Gil Eluard e8a2fb924d [Spaces] M10.6 Space preview bottom sheet #4497
- Update after code review
2021-09-15 11:16:20 +02:00
Gil Eluard bc0c7f36aa [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
Gil Eluard 204cccb286 [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
Gil Eluard 122b414433 [Spaces] M10.6 Space preview bottom sheet #4497
- Localized strings for space join rule
2021-09-06 08:47:43 +03:00
Gil Eluard 110ad39c6e [Spaces] M10.6 Space preview bottom sheet #4497
- Localized strings for space join rule
2021-09-06 08:47:43 +03:00
Gil Eluard fd5d96aff9 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Gil Eluard 53c3cd7fc6 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00