Commit Graph

187 Commits

Author SHA1 Message Date
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
Arnfried Griesert c20966c2ab Feature/1801 ruhezeit einstellungsmenu 2022-06-02 03:41:21 +00:00
Stefan Ceriu ff3d99108b #4769, #6130 - Fix filtering search bar cancel button not clearing the results. 2022-05-19 16:49:09 +03:00
Andy Uhnak 0407bb8070 Fix crash with sections 2022-05-05 09:13:31 +01:00
Arnfried Griesert 966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Andy Uhnak 1ae9e62899 Prevent crash when searching 2022-05-03 18:47:03 +01:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
ismailgulek 871b29e26d Fix search bar not appearing until second opening 2022-04-28 15:08:13 +03:00
ismailgulek 97cd957733 Fix empty view on the first screen load 2022-04-28 02:30:52 +03:00
ismailgulek 8c1d531244 Fix disappearing filter when search bar cancel tapped 2022-04-28 02:30:38 +03:00
Yoan Pintas ce94e9a978 Merge pull request #6035 from vector-im/yostyle/join_and_show_room
When accepting an invite, expecting to see the room
2022-04-15 15:16:36 +02:00
yostyle 84678b6e00 Use autojoin boolean 2022-04-15 14:27:57 +02:00
Gil Eluard a13e1124bc Room preview on a long press should not update the read receipt (#6027)
- Done
2022-04-14 10:30:51 +02:00
yostyle 247d43c99b Show room after accepting invite 2022-04-12 19:16:58 +02:00
Arnfried Griesert df5dfbc6a6 feature/2821_downtime_login_screen 2022-04-12 08:26:29 +00:00
Andy Uhnak 411279bef1 Merge branch 'develop' into andy/5619_home_reloads 2022-04-07 10:49:15 +01:00
Andy Uhnak 58e48050d8 Align style 2022-04-07 10:47:06 +01:00
Gil Eluard f92f5a5f0c Room context preview dismissed unexpectedly (#5993)
- fixed
2022-04-06 10:43:35 +02:00
Gil Eluard 75a5be19e9 Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
Andy Uhnak 87cc0d8940 Reduce the number of unnecessary home page reloads 2022-04-04 12:04:55 +01:00
Arnfried Griesert 594b22ddab 2809 force newest version 2022-03-31 05:52:47 +00:00
Andy Uhnak 4fe43da6d5 New loading indicators when creating a room 2022-03-29 17:18:11 +01:00
Gil Eluard 2ebcd78a5e Update suggested room preview to behave the same way in all cases #5771
- Done
2022-03-28 13:45:03 +03:00
Gil Eluard e80f697587 Update suggested room preview to behave the same way in all cases #5771
- Done
2022-03-23 10:58:41 +01:00
Andy Uhnak 43220de4f5 Revert optionality and always pass url 2022-03-22 14:46:27 +00:00
Frank Rotermund 4b1ca0ff7f Feature/2897 restricted user 2022-03-22 14:37:58 +00:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard bd0041c5dc Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard 67b0df922f Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 0fed5c6a73 Name changes 2022-03-10 17:32:25 +00:00
Andy Uhnak 902a227e8d Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00: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
Gil Eluard 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +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
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug 8bcab947b0 Fix emptyView never being shown in RecentsViewController. 2022-03-02 11:43:18 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
aringenbach 60f2355e54 Move invites to dedicated sections and enable section collapse (#5683)
* Display invites in dedicated sections

* Activate shrinkable and fix home number of rows for section

* Rework section header

* Display badge in people and room tabs

* Add changelog & remove useless todo

* Improve isSectionShrinked condition, remove useless import and shrinkable sets

* Restore invitation count in tab bar badge

* Display badge for invites section

* Add comment on invites count

* Update right accessory view on data source update

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-28 13:48:07 +01:00
Andy Uhnak 559bb88ae4 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 6b6b6af9a3 Enable home activity indicator
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 09:54:13 +00:00
Andy Uhnak 712d64204c Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Gil Eluard ceb74c2f6e Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Andy Uhnak 9eae7c02bb Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Gil Eluard 68d9aed0ea SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-17 14:02:52 +01:00
Andy Uhnak b0ee449c5d Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Andy Uhnak e07afc87de Merge branch 'develop' into andy/4829_activity_indicators 2022-02-16 11:32:52 +00:00
Gil Eluard 408527e106 SP2: Adding Rooms to Spaces #523o
- update after review
2022-02-15 22:23:12 +01:00
Andy Uhnak 514bdb4705 Add new loading indicators 2022-02-14 16:51:02 +00:00