Commit Graph

1893 Commits

Author SHA1 Message Date
Gil Eluard 67c5ec4e05 Show / Hide More and Report Content contextual menu from settings
- Update after review
2021-04-29 20:10:07 +02:00
Gil Eluard 14189d2a5c Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard 899e8c692f Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
Gil Eluard 7ca8fb5d50 Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
Gil Eluard 8dadd54d5f Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
Gil Eluard c46935d19e Crash in [RoomViewController setScrollToBottomHidden:] 2021-04-28 16:00:19 +02:00
Gil Eluard 85de7ee6eb Merge branch 'develop' into element_4261
# Conflicts:
#	CHANGES.rst
2021-04-28 10:07:56 +02:00
Gil Eluard 7c9b1407a5 Users must not be allowed to add or otherwise manage widgets in rooms
- Avoid navigation to integration management using integration popup with settings set to integration disabled
2021-04-26 20:17:43 +02:00
Gil Eluard 295dcdaa4e Widget navigation button still visible with settings set to integration disabled 2021-04-23 22:44:23 +02:00
Gil Eluard d4a1729e52 clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
ismailgulek 8c1cf058a6 Hide scroll to bottom when room is left 2021-04-21 12:50:37 +03:00
ismailgulek 5c7fdd14b7 Pop view controller if pushed before 2021-04-21 12:50:21 +03:00
Gil Eluard 7a15c5ab57 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-21 09:08:58 +02:00
Gil Eluard b6c6e7ffa0 Merge branch 'develop' into element_4211
# Conflicts:
#	CHANGES.rst
2021-04-21 08:23:33 +02:00
Gil Eluard a4fccf4a63 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00
Gil Eluard 591cd261e5 Merge branch 'develop' into element_4211
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:05:20 +02:00
Gil Eluard 5a29506407 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
SBiOSoftWhare bf25591b95 Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
SBiOSoftWhare f3eca9c33f DirectoryRecentTableViewCell: Do not use "directory_search_results_more_than" string when there is no rooms and the search is on. 2021-04-20 12:01:34 +02:00
Gil Eluard 3de2531180 Merge branch 'develop' into element_4242
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 11:52:47 +02:00
SBiOSoftWhare 27f21e58f3 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
Gil Eluard 16ff9fb44a Merge branch 'develop' into element_4236
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 10:38:30 +02:00
Gil Eluard 05b5c5f992 Enable / Disable VoIP feature in Rooms
- Update after review
2021-04-20 10:36:05 +02:00
Gil Eluard 257f3a8f42 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Gil Eluard 78fa1d0219 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 61abfd0e70 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
Gil Eluard d831e901a7 RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe 9de2c3965f Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:31 +02:00
manuroe 21eb362241 Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:23 +02:00
manuroe 386ac62022 Self-verification: Double check cross-signing state before displaying popups 2021-04-15 09:50:56 +02:00
manuroe 5c2c48c574 Self-verification: Fix compatibility with Element-Web when logging in on web
#4217

If web triggers a verification request (because the users clicked on "Use another login"), remove the newSignIn alert dialog before display the incoming verification request.
2021-04-14 18:50:37 +02:00
manuroe 97c711ba35 Self-verification: Fix compatibility with Element-Web when logging in on iOS
#4217

Just after login, send request instead of waiting for an incoming one as per recent EW changes
2021-04-14 17:21:35 +02:00
Gil Eluard 09e0c95c8a Make room settings screen configurable dynamically 2021-04-14 15:52:25 +02:00
Gil Eluard 7da3bd1296 Make joining public rooms configurable 2021-04-13 19:21:07 +02:00
Gil Eluard b15926b0ec Merge pull request #4147 from vector-im/element_4134
Explore typing notifications inspired by web
2021-04-08 16:25:51 +02:00
Gil Eluard 6ba9dac6c5 Update Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 16:13:56 +02:00
Gil Eluard 773e72e9f5 Update after review 2021-04-08 15:59:53 +02:00
Gil Eluard 1aa20c462d Update after review 2021-04-08 15:19:02 +02:00
Gil Eluard 4398a7d515 Update Riot/Modules/DotsView/DotsView.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 13:48:49 +02:00
Gil Eluard 7211d0d450 Update Riot/Modules/Room/Views/BubbleCells/RoomTypingBubbleCell.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 13:48:25 +02:00
Gil Eluard 81682f8e3e Update after review 2021-04-08 12:11:36 +02:00
Gil Eluard b6cabbb6f0 Update Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 10:52:51 +02:00
Gil Eluard e4dc2ffc8a Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 10:52:39 +02:00
Gil Eluard 67e1eb6e9d Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 10:48:15 +02:00
Gil Eluard bdecaf0adf Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 10:47:57 +02:00
Gil Eluard 59cf88427a Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 10:47:42 +02:00
Gil Eluard f06307a0d0 Update Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-04-08 10:47:28 +02:00
Gil Eluard 4705c9ece7 Merge branch 'element_4087' into element_4134 2021-04-08 07:56:53 +02:00
Gil Eluard f09d44a887 back button chevron looks really weird 2021-04-08 07:56:38 +02:00
Gil Eluard 4624f602e8 Merge branch 'element_4087' into element_4134
# Conflicts:
#	CHANGES.rst
2021-04-07 21:02:24 +02:00