Commit Graph

1874 Commits

Author SHA1 Message Date
SBiOSoftWhare 5d6b656b2e Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
SBiOSoftWhare 6c093ac466 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 b9e1de5125 Merge branch 'develop' into element_4242
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 11:52:47 +02:00
SBiOSoftWhare c9f2ccc337 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
Gil Eluard 217e5e0326 Merge branch 'develop' into element_4236
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 10:38:30 +02:00
Gil Eluard b178225617 Enable / Disable VoIP feature in Rooms
- Update after review
2021-04-20 10:36:05 +02:00
Gil Eluard e33f1faf35 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Gil Eluard 2912074002 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 0893a13ba9 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
Gil Eluard bd3c178521 RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe 63958b57fd Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:31 +02:00
manuroe c7587d7ac0 Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:23 +02:00
manuroe e89588df96 Self-verification: Double check cross-signing state before displaying popups 2021-04-15 09:50:56 +02:00
manuroe 3eabba310e 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 9264128a8e 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 7f6c9414fd 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 13d8845e81 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 b713ecd1a2 Update after review 2021-04-08 15:59:53 +02:00
Gil Eluard ceb6ad690d Update after review 2021-04-08 15:19:02 +02:00
Gil Eluard 9efd59c4cc 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 01e3616680 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 93964b54f6 Update after review 2021-04-08 12:11:36 +02:00
Gil Eluard d8b34d1ed6 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 83afd7b62a 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 213ab9bba6 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 f9bf116406 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 46657544f1 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 fb0a7d456d 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 ddbbb2bd8c Merge branch 'element_4087' into element_4134 2021-04-08 07:56:53 +02:00
Gil Eluard 6b8a8075cb back button chevron looks really weird 2021-04-08 07:56:38 +02:00
Gil Eluard 9601f842e7 Merge branch 'element_4087' into element_4134
# Conflicts:
#	CHANGES.rst
2021-04-07 21:02:24 +02:00
Gil Eluard 0dc63e005e Increase grow/shrink animation speed in new composer 2021-04-07 21:01:07 +02:00
Gil Eluard 18616ad6f6 Black theme uses dark background for composer 2021-04-07 20:15:09 +02:00
Gil Eluard 9e4ff5fac7 Merge branch 'element_4087' into element_4134 2021-04-07 14:11:42 +02:00
Gil Eluard b1d08e497d too much vertical whitespace when replying 2021-04-07 14:11:27 +02:00
Gil Eluard aaed3e9701 Merge branch 'element_4087' into element_4134 2021-04-07 13:15:44 +02:00
Gil Eluard edd562c763 Merge branch 'develop' into element_4087 2021-04-07 13:15:26 +02:00
Gil Eluard f9290b3bde Merge branch 'element_4087' into element_4134 2021-04-07 13:11:28 +02:00
Gil Eluard e31707d971 too much vertical whitespace when replying 2021-04-07 13:11:07 +02:00
Gil Eluard 8433048451 Crash in [RoomViewController refreshTypingNotification] 2021-04-07 12:26:51 +02:00
Gil Eluard 8fc547028a Merge branch 'element_4087' into element_4134 2021-04-07 11:15:22 +02:00
Gil Eluard eb9678e30b Crash in [RoomViewController setupActions] 2021-04-07 11:14:08 +02:00
Gil Eluard fb5dca4c24 Switching composer between text mode & action mode
- Tweaked animation speed
2021-04-07 10:28:35 +02:00
Gil Eluard 26a3360698 Merge branch 'element_4087' into element_4134 2021-04-07 09:33:10 +02:00
Gil Eluard 0a5e16965c Switching composer between text mode & action mode
- Tweaked animation speed
2021-04-07 09:32:57 +02:00
Gil Eluard 13fbc75ea5 Merge branch 'develop' into element_4181
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-06 15:59:40 +02:00
Gil Eluard f222f46810 Consider displaying names in typing notifications 2021-04-06 14:32:25 +02:00
Gil Eluard 96408aea02 Limit typing notifications timeline jumps 2021-04-06 13:09:30 +02:00
Gil Eluard 57517d6aac Possibility to lock some room creation parameters from settings
- Update after review
2021-04-06 10:51:07 +02:00
Gil Eluard 90412e3393 Possibility to lock some room creation parameters from settings
- Update after review
2021-04-06 10:47:54 +02:00