a4fccf4a63
Merge branch 'develop' into element_4218
...
# Conflicts:
# CHANGES.rst
# Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00
bf25591b95
Merge branch 'develop' into fix_public_search
2021-04-20 14:20:41 +02:00
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
3de2531180
Merge branch 'develop' into element_4242
...
# Conflicts:
# CHANGES.rst
# Riot/Managers/Settings/RiotSettings.swift
2021-04-20 11:52:47 +02:00
27f21e58f3
PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off.
2021-04-20 11:30:14 +02:00
16ff9fb44a
Merge branch 'develop' into element_4236
...
# Conflicts:
# CHANGES.rst
# Riot/Managers/Settings/RiotSettings.swift
2021-04-20 10:38:30 +02:00
05b5c5f992
Enable / Disable VoIP feature in Rooms
...
- Update after review
2021-04-20 10:36:05 +02:00
257f3a8f42
Show/Hide public directory in Unified Search
2021-04-20 10:31:04 +02:00
78fa1d0219
Enable / Disable VoIP feature in Rooms
2021-04-19 20:39:07 +02:00
61abfd0e70
Show/Hide Home Screen tabs
2021-04-19 18:53:32 +02:00
d831e901a7
RoomVC: Crash in refreshTypingNotification
2021-04-19 13:18:26 +02:00
9de2c3965f
Update Riot/Modules/Application/LegacyAppDelegate.m
2021-04-15 15:44:31 +02:00
21eb362241
Update Riot/Modules/Application/LegacyAppDelegate.m
2021-04-15 15:44:23 +02:00
386ac62022
Self-verification: Double check cross-signing state before displaying popups
2021-04-15 09:50:56 +02:00
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
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
09e0c95c8a
Make room settings screen configurable dynamically
2021-04-14 15:52:25 +02:00
b15926b0ec
Merge pull request #4147 from vector-im/element_4134
...
Explore typing notifications inspired by web
2021-04-08 16:25:51 +02:00
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
773e72e9f5
Update after review
2021-04-08 15:59:53 +02:00
1aa20c462d
Update after review
2021-04-08 15:19:02 +02:00
4398a7d515
Update Riot/Modules/DotsView/DotsView.swift
...
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com >
2021-04-08 13:48:49 +02:00
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
81682f8e3e
Update after review
2021-04-08 12:11:36 +02:00
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
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
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
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
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
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
4705c9ece7
Merge branch 'element_4087' into element_4134
2021-04-08 07:56:53 +02:00
f09d44a887
back button chevron looks really weird
2021-04-08 07:56:38 +02:00
4624f602e8
Merge branch 'element_4087' into element_4134
...
# Conflicts:
# CHANGES.rst
2021-04-07 21:02:24 +02:00
902b468dff
Increase grow/shrink animation speed in new composer
2021-04-07 21:01:07 +02:00
f36cf591c1
Black theme uses dark background for composer
2021-04-07 20:15:09 +02:00
10ca545965
Merge branch 'element_4087' into element_4134
2021-04-07 14:11:42 +02:00
c7f9fc6f12
too much vertical whitespace when replying
2021-04-07 14:11:27 +02:00
1f80c944b5
Merge branch 'element_4087' into element_4134
2021-04-07 13:15:44 +02:00
fff76c6711
Merge branch 'develop' into element_4087
2021-04-07 13:15:26 +02:00
6fa2c9cb06
Merge branch 'element_4087' into element_4134
2021-04-07 13:11:28 +02:00
fb8660fb92
too much vertical whitespace when replying
2021-04-07 13:11:07 +02:00
7a162d4404
Crash in [RoomViewController refreshTypingNotification]
2021-04-07 12:26:51 +02:00
da9455730a
Merge branch 'element_4087' into element_4134
2021-04-07 11:15:22 +02:00
327af6d35e
Crash in [RoomViewController setupActions]
2021-04-07 11:14:08 +02:00
4031395916
Switching composer between text mode & action mode
...
- Tweaked animation speed
2021-04-07 10:28:35 +02:00
0a244a15e4
Merge branch 'element_4087' into element_4134
2021-04-07 09:33:10 +02:00
0b58e48a01
Switching composer between text mode & action mode
...
- Tweaked animation speed
2021-04-07 09:32:57 +02:00
cbb4ae7233
Merge branch 'develop' into element_4181
...
# Conflicts:
# CHANGES.rst
# Riot/Managers/Settings/RiotSettings.swift
2021-04-06 15:59:40 +02:00
29de4354d6
Consider displaying names in typing notifications
2021-04-06 14:32:25 +02:00
ad0f7c9143
Limit typing notifications timeline jumps
2021-04-06 13:09:30 +02:00
Gil Eluard
SBiOSoftWhare
SBiOSoftWhare
manuroe
manuroe