Commit Graph

316 Commits

Author SHA1 Message Date
ismailgulek f370438d68 Merge branch 'develop' into voip_design_updates 2021-04-09 15:12:51 +03:00
ismailgulek 64e0a40c1a Merge branch 'develop' into voip_design_updates 2021-04-09 15:12:51 +03:00
ismailgulek b38f7ff645 Fix status bar style generally 2021-04-07 15:21:19 +03:00
ismailgulek e42e5ae64d Fix status bar style generally 2021-04-07 15:21:19 +03:00
Gil Eluard 7a162d4404 Crash in [RoomViewController refreshTypingNotification] 2021-04-07 12:26:51 +02:00
Gil Eluard a09550a1ee Crash in [RoomViewController refreshTypingNotification] 2021-04-07 12:26:51 +02:00
Gil Eluard eefe1e2157 Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
Gil Eluard 204ceb847c Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
manuroe d37b2d3b2c Merge remote-tracking branch 'origin/develop' into element_3812 2021-02-11 16:19:12 +01:00
manuroe 10b45d5c64 Merge remote-tracking branch 'origin/develop' into element_3812 2021-02-11 16:19:12 +01:00
manuroe f49b025569 XcodeGen: Use same names for yml and xcconfig files in every target 2021-02-11 09:21:00 +01:00
manuroe 4d874c0022 XcodeGen: Use same names for yml and xcconfig files in every target 2021-02-11 09:21:00 +01:00
ismailgulek b522dd0e97 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek e566f84d96 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
manuroe 931c64dbf7 Xcodegen: No more build settings in yml files 2021-02-09 18:57:06 +01:00
manuroe 205cf1e982 Xcodegen: No more build settings in yml files 2021-02-09 18:57:06 +01:00
manuroe e69d2f0ec3 XcodeGen: Common.xcconfig does not need to be included by targets anymore
It is loaded by the project (project.yml)
2021-02-09 18:10:56 +01:00
manuroe 394a32c923 XcodeGen: Common.xcconfig does not need to be included by targets anymore
It is loaded by the project (project.yml)
2021-02-09 18:10:56 +01:00
manuroe 66bdaa1638 XcodeGen: Move all base settings from yml to xcconfig 2021-02-09 17:37:14 +01:00
manuroe 7511cf022a XcodeGen: Move all base settings from yml to xcconfig 2021-02-09 17:37:14 +01:00
manuroe dfd63e2ebb XcodeGen: Create AppIdentifiers.xcconfig
To centralise app id, profiles, etc in one place
2021-02-09 09:51:39 +01:00
manuroe 8ed7f7ed83 XcodeGen: Create AppIdentifiers.xcconfig
To centralise app id, profiles, etc in one place
2021-02-09 09:51:39 +01:00
ismailgulek f1ac8ec51d Merge branch 'develop' into voip_2746 2021-02-05 12:11:39 +03:00
ismailgulek df2d1d20d3 Merge branch 'develop' into voip_2746 2021-02-05 12:11:39 +03:00
SBiOSoftWhare c5b02a052e Reauthentication: Add ReauthenticationCoordinator that handles reauthentication. It is used before calling an authenticated API. 2021-02-03 11:56:27 +01:00
SBiOSoftWhare 4a5f311bf7 Reauthentication: Add ReauthenticationCoordinator that handles reauthentication. It is used before calling an authenticated API. 2021-02-03 11:56:27 +01:00
ismailgulek 2384edd437 Use Matrix only contacts data source 2021-01-22 14:20:23 +03:00
ismailgulek 8d8a0cd34e Use Matrix only contacts data source 2021-01-22 14:20:23 +03:00
ismailgulek fd2f8deb5a Merge branch 'develop' into voip_2746
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.m
2021-01-15 16:07:36 +03:00
ismailgulek 064528ee25 Merge branch 'develop' into voip_2746
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.m
2021-01-15 16:07:36 +03:00
SBiOSoftWhare e936cf7ccc Handle custom scheme URL 2020-12-18 18:44:08 +01:00
SBiOSoftWhare 86e6068e88 Handle custom scheme URL 2020-12-18 18:44:08 +01:00
ismailgulek d0ae6cfdde Merge branch 'develop' into voip_2746 2020-12-03 12:26:26 +03:00
ismailgulek c191947607 Merge branch 'develop' into voip_2746 2020-12-03 12:26:26 +03:00
ismailgulek e0f5a87e96 Introduce CallService 2020-12-01 13:41:31 +03:00
ismailgulek c2e616b870 Introduce CallService 2020-12-01 13:41:31 +03:00
SBiOSoftWhare 6fdf31edd2 Fix conflict. 2020-11-13 09:47:39 +01:00
SBiOSoftWhare 07b6acf338 Fix conflict. 2020-11-13 09:47:39 +01:00
SBiOSoftWhare 5cebe348c5 JitsiService: Handle Well Known retrieval and Jitsi widget content creation. 2020-10-27 15:31:30 +01:00
SBiOSoftWhare b9c4e159a6 JitsiService: Handle Well Known retrieval and Jitsi widget content creation. 2020-10-27 15:31:30 +01:00
Aaron Raimist 23a4b39a07 Add http and https to LSApplicationQueriesSchemes
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-09-30 10:50:42 -05:00
Aaron Raimist d6710cabd6 Add http and https to LSApplicationQueriesSchemes
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-09-30 10:50:42 -05:00
ismailgulek 14a492843d Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
2020-09-24 14:13:53 +03:00
ismailgulek 6f2f1e5fde Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
2020-09-24 14:13:53 +03:00
SBiOSoftWhare 65f4237ae0 Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
2020-09-24 11:37:24 +02:00
SBiOSoftWhare e878ed475e Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
2020-09-24 11:37:24 +02:00
ismailgulek 0efa7897ad Update bridging header 2020-09-18 18:55:07 +03:00
ismailgulek c1b12d95b2 Update bridging header 2020-09-18 18:55:07 +03:00
ismailgulek b29ea6823d Respect encryption config of HS 2020-09-11 16:44:38 +03:00
ismailgulek f946159337 Respect encryption config of HS 2020-09-11 16:44:38 +03:00