Commit Graph

12797 Commits

Author SHA1 Message Date
Gil Eluard b5a7af8b3a Merge branch 'develop' into element_4211
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:05:20 +02:00
ismailgulek a06837fe62 Change group call notification title and body 2021-04-20 16:04:58 +03:00
Gil Eluard faa9d920fe Show / Hide integrations and actions in rooms
- Initial Build Settings
2021-04-20 14:57:31 +02:00
Gil Eluard a3cc1849ca Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
ismailgulek 9694160692 Fix asserted thread 2021-04-20 15:52:13 +03:00
ismailgulek 2c70aec02b Do not display group call notification when in the related room 2021-04-20 15:51:46 +03:00
ismailgulek a0b956e209 Merge branch 'voip_group_notification' into voip_design_updates 2021-04-20 15:30:32 +03:00
manuroe d8d255f3d2 Merge branch 'develop' into gh-actions 2021-04-20 14:30:29 +02:00
SBiOSoftWhare 655584d9f5 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 1c55ee357b Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe 81b30589b5 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 9cd4e58062 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard fe126c86a8 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 daeff7deda Update changes 2021-04-20 12:01:55 +02:00
SBiOSoftWhare b458e6f8d6 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 c9f561f8c0 Merge branch 'develop' into element_4242
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 11:52:47 +02:00
Gil Eluard 6a01cd1be6 Merge pull request #4237 from vector-im/element_4236
Enable / Disable VoIP feature in Rooms
2021-04-20 11:49:07 +02:00
SBiOSoftWhare 5fd315d1a4 Update changes 2021-04-20 11:31:43 +02:00
SBiOSoftWhare 54addc2b71 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
ismailgulek 8c3a449230 Merge branch 'develop' into voip_design_updates 2021-04-20 11:41:53 +03:00
Gil Eluard 0fbb61c4e8 Merge branch 'develop' into element_4236
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 10:38:30 +02:00
Gil Eluard 2551c34d1b Enable / Disable VoIP feature in Rooms
- Update after review
2021-04-20 10:36:05 +02:00
Gil Eluard 4d8b2de5b8 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Gil Eluard 015eb174d4 Merge pull request #4235 from vector-im/element_4234
Show/Hide Home Screen tabs
2021-04-20 09:46:24 +02:00
Eric Eastwood 204ab2f7fc Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Eric Eastwood 8e0616aa2f 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 fb33c0bbb2 Enable / Disable VoIP feature in Rooms
- Updated CHANGES.rst
2021-04-19 20:41:06 +02:00
Gil Eluard c001314e26 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 497c554ea8 Show/Hide Home Screen tabs
- Updated CHANGES.rst
2021-04-19 18:55:46 +02:00
Gil Eluard a2794f404c Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe 4ee1dfba4f Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe 7267d0d622 Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe 9d52580b92 Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe f9a7c0c196 finish version++ 2021-04-19 18:00:54 +02:00
manuroe 11a5d05db6 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 ba98e30d5e version++ 2021-04-19 15:07:56 +02:00
ismailgulek 18f29ee251 Disable sliding animations for call screen 2021-04-19 15:58:30 +03:00
ismailgulek 4f2f207f05 Remove gradient view at the back of switch camera button 2021-04-19 15:43:14 +03:00
Gil Eluard 45e248e58a Merge pull request #4231 from vector-im/element_4230
RoomVC: Crash in refreshTypingNotification
2021-04-19 14:18:13 +02:00
ismailgulek bc69c6fcd7 Revert "Remove PiP animations"
This reverts commit f7f468fdcc8837c001e991ed30972a5bf8d1a563.
2021-04-19 14:51:44 +03:00
Gil Eluard 70db8946db RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
ismailgulek d4fcb476b1 Change action button font size to 17 2021-04-19 11:44:52 +03:00
ismailgulek 83812bf1b2 Change body font size to 13px 2021-04-19 11:41:06 +03:00
ismailgulek 3afb464881 Change some colors to secondary 2021-04-19 11:36:11 +03:00
manuroe 3037ede7e5 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe 89d4520e5a Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00
manuroe c310115fb3 Merge branch 'release/1.3.3/master' 2021-04-16 17:35:19 +02:00
manuroe da851dc750 finish version++ 2021-04-16 17:35:19 +02:00
manuroe d21d199e2e Merge pull request #4227 from vector-im/release/1.3.3/release
Release 1.3.3
2021-04-16 17:34:38 +02:00
manuroe 12a825863b version++ 2021-04-16 17:13:16 +02:00