Commit Graph

492 Commits

Author SHA1 Message Date
Frank Rotermund f58de9e2e3 Merge branch 'feature/3310_notes_room_icon' into develop
# Conflicts:
#	bwi/BwiBuildSettings.swift
2022-07-28 12:06:21 +02:00
Frank Rotermund 41d31a5375 Feature/2854 version management 2022-07-26 15:07:22 +00:00
Frank Rotermund dcac8c8bf5 MESSENGER-3310 remove url upload for new notes rooms 2022-07-22 16:55:31 +02: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
Gil Eluard f91e84af00 Server Offline Activity Indicator (#6314)
* Server Offline Activity Indicator

- implemented
2022-07-05 14:04:52 +02:00
aringenbach 137d840d11 Handle long press on back buttons 2022-06-22 15:56:31 +02:00
Doug 87e35e8f5b Fix unresponsive soft-logout in the legacy flow. (#6329)
- Delegate logic to the OnboardingCoordinator like the new flow does.
- Reset the credentials on every presentation of authVC.
- Make sure not to set the credentials after deleting the data.
2022-06-21 17:30:10 +01:00
Doug c2f4da03cd Tidy up presentation of the onboarding flow (#6267)
Tidy up presentation of the onboarding flow now that the AuthenticationService is used as a delegate.
2022-06-13 16:48:05 +01: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
ismailgulek 83267616dd Fix latest PR comments 2022-06-09 17:36:52 +03:00
ismailgulek 0bda61da50 Fix navigation after clear data 2022-06-09 15:46:04 +03:00
ismailgulek 1e38586a4a Use softLogoutCredentials in AuthenticationService, fix blank screen before soft logout 2022-06-09 14:21:13 +03:00
ismailgulek 6d4589ae8b Pass soft logout credentials on coordinator initialization 2022-06-08 15:59:52 +03:00
ismailgulek 66dcff326b Remove old methods from onboarding coordinator and tabbar controller 2022-06-07 16:15:45 +03:00
Arnfried Griesert 966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Frank Rotermund 557848def2 MESSENGER_2910 buildfixes VII build successful 2022-05-03 16:45:58 +02:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
Gil Eluard cbe2e135ba Fail to open a sub space #5965 (#6080)
* Fail to open a sub space #5965

- Fixed
2022-05-03 11:22:15 +02:00
Gil Eluard 9dfa20f767 Fail to open a sub space #5965 (#6080)
* Fail to open a sub space #5965

- Fixed
2022-05-03 11:22:15 +02:00
yostyle ea453d130f Use autojoin boolean 2022-04-15 14:27:57 +02:00
yostyle 84678b6e00 Use autojoin boolean 2022-04-15 14:27:57 +02:00
Stefan Ceriu dd7e71a6cf Fix versionCheckCoordinator being called too early, before the views are loaded, and crashing. 2022-04-12 11:24:14 +03:00
Stefan Ceriu f219b07b28 Fix versionCheckCoordinator being called too early, before the views are loaded, and crashing. 2022-04-12 11:24:14 +03:00
Anderas d7a7b521e3 Merge pull request #5946 from vector-im/andy/5606_create_indicators
New loading indicators when creating a room
2022-03-30 11:05:43 +01:00
Anderas 0f6cd1fa4d Merge pull request #5946 from vector-im/andy/5606_create_indicators
New loading indicators when creating a room
2022-03-30 11:05:43 +01:00
Anderas 6151c56337 Merge pull request #5942 from vector-im/andy/5604_join_indicators
Join room loading indicators
2022-03-30 11:05:21 +01:00
Anderas b8931e183c Merge pull request #5942 from vector-im/andy/5604_join_indicators
Join room loading indicators
2022-03-30 11:05:21 +01:00
Gil Eluard 0f97a44a33 The "Swipe to see all rooms" hint is sometimes presented at the wrong time (#5941)
- fixed
2022-03-30 09:58:47 +02:00
Gil Eluard 1b4f594a58 The "Swipe to see all rooms" hint is sometimes presented at the wrong time (#5941)
- fixed
2022-03-30 09:58:47 +02:00
Andy Uhnak 34ad047ae4 New loading indicators when creating a room 2022-03-29 17:18:11 +01:00
Andy Uhnak 4fe43da6d5 New loading indicators when creating a room 2022-03-29 17:18:11 +01:00
Andy Uhnak fadfa48f9f Join room loading indicators 2022-03-29 15:03:09 +01:00
Andy Uhnak 1b24371337 Join room loading indicators 2022-03-29 15:03:09 +01:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Arnaud Ringenbach 3d48469e64 Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup
# Conflicts:
#	Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift
2022-03-10 10:35:20 +01:00
Arnaud Ringenbach 5ab06d9f18 Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup
# Conflicts:
#	Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift
2022-03-10 10:35:20 +01:00
Arnaud Ringenbach 61ec6a5a99 Force non-cancellable session verification when needed (account migration / interrupted authentication) 2022-03-09 11:45:03 +01:00
Arnaud Ringenbach 439743f9ff Force non-cancellable session verification when needed (account migration / interrupted authentication) 2022-03-09 11:45:03 +01:00
Gil Eluard 84ed6d9051 Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 13:19:38 +01:00
Gil Eluard 5229264d21 Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 13:19:38 +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
Gil Eluard 4f43793313 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
Andy Uhnak 180ec5ab85 Use split controller's top navigation controller to present toasts 2022-03-08 08:34:45 +00:00
Andy Uhnak eef9802e96 Use split controller's top navigation controller to present toasts 2022-03-08 08:34:45 +00:00
Andy Uhnak 1cebb4ba0d Use new activity indicators on all tabs 2022-03-04 16:51:15 +00:00
Andy Uhnak 9dbf34a308 Use new activity indicators on all tabs 2022-03-04 16:51:15 +00:00
Gil Eluard 59038e18c1 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 42b4144323 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
Andy Uhnak fb022ff6b0 Enable home and room user indicators 2022-03-01 15:50:24 +00:00
Andy Uhnak 830feeb7c0 Enable home and room user indicators 2022-03-01 15:50:24 +00:00