Commit Graph

492 Commits

Author SHA1 Message Date
Doug 6b6a58cc4a Merge pull request #5398 from vector-im/doug/5159_ftue_splash
Add a splash screen before authentication is shown
2022-01-28 15:34:26 +00:00
Doug 301fff2539 Merge pull request #5398 from vector-im/doug/5159_ftue_splash
Add a splash screen before authentication is shown
2022-01-28 15:34:26 +00:00
ismailgulek d2e5e29ad9 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek a13d5704dc Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
Doug b1ace569e7 Begin implementing an onboarding flow. 2022-01-26 14:25:48 +00:00
Doug c64d851148 Begin implementing an onboarding flow. 2022-01-26 14:25:48 +00:00
Doug b8e9179bbf Start implementing FTUE splash screens.
Present splash screens from AuthenticationViewController
2022-01-26 14:24:00 +00:00
Doug 5fb199af7c Start implementing FTUE splash screens.
Present splash screens from AuthenticationViewController
2022-01-26 14:24:00 +00:00
ismailgulek d71b9ed645 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek 9c5b83a1b3 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek f7694e27cb Fix review remarks 2022-01-25 23:59:19 +03:00
Gil Eluard b9512352a6 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
Gil Eluard d23f24b9ce Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
ismailgulek 8cee4153e5 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 81405b4dd6 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 613c5b2a7f Fix thread screen call button case 2022-01-18 03:13:22 +03:00
ismailgulek 805c1adcf4 Fix thread screen call button case 2022-01-18 03:13:22 +03:00
Gil Eluard 047342265b Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
Gil Eluard a8bcd8faa2 Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
ismailgulek 23eeedb9ac Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 26a6060e3e Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Gil Eluard f7ac4ee17d Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
Gil Eluard b4eee99d03 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
Gil Eluard 086afb1835 SP3.1: Update room settings for Spaces element-ios#5231
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
Gil Eluard ea9183d70e SP3.1: Update room settings for Spaces element-ios#5231
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
ismailgulek 7cb920e582 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
ismailgulek 948dd8eec0 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
Stefan Ceriu 7161b99d1c vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 49c787d987 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
ismailgulek ac1b79ff92 Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
ismailgulek 9cd27d293c Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
Gil Eluard b48d8443f9 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:48:36 +01:00
Gil Eluard 6fac497164 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:48:36 +01:00
Doug 5658bf97b5 Retain AnalyticsService. Fix coordinator retain cycle. 2021-12-16 17:02:58 +00:00
Doug 4b5490e1c7 Retain AnalyticsService. Fix coordinator retain cycle. 2021-12-16 17:02:58 +00:00
Doug 0ef348e2ca Address most PR comments.
Update Podfile.lock
2021-12-16 17:01:23 +00:00
Doug e642c7417e Address most PR comments.
Update Podfile.lock
2021-12-16 17:01:23 +00:00
Doug 61f5764cca Support link/html in analytics prompt strings.
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
2021-12-16 17:01:22 +00:00
Doug 2ddb17ec7b Support link/html in analytics prompt strings.
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
2021-12-16 17:01:22 +00:00
Doug ee74bc16fb Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController. 2021-12-16 17:01:22 +00:00
Doug 3cf030eb47 Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController. 2021-12-16 17:01:22 +00:00
Doug e8d02c5458 Don't read analytics opt in status from account data.
Update PostHog to 1.4.3.

Add tests for prompt type.
2021-12-16 16:59:45 +00:00
Doug b52a83e171 Don't read analytics opt in status from account data.
Update PostHog to 1.4.3.

Add tests for prompt type.
2021-12-16 16:59:45 +00:00
Doug a984028479 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
Doug efdbdcd117 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
Gil Eluard 39ba22ff57 Merge branch 'gil/5228_let_people_know_when_rooms_have_moved' into gil/5224_space_creation 2021-12-15 14:52:57 +01:00
Gil Eluard 3aaa5ba24e Merge branch 'gil/5228_let_people_know_when_rooms_have_moved' into gil/5224_space_creation 2021-12-15 14:52:57 +01:00