Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
14160 commits 46 branches 261 tags 144 MiB
Commit graph

14160 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gil Eluard
fa1fc3d2b0 SP3.1: Update room settings for Spaces #5231 
- Fixed SwiftUnitTests issues
 2022-02-21 15:58:27 +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
Gil Eluard
6735b6675e
Merge pull request #5548 from vector-im/gil/5230_SP2-Adding_Rooms_to_Spaces 
sp2 adding rooms to spaces
 2022-02-17 17:36:50 +01:00
Gil Eluard
7b92f8a261 SP2: Adding Rooms to Spaces #523o 
- update after review
 2022-02-17 14:02:52 +01:00
Gil Eluard
f4e6b867a2 SP2: Adding Rooms to Spaces #523o 
- fixed SwiftUI Unit tests
 2022-02-17 13:14:45 +01:00
Gil Eluard
b601d6086e SP2: Adding Rooms to Spaces #523o 
- update after review
 2022-02-17 10:47:44 +01:00
Gil Eluard
bd37bac1b2
Update RiotSwiftUI/Modules/Spaces/AddRoomSelector/Service/AddRoomItemsProcessor.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-17 10:35:23 +01:00
Gil Eluard
06590ff880 SP2: Adding Rooms to Spaces #523o 
- update after review
 2022-02-15 22:23:12 +01:00
Gil Eluard
bdf26351aa
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-15 19:16:16 +01:00
Gil Eluard
efec0507c8
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-15 19:15:04 +01:00
Gil Eluard
a916e5a3b6
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-15 19:14:30 +01:00
Gil Eluard
ebbf1c80cf
Update RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-15 19:14:04 +01:00
Gil Eluard
b9339d3d62
Update Riot/Routers/TabRouters/TabBarRouter.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-15 19:11:49 +01:00
Gil Eluard
10959ca89c
Update RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-15 19:11:35 +01:00
Gil Eluard
4a0f86ee8e Merge branch 'gil/SP1_space_creation' into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-11 11:01:26 +01:00
Gil Eluard
96b0a2e004
Merge pull request #5317 from vector-im/gil/5228_let_people_know_when_rooms_have_moved 
Let people know when rooms have moved element-ios
 2022-02-11 10:59:38 +01:00
Gil Eluard
87edf8e339 SP1.5: Let people know when rooms have moved #5228 
- Update after review
 2022-02-10 19:25:06 +01:00
Gil Eluard
c74cef51b9 SP1.5: Let people know when rooms have moved #5228 
- Update after review
 2022-02-08 23:13:17 +01:00
Gil Eluard
483b87708e SP3.1: Update room settings for Spaces #5231 
- Added missing changelog
 2022-02-06 16:12:12 +01:00
Gil Eluard
c41e541e1d SP3.1: Update room settings for Spaces #5231 
- Added list bottom padding to MatrixItemChooser view
 2022-02-06 16:08:26 +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
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
b38662a012 SP1.5: Let people know when rooms have moved 
- Added changelog
 2022-02-04 15:32:24 +01:00
Gil Eluard
9464c1c5c6 Merge branch 'gil/SP1_space_creation' into gil/5228_let_people_know_when_rooms_have_moved 2022-02-04 14:31:26 +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
Gil Eluard
3051a81e77
Merge pull request #5316 from vector-im/gil/5225_invite_to_space_in_room_landing 
Invite to space in room landing
 2022-02-04 11:13:12 +01:00
Stefan Ceriu
cab5be20cd vector-im/element-ios/issues/5298 - Tweaks following code review. 2022-02-04 11:33:55 +02:00
Stefan Ceriu
9ac722dcad vector-im/element-ios/issues/5298 - Add .well-known configuration support for tile server and map styles. 2022-02-04 11:33:55 +02:00
Stefan Ceriu
c92c46fc99 vector-im/element-ios/issues/5298 - Reusing location sharing coordinator external sharing logic in the timeline. 2022-02-04 11:33:55 +02:00
aringenbach
793977864c
Merge pull request #5497 from vector-im/aringenbach/5252_search_results_highlight_color 
Display search matching pattern with a highlight color
 2022-02-04 10:30:12 +01:00
David Langley
579eec2103
Merge pull request #5496 from vector-im/langleyd/5491_fix_CI_for_non_vector_repo_prs 
Only run job if secrets are available.
 2022-02-04 09:21:23 +00:00
Gil Eluard
256b3022dc SP1.2: Invite to Space in room landing element-ios#5225 
- Update after review
 2022-02-04 09:05:50 +01:00
Gil Eluard
f322368a46 SP1.2: Invite to Space in room landing element-ios#5225 
- Update after review
 2022-02-03 23:44:07 +01:00
David Langley
bcc0e36d8a Add secret-check job 2022-02-03 21:06:59 +00:00
David Langley
a230e7f99c Disable if 2022-02-03 21:03:01 +00:00
David Langley
3097f717d3 Can't use secrets in job.if. Try env vars. 2022-02-03 21:01:20 +00:00
Gil Eluard
723b45755f
Update Riot/Modules/TabBar/TabBarCoordinator.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 21:01:14 +01:00
Gil Eluard
f9b0fd51a4
Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:59:44 +01:00
Gil Eluard
ce683182a7
Update Riot/Modules/Spaces/SpaceMembers/SpaceMembersCoordinator.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:58:55 +01:00
Gil Eluard
d3f5dbb729
Update Riot/Modules/Spaces/SpaceMembers/SpaceMembersCoordinator.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:58:39 +01:00
Gil Eluard
7dd8f0c492
Update Riot/Modules/Room/ParticipantsInviteModal/RoomParticipantsInviteModalCoordinatorBridgePresenter.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:58:25 +01:00
Gil Eluard
85101d032f
Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/ContactsPickerViewModel.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:56:47 +01:00
Stefan Ceriu
3b6dcc3222 Fix ThemeService not available on the RiotSwiftUITests target. 2022-02-03 18:30:39 +00:00
Stefan Ceriu
71e9c74cd8 Fix ThemeService not available on the RiotSwiftUI target. 2022-02-03 18:30:39 +00:00
Doug
f63d0c4101 Use a snapshot view for context menu previews. 2022-02-03 18:30:39 +00:00
Stefan Ceriu
351c18cfc6 Fixed location sharing and poll edit form navigation and navigation bar styles. 2022-02-03 18:30:39 +00:00
Doug
43fb085521 Update strings, fix missing symbol. 2022-02-03 18:30:39 +00:00
Doug
26e30bedf7 Add a preview provider to the context menu. 2022-02-03 18:30:39 +00:00
Doug
50de0dc36c Add context menu to HomeViewController cells. 2022-02-03 18:30:39 +00:00