Commit Graph

12250 Commits

Author SHA1 Message Date
manuroe 26251557c3 GH Actions: Run tests in another way 2021-04-20 16:55:38 +02:00
manuroe 85c6e1b64a GH Actions: Run projects tests 2021-04-20 16:13:01 +02:00
Gil Eluard 3091b7cea2 Updated CHANGES.rst 2021-04-20 15:28:46 +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
ismailgulek 983995b282 Change group call notification title and body 2021-04-20 16:04:58 +03:00
Gil Eluard 1c455ed4d9 Show / Hide integrations and actions in rooms
- Initial Build Settings
2021-04-20 14:57:31 +02:00
Gil Eluard 5a29506407 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
ismailgulek ba74899e92 Fix asserted thread 2021-04-20 15:52:13 +03:00
ismailgulek 203eb41462 Do not display group call notification when in the related room 2021-04-20 15:51:46 +03:00
ismailgulek daabbeea9e Merge branch 'voip_group_notification' into voip_design_updates 2021-04-20 15:30:32 +03:00
manuroe 0850005ccb Merge branch 'develop' into gh-actions 2021-04-20 14:30:29 +02:00
SBiOSoftWhare 9d75dca5fc Merge pull request #4244 from vector-im/fix_public_search
PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off
2021-04-20 14:20:59 +02:00
SBiOSoftWhare bf25591b95 Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe 54dbb583aa Merge pull request #4238 from vector-im/MadLittleMods/gitter.im-room-directory
Add gitter.im to default list of room directories
2021-04-20 14:04:11 +02:00
manuroe 6af4652c72 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard 2d67d354be Merge pull request #4243 from vector-im/element_4242
Show/Hide public directory in Unified Search
2021-04-20 12:40:29 +02:00
SBiOSoftWhare 4d7cc7b394 Update changes 2021-04-20 12:01:55 +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
Gil Eluard 346edc413f Merge pull request #4237 from vector-im/element_4236
Enable / Disable VoIP feature in Rooms
2021-04-20 11:49:07 +02:00
SBiOSoftWhare fef1fa8aec Update changes 2021-04-20 11:31:43 +02:00
SBiOSoftWhare 27f21e58f3 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
ismailgulek 8a50383a88 Merge branch 'develop' into voip_design_updates 2021-04-20 11:41:53 +03: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 219cdc5df5 Merge pull request #4235 from vector-im/element_4234
Show/Hide Home Screen tabs
2021-04-20 09:46:24 +02:00
Eric Eastwood 8377982fd1 Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Eric Eastwood 84e45d744a Add gitter.im to default list of room directories
Fix https://github.com/vector-im/element-ios/issues/4233
2021-04-19 14:09:45 -05:00
Gil Eluard a610fc0c47 Enable / Disable VoIP feature in Rooms
- Updated CHANGES.rst
2021-04-19 20:41:06 +02:00
Gil Eluard 78fa1d0219 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 1ace35a72b Show/Hide Home Screen tabs
- Updated CHANGES.rst
2021-04-19 18:55:46 +02:00
Gil Eluard 61abfd0e70 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe d64c056034 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe a7c677fc43 Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe 00f31cfeeb Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe 25a26d0c29 finish version++ 2021-04-19 18:00:54 +02:00
manuroe 89f7511bd1 Merge pull request #4232 from vector-im/release/1.3.4/release
Release 1.3.4
2021-04-19 18:00:11 +02:00
manuroe 3f00a6f897 version++ 2021-04-19 15:07:56 +02:00
ismailgulek ec0d064c75 Disable sliding animations for call screen 2021-04-19 15:58:30 +03:00
ismailgulek 7b3a584b38 Remove gradient view at the back of switch camera button 2021-04-19 15:43:14 +03:00
Gil Eluard 134115327b Merge pull request #4231 from vector-im/element_4230
RoomVC: Crash in refreshTypingNotification
2021-04-19 14:18:13 +02:00
ismailgulek 878f44c54d Revert "Remove PiP animations"
This reverts commit c8fd3f92ea7df33dea552a6c1ff8ff140c3c1e34.
2021-04-19 14:51:44 +03:00
Gil Eluard d831e901a7 RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
ismailgulek 9c0a1e69a7 Change action button font size to 17 2021-04-19 11:44:52 +03:00
ismailgulek 58ef3431d4 Change body font size to 13px 2021-04-19 11:41:06 +03:00
ismailgulek aa9407b6e8 Change some colors to secondary 2021-04-19 11:36:11 +03:00
manuroe 9328277c21 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe 0865538926 Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00