Commit Graph

10985 Commits

Author SHA1 Message Date
manuroe b8a703dc55 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard 5a6b33ae68 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 24a2b69da4 Update changes 2021-04-20 12:01:55 +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
Gil Eluard 5d3d485d01 Merge pull request #4237 from vector-im/element_4236
Enable / Disable VoIP feature in Rooms
2021-04-20 11:49:07 +02:00
SBiOSoftWhare 1093711c20 Update changes 2021-04-20 11:31:43 +02:00
SBiOSoftWhare c9f2ccc337 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
ismailgulek 1323af0c23 Merge branch 'develop' into voip_design_updates 2021-04-20 11:41:53 +03: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 0b50f59a1a Merge pull request #4235 from vector-im/element_4234
Show/Hide Home Screen tabs
2021-04-20 09:46:24 +02:00
Eric Eastwood b25af54677 Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Eric Eastwood bf1f3e8880 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 bd1ce8d6f1 Enable / Disable VoIP feature in Rooms
- Updated CHANGES.rst
2021-04-19 20:41:06 +02:00
Gil Eluard 2912074002 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard eae513cdb8 Show/Hide Home Screen tabs
- Updated CHANGES.rst
2021-04-19 18:55:46 +02:00
Gil Eluard 0893a13ba9 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe 84249051f5 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe 7d719dad2f Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe 3a53bd16a5 Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe 9f825fa06b finish version++ 2021-04-19 18:00:54 +02:00
manuroe 279aa84e4c 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 6699358ba7 version++ 2021-04-19 15:07:56 +02:00
ismailgulek d2dfb48531 Disable sliding animations for call screen 2021-04-19 15:58:30 +03:00
ismailgulek 8a17c74d44 Remove gradient view at the back of switch camera button 2021-04-19 15:43:14 +03:00
Gil Eluard f78f821845 Merge pull request #4231 from vector-im/element_4230
RoomVC: Crash in refreshTypingNotification
2021-04-19 14:18:13 +02:00
ismailgulek c88aeadb1b Revert "Remove PiP animations"
This reverts commit e1e7594c1b.
2021-04-19 14:51:44 +03:00
Gil Eluard bd3c178521 RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
ismailgulek 6bdc2ef067 Change action button font size to 17 2021-04-19 11:44:52 +03:00
ismailgulek 93bb715a73 Change body font size to 13px 2021-04-19 11:41:06 +03:00
ismailgulek 41e7bda2eb Change some colors to secondary 2021-04-19 11:36:11 +03:00
manuroe 683946fca1 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe 4a672701f3 Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00
manuroe ebfb7233c8 Merge branch 'release/1.3.3/master' 2021-04-16 17:35:19 +02:00
manuroe 161c9c10e9 finish version++ 2021-04-16 17:35:19 +02:00
manuroe 48ffbf20ea 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 c03be435e5 version++ 2021-04-16 17:13:16 +02:00
manuroe ad41830aa0 Prepare for new sprint 2021-04-16 17:03:06 +02:00
manuroe 8bdc8424d9 Merge branch 'master' into develop 2021-04-16 17:03:02 +02:00
manuroe 80299e75b9 Merge branch 'release/1.3.2/master' 2021-04-16 17:02:55 +02:00
manuroe e3aece6b78 finish version++ 2021-04-16 17:02:55 +02:00
manuroe ff1db0d57d Merge pull request #4226 from vector-im/release/1.3.2/release
Release 1.3.2
2021-04-16 16:25:20 +02:00
manuroe 666261703b version++ 2021-04-16 15:54:12 +02:00
manuroe 726ba8e335 Merge pull request #4223 from vector-im/manu/4222_missing_sender_name
Notifications: Fix sender display name that can miss
2021-04-16 15:50:56 +02:00
manuroe e0bbe9d6de Merge pull request #4225 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2021-04-16 15:39:47 +02:00
manuroe 14481874b2 Merge pull request #4224 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-04-16 15:39:12 +02:00
Weblate 95704a4eb1 Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:56 +00:00
Weblate ee8c9497d0 Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:42 +00:00