Commit Graph

698 Commits

Author SHA1 Message Date
MaximeE 37f305a697 Merge branch 'develop' into maximee/6029_lls_timeline_cell and apply comments 2022-04-25 15:53:58 +02:00
MaximeE 186a1c0ec2 6029: Refacto how to handle all state of the live location cell 2022-04-22 18:04:19 +02:00
SBiOSoftWhare b14b74e81b Merge branch 'develop' into steve/5723_lls_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift
2022-04-22 12:15:34 +02:00
MaximeE d9d241c58c 6029: finalise configuration of live location cell 2022-04-21 17:29:32 +02:00
MaximeE 4acf53d582 6029: Live location sharing timeline cell 2022-04-21 07:48:22 +02:00
ismailgulek fef10c01f9 Add strings 2022-04-19 13:31:43 +03:00
MaximeE 9b859eac41 Merge branch 'develop' into maximee/5982_ls_static_share_viewer 2022-04-11 17:26:07 +02:00
Gil Eluard 4f5c8fdb9a Wrong copy for upgrade room message (#6003)
* Wrong copy for upgrade room message

- fixed
2022-04-11 15:46:08 +02:00
MaximeE 171bf900c9 5982: Add string and changelog 2022-04-08 17:47:16 +02:00
aringenbach 18e2e9940b Add presence offline mode setting 2022-04-06 15:18:54 +02:00
SBiOSoftWhare c04022a76c LiveLocationSharingViewer: Add navigation title. 2022-04-06 09:41:33 +02:00
Doug 61040a4cb7 Merge pull request #5917 from vector-im/doug/5652_enable_ftue_personalisation
Enable profile personalisation screens after registration.
2022-04-05 17:43:44 +01:00
SBiOSoftWhare d406fc3164 Update strings. 2022-04-05 18:36:53 +02:00
SBiOSoftWhare 5bd5cd2baa Update strings 2022-04-05 17:44:04 +02:00
ismailgulek 54bd6bad09 Add strings 2022-04-04 16:52:40 +03:00
Doug 7d90e103ba Enable profile personalisation screens after registration. 2022-03-30 16:44:19 +01:00
ismailgulek 6304f0457f Merge branch 'develop' into ismail/5770_threads_notice 2022-03-30 13:35:14 +03:00
Andy Uhnak 4fe43da6d5 New loading indicators when creating a room 2022-03-29 17:18:11 +01:00
Andy Uhnak 1b24371337 Join room loading indicators 2022-03-29 15:03:09 +01:00
David Langley edf7830357 Merge pull request #5743 from vector-im/langleyd/5017_uisi_autoreporter
App: UISI AutoReporting
2022-03-24 14:58:23 +00:00
MaximeEvrard42 65d2e9fba4 Merge pull request #5859 from vector-im/maximee/5720_location_sharing_UI_change
Update UI in location sharing view #5720
2022-03-24 11:58:09 +01:00
aringenbach 7d81ee1398 Improve error display for Jitsi service unable to start 2022-03-22 14:03:30 +01:00
MaximeE e3060d919d 5720: Update from develop 2022-03-22 09:41:25 +01:00
Doug 3264e10323 Address PR comments
Add more docs.
Rename PhotoPickerPresenter to MediaPickerPresenter.
Use a Character for the placeholder avatar rather than a string.
2022-03-21 17:37:16 +00:00
Doug 7c012d1631 Use UserIndicatorPresenter for onboarding personalisation.
Remove the service from the display name screen to match the avatar screen.
Add a loading indicator to PhotoPickerPresenter.
Fix layout issue when selecting non-square avatar image.
2022-03-21 17:37:16 +00:00
ismailgulek 613fab7926 Add strings 2022-03-18 12:57:47 +03:00
MaximeE 1966d6b796 5720: Update UI in location sharing View 2022-03-17 16:52:22 +01:00
SBiOSoftWhare f9ec4fddd5 Add live location banner strings. 2022-03-17 16:37:32 +01:00
David Langley 712a9bee13 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/5017_uisi_autoreporter 2022-03-16 21:45:33 +00:00
David Langley d53c90f47c Update detector to match web implementation(only track decryption attempts), add labs flag, increase rate limit spacing. 2022-03-16 17:47:41 +00:00
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak e0adc29903 Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24: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
Arnaud Ringenbach e300d6ea6f Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 6ccf209ed8 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +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
Gil Eluard 8d31cbc0f9 Merge branch 'gil/SP1_space_creation' of github.com:vector-im/element-ios into gil/SP1_space_creation 2022-03-04 13:06:27 +01:00
Gil Eluard 06bda465d9 SP4: space settings (#5730)
* SP4: Space Settings

- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
Andy Uhnak d405ef102e Track failed creation of attributed strings 2022-03-03 12:45:50 +00:00
Doug 4a2e002e5b Remove duplicate strings from MatrixKit
And a few from Vector for en and pr
2022-03-03 09:34:54 +00:00
Doug 62a37dd0e2 Merge MatrixKit strings into Vector strings. 2022-03-03 09:34:54 +00:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 802ba5f2e6 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2022-02-25 14:31:22 +01:00
Anderas a5f3987bd1 Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
Gil Eluard 079d50e733 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Podfile.lock
2022-02-21 17:57:58 +01: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
Gil Eluard 82d6968091 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
#	RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
2022-02-21 15:27:05 +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
Stefan Ceriu 993269447a vector-im/element-ios/issues/5609 - Add open in OSM location sharing option. 2022-02-17 19:11:08 +02:00
Gil Eluard 4c4df62de0 SP2: Adding Rooms to Spaces #523o
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00