Commit Graph

1769 Commits

Author SHA1 Message Date
Gil Eluard 066b82e9d3 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
SBiOSoftWhare 5e724b893f Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
SBiOSoftWhare 436bbfd0fc Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
SBiOSoftWhare b573c0d6ff PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms. 2021-03-03 16:19:01 +01:00
Gil Eluard 20d0d43b0a Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
2021-02-26 07:19:46 +01:00
Gil Eluard 100c16b032 Merge branch 'develop' into element_4014
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-02-25 15:49:53 +01:00
Gil Eluard 44f1e827cd Improve the status of send messages (sending, sent, received, failed)
- tweaks and new L&F for download progress
2021-02-25 11:07:21 +01:00
Gil Eluard 36cb9c49d5 Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
2021-02-23 22:05:39 +01:00
Gil Eluard f09c64439a Improve the status of send messages (sending, sent, received, failed)
- Bug fixing and imporvement
2021-02-23 21:21:15 +01:00
SBiOSoftWhare 0a9ef1f04c Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
SBiOSoftWhare 48e51eb186 RoomVC: Present a RoomInfoCoordinator on room creation cell quick actions. 2021-02-23 15:52:24 +01:00
SBiOSoftWhare 0fd2bcb62c RoomInfoCoordinator: Add possibility to open an initial specific section. 2021-02-23 15:51:23 +01:00
SBiOSoftWhare 9a9b63fbd3 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
SBiOSoftWhare 46dc396628 RoomDataSource: Fix insertRoomCreationIntroCellDataIfNeeded method. 2021-02-23 09:34:27 +01:00
SBiOSoftWhare 84f02abd0b RoomCreationIntroCell: Remove unused method. 2021-02-23 08:48:17 +01:00
SBiOSoftWhare 75414f8ebe RoomDataSource: Add thread safety instructions for bubbles array in insertRoomCreationIntroCellDataIfNeeded. 2021-02-23 08:47:50 +01:00
SBiOSoftWhare 948103b1ba RecentsVC: Handle room directory display. HomeVC now show room directory on join room action. 2021-02-22 17:47:40 +01:00
Gil Eluard cd76369f9d Improve the status of send messages (sending, sent, received, failed)
- First implementation
2021-02-22 13:51:25 +01:00
SBiOSoftWhare 2ed9cb1a70 RoomVC: Handle RoomCreationIntroCell./ 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 1adf074bbe RoomParticipantsViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 9aadd4d205 RoomFilesViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 2b6008cea1 RoomDataSource: Handle RoomCreationIntroCell conditional display. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare e5796073c8 RoomBubbleCellData: Add new tag to handle RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 165621a7ae RoomAvatarView: Add view data. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 7cd48413c4 Room creation intro: Create RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 2bfeb6b25a Room creation intro: Create cell content view. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 97669e9a0c Create room avatar view. 2021-02-22 00:12:00 +01:00
manuroe ec8455e105 Merge branch 'develop' into element_3812 2021-02-16 11:44:13 +01:00
manuroe cecb1b0bed XcodeGen: Remove old files, probably residual from a git mv 2021-02-16 08:44:26 +01:00
ismailgulek 8d5022575c Show dialpad option only if PSTN supported 2021-02-12 15:47:35 +03:00
SBiOSoftWhare 4da0a67ad0 SettingsVC: Use mainSession property where needed. 2021-02-12 09:19:46 +01:00
SBiOSoftWhare 62543b7654 Settings: Add UIA support when adding a new 3pid. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 593f7946f5 ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare ac24a19ac9 UserInteractiveAuthenticationService: Add method to retrieve authentication status from a request error. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare ebb3a9731e ManageSessionVC: Handle user interactive authentication for delete device. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 073df037d2 Reauthentication: Update reauthentication and cross singing setup coordinator presenter parameter for ObjC. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare f48c63ea24 Remove unused properties. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare b2ffb9098e Cross-signing: Handle UserInteractiveAuthenticationService refactoring for cross signing setup. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 1e81cf3164 ReauthenticationCoordinator: Handle UserInteractiveAuthenticationService refactoring. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 5b135d14a1 Fix pbxproj conflicts. 2021-02-11 15:06:07 +01:00
ismailgulek 5581211cd8 Merge branch 'voip_2746' into voip_tiles
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek 438445f081 Update variable name after voip_2746 changes 2021-02-10 00:51:41 +03:00
ismailgulek b522dd0e97 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek a2f7c13b74 Merge branch 'voip_dialpad' into voip_dtmf
# Conflicts:
#	CHANGES.rst
2021-02-10 00:40:22 +03:00
ismailgulek d56a128d3c Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00
ismailgulek 5f6caef4e4 Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
ismailgulek 748cf53514 Merge branch 'develop' into voip_2746 2021-02-10 00:37:50 +03:00
ismailgulek ad34f5a837 Get rid of redundant _theme 2021-02-10 00:35:34 +03:00
ismailgulek 61b0e6cd89 Remove k prefix from const string name 2021-02-10 00:17:43 +03:00
ismailgulek 0289b96aed Merge pull request #4015 from vector-im/jitsi_3.1.0
Pods: Update Jitsi to 3.1.0
2021-02-09 13:20:29 +03:00