f9ec4fddd5
Add live location banner strings.
2022-03-17 16:37:32 +01:00
2a7036819c
Merge branch 'master' into develop
2022-03-14 16:26:07 +00:00
e0adc29903
Ignore the sender of a room invite without needing to join the room first
2022-03-11 16:24:40 +00:00
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
e300d6ea6f
Rename profile as userAvatarAndName
2022-03-07 13:45:02 +01:00
6ccf209ed8
Use only latest profiles in the timeline (labs)
2022-03-07 13:45:02 +01:00
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
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
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
d405ef102e
Track failed creation of attributed strings
2022-03-03 12:45:50 +00:00
4a2e002e5b
Remove duplicate strings from MatrixKit
...
And a few from Vector for en and pr
2022-03-03 09:34:54 +00:00
62a37dd0e2
Merge MatrixKit strings into Vector strings.
2022-03-03 09:34:54 +00:00
0abef4312e
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
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
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
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
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
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
9eae7c02bb
Update activity indicators on leaving room
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-18 13:31:21 +00:00
993269447a
vector-im/element-ios/issues/5609 - Add open in OSM location sharing option.
2022-02-17 19:11:08 +02:00
4c4df62de0
SP2: Adding Rooms to Spaces #523o
...
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00
cdfa801bc7
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
590e5cf4f1
Replace kick by remove in all strings
2022-02-11 14:25:20 +01:00
1f933a271a
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
f75d3369db
Clarify "password" as "Matrix account password"
2022-02-08 10:47:30 +02:00
1153e2ec6f
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
fd765a9288
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
cb7b581fc8
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
9dd22024a1
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
2cef1a7398
Add the Use Case selection screen to the onboarding flow.
2022-02-04 16:10:38 +00:00
5025029843
Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces
2022-02-04 16:43:43 +01:00
f4fa9e97e3
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
4014437a0f
Update strings, fix missing symbol.
2022-02-03 18:30:39 +00:00
b24d7725ec
Made StateStoreViewModel state mutable and removed the reducer for all the features using it.
2022-02-02 10:02:12 +02:00
9c5b83a1b3
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-26 14:27:25 +03:00
9432d72e20
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
fb89b0092e
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
f7694e27cb
Fix review remarks
2022-01-25 23:59:19 +03:00
d23f24b9ce
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
2d4017158a
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
f3334ad5ae
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-19 00:09:26 +03:00
3e2c4b32b0
Merge branch 'develop' into ismail/5068_start_thread
2022-01-19 00:07:52 +03:00
8f4eb52449
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
b18f37d270
vector-im/element-ios/issues/5114 - Allow editing poll start events.
2022-01-18 20:05:10 +02:00
4f58e0cfcc
Add thread decoration views for search results, fix #5268
2022-01-18 14:46:22 +03:00
c5a49d65ce
Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
2022-01-18 10:11:16 +01:00
6f16bebee4
Merge branch 'gil/5230_SP2-Adding_Rooms_to_Spaces' into gil/5231_SP3-1_Update_room_settings_for_Spaces
2022-01-17 20:40:33 +01:00
a8bcd8faa2
Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# 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
# RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
ea2b6af636
SP3.2: Long press on rooms in space room lists #5232
...
- Added context menu for spaces and rooms in Explore rooms screen
2022-01-17 16:44:40 +01:00
2d12d331db
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-17 11:37:41 +03:00
SBiOSoftWhare
Andy Uhnak
Gil Eluard
Arnaud Ringenbach
Doug
Stefan Ceriu
aringenbach
MaximeE
Doug
Elsie Hupp
ismailgulek