Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
15015 commits 46 branches 261 tags 144 MiB
Commit graph

549 commits

Author SHA1 Message Date
David Langley
0f89eb014e
Merge pull request #5743 from vector-im/langleyd/5017_uisi_autoreporter 
App: UISI AutoReporting
 2022-03-24 14:58:23 +00:00
MaximeEvrard42
5a4c5e55ee
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
d414fb1ad7 Improve error display for Jitsi service unable to start 2022-03-22 14:03:30 +01:00
MaximeE
49144e1e0e 5720: Update from develop 2022-03-22 09:41:25 +01:00
Doug
b870c5aac4 Fix missing } from rebase. 2022-03-21 17:58:39 +00:00
Doug
bf08b86a36 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
57d396887b 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
MaximeE
83a718b38d 5720: Update UI in location sharing View 2022-03-17 16:52:22 +01:00
SBiOSoftWhare
c92d1c4fd1 Add live location banner strings. 2022-03-17 16:37:32 +01:00
David Langley
4e1e9afa59 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
5c39eb2f51 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
9a4c3e485b Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak
31ec9be2ad Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Gil Eluard
996ef72498 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
059b75a957 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach
724eef1b83 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Gil Eluard
aadf1b7d67 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
cd742d972a 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
1fcf96865c
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
3ec1e80c9d Track failed creation of attributed strings 2022-03-03 12:45:50 +00:00
Doug
705b31a302 Remove MatrixKitL10n from SwiftGen 
Uses VectorL10n everywhere.
 2022-03-03 09:34:54 +00:00
Gil Eluard
89a16a72c2 Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard
d8c9d933e8 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
c7985e5a1a
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
8bd67bdc52 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
8fa0a673d6 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
df25a2ce2f 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
bf39fbf8de Update activity indicators on leaving room 
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
 2022-02-18 13:31:21 +00:00
Stefan Ceriu
26c98bbabe vector-im/element-ios/issues/5609 - Add open in OSM location sharing option. 2022-02-17 19:11:08 +02:00
Gil Eluard
f4e6b867a2 SP2: Adding Rooms to Spaces #523o 
- fixed SwiftUI Unit tests
 2022-02-17 13:14:45 +01:00
aringenbach
c57693255f
Update filter placeholder and icon (#5520) 
* Update filter placeholder and icon

* Use SwiftGen asset helper & add filter_on icon

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
 2022-02-14 10:25:21 +01:00
MaximeE
21838e54e6 Replace kick by remove in all strings 2022-02-11 14:25:20 +01:00
Doug
3943b17d57
Merge pull request #5467 from vector-im/doug/5160_ftue_use_case 
Add the FTUE use case screen for new users.
 2022-02-10 14:28:28 +00:00
Doug
07b3bf7860 Add some missing SwiftGen updates to strings. 2022-02-09 15:01:57 +00:00
Gil Eluard
f462a6e3d0 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/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
 2022-02-06 21:22:28 +01:00
Gil Eluard
96cf359703 Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
Gil Eluard
97e22f50aa SP2: Adding Rooms to Spaces #523o 
- check permission before adding room
- Added join button in explore room screens
 2022-02-05 08:20:39 +01:00
Doug
906eb48181 Tweaks to the Use Case screen ready for review. 
Update strings.
Show the custom server field as needed.
Enable scroll edges appearance for white navigation bar.
 2022-02-04 16:10:38 +00:00
Doug
d11b3e0950 Add the Use Case selection screen to the onboarding flow. 2022-02-04 16:10:38 +00:00
Gil Eluard
601ba0b472 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard
f9a1fdfe85 Merge branch 'develop' into gil/SP1_space_creation 
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
 2022-02-04 14:29:57 +01:00
Doug
43fb085521 Update strings, fix missing symbol. 2022-02-03 18:30:39 +00:00
Stefan Ceriu
7c54bf763c Made StateStoreViewModel state mutable and removed the reducer for all the features using it. 2022-02-02 10:02:12 +02:00
Gil Eluard
8fecbaf722 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
 2022-01-26 10:55:05 +01:00
Gil Eluard
e18c7e0744 SP1.2: Invite to Space in room landing element-ios#5225 
- Check user permissions to invite people
 2022-01-26 10:17:42 +01:00
Gil Eluard
afa77deef7 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
b2bf867a84 Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space 
# Conflicts:
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
 2022-01-24 09:30:05 +01:00
ismailgulek
8a1d66f49a
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek
fe9eeeadd5
Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu
2dfbe69a88 vector-im/element-ios/issues/5114 - Added UI for creating undisclosed polls and logic for displaying them in the timeline. 2022-01-18 20:05:10 +02:00