 SBiOSoftWhare
|
e090fef42e
|
Merge branch 'develop' into steve/5210_bubble_polls
|
2022-02-04 16:32:33 +01:00 |
|
|
SBiOSoftWhare
|
aacda37b56
|
Merge branch 'develop' into steve/5210_bubble_polls
|
2022-02-04 16:32:33 +01:00 |
|
 Gil Eluard
|
63d3843bb0
|
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
|
23a898a1a4
|
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
|
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 |
|
|
Gil Eluard
|
0ae38858da
|
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
|
21fa545e80
|
Add context menu to HomeViewController cells.
|
2022-02-03 18:30:39 +00:00 |
|
|
Doug
|
ac94a3f429
|
Add context menu to HomeViewController cells.
|
2022-02-03 18:30:39 +00:00 |
|
|
Doug
|
53db37b8a3
|
Fix visual issues when building with Xcode 13.
|
2022-02-03 18:30:39 +00:00 |
|
|
Doug
|
70845c7d10
|
Fix visual issues when building with Xcode 13.
|
2022-02-03 18:30:39 +00:00 |
|
|
SBiOSoftWhare
|
f61cd7f6e1
|
Remove old collection view right align layout.
|
2022-02-03 17:52:12 +01:00 |
|
|
SBiOSoftWhare
|
13210733c8
|
Remove old collection view right align layout.
|
2022-02-03 17:52:12 +01:00 |
|
 ismailgulek
|
131146f2a2
|
Merge pull request #5257 from vector-im/ismail/5096_thread_notifications
Thread Notifications & Badges
|
2022-02-03 16:30:39 +03:00 |
|
|
ismailgulek
|
90d2047fca
|
Merge pull request #5257 from vector-im/ismail/5096_thread_notifications
Thread Notifications & Badges
|
2022-02-03 16:30:39 +03:00 |
|
 ismailgulek
|
d861506d9f
|
Fix review remarks
|
2022-02-03 14:25:14 +03:00 |
|
|
ismailgulek
|
2a95516545
|
Fix review remarks
|
2022-02-03 14:25:14 +03:00 |
|
|
ismailgulek
|
9c79c49f3c
|
Reload section if total number of rooms changes, fixes #5448
|
2022-02-02 16:43:52 +03:00 |
|
|
ismailgulek
|
bbd8b3e764
|
Reload section if total number of rooms changes, fixes #5448
|
2022-02-02 16:43:52 +03:00 |
|
|
ismailgulek
|
cf2420669f
|
Merge branch 'develop' into ismail/5096_thread_notifications
|
2022-02-01 01:23:00 +03:00 |
|
|
ismailgulek
|
c358f10272
|
Merge branch 'develop' into ismail/5096_thread_notifications
|
2022-02-01 01:23:00 +03:00 |
|
 Doug
|
301fff2539
|
Merge pull request #5398 from vector-im/doug/5159_ftue_splash
Add a splash screen before authentication is shown
|
2022-01-28 15:34:26 +00:00 |
|
|
Doug
|
6b6a58cc4a
|
Merge pull request #5398 from vector-im/doug/5159_ftue_splash
Add a splash screen before authentication is shown
|
2022-01-28 15:34:26 +00:00 |
|
|
ismailgulek
|
a13d5704dc
|
Merge branch 'develop' into ismail/5096_thread_notifications
|
2022-01-27 03:20:25 +03:00 |
|
|
ismailgulek
|
d2e5e29ad9
|
Merge branch 'develop' into ismail/5096_thread_notifications
|
2022-01-27 03:20:25 +03:00 |
|
|
Doug
|
5c2d838e64
|
Fix drag sutters and enable swipe to pop gesture.
Add docs and last tweaks following a self review.
Add constants for max content size and disable splash screen via build settings.
|
2022-01-26 14:25:48 +00:00 |
|
|
Doug
|
cf46247e9f
|
Fix drag sutters and enable swipe to pop gesture.
Add docs and last tweaks following a self review.
Add constants for max content size and disable splash screen via build settings.
|
2022-01-26 14:25:48 +00:00 |
|
|
Doug
|
f3b528d6bb
|
Polish for Onboarding Carousel
Add dark mode assets and colours.
Improve layout for 12" iPad and 4" iPhone.
Move isLockedToPortraitOnPhone to RiotNavigationController.
|
2022-01-26 14:25:48 +00:00 |
|
|
Doug
|
af0785b2bb
|
Polish for Onboarding Carousel
Add dark mode assets and colours.
Improve layout for 12" iPad and 4" iPhone.
Move isLockedToPortraitOnPhone to RiotNavigationController.
|
2022-01-26 14:25:48 +00:00 |
|
|
Doug
|
c64d851148
|
Begin implementing an onboarding flow.
|
2022-01-26 14:25:48 +00:00 |
|
|
Doug
|
b1ace569e7
|
Begin implementing an onboarding flow.
|
2022-01-26 14:25:48 +00:00 |
|
|
Gil Eluard
|
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 |
|
|
Gil Eluard
|
2ee922d418
|
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 |
|
|
ismailgulek
|
f7694e27cb
|
Fix review remarks
|
2022-01-25 23:59:19 +03:00 |
|
|
ismailgulek
|
a24e208cb1
|
Fix review remarks
|
2022-01-25 23:59:19 +03:00 |
|
|
ismailgulek
|
4dc28af682
|
Merge branch 'develop' into ismail/5068_start_thread
|
2022-01-25 14:30:52 +03:00 |
|
|
ismailgulek
|
6ac01ae245
|
Merge branch 'develop' into ismail/5068_start_thread
|
2022-01-25 14:30:52 +03:00 |
|
|
ismailgulek
|
7f4848b06a
|
Fix tab bar badges on section-only updates
|
2022-01-25 03:22:56 +03:00 |
|
|
ismailgulek
|
244321ba05
|
Fix tab bar badges on section-only updates
|
2022-01-25 03:22:56 +03:00 |
|
|
Gil Eluard
|
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 |
|
|
Gil Eluard
|
b9512352a6
|
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
|
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 |
|
|
Gil Eluard
|
b0ae0a1c68
|
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 |
|
 SBiOSoftWhare
|
04267efeee
|
Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
|
2022-01-21 16:06:57 +01:00 |
|
|
SBiOSoftWhare
|
535af1caf3
|
Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
|
2022-01-21 16:06:57 +01:00 |
|
|
SBiOSoftWhare
|
35ce32db51
|
Add CollectionViewRightAlignFlowLayout to have right alignement display for collection view.
|
2022-01-18 14:21:16 +01:00 |
|
|
SBiOSoftWhare
|
85d122f60e
|
Add CollectionViewRightAlignFlowLayout to have right alignement display for collection view.
|
2022-01-18 14:21:16 +01:00 |
|
|
Gil Eluard
|
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 |
|
|
Gil Eluard
|
047342265b
|
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 |
|
|
ismailgulek
|
26a6060e3e
|
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
|
2022-01-17 11:39:25 +03:00 |
|
|
ismailgulek
|
23eeedb9ac
|
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
|
2022-01-17 11:39:25 +03:00 |
|