Commit Graph

335 Commits

Author SHA1 Message Date
manuroe 8a9df3d849 Merge remote-tracking branch 'origin/pr/1458' into callkit
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/AppDelegate.m
#	Riot/ViewController/SettingsViewController.m
2017-09-04 15:57:37 +02:00
manuroe 78e8f4378e Merge remote-tracking branch 'origin/develop' into callkit
# Conflicts:
#	Riot/AppDelegate.m
2017-08-31 15:58:28 +02:00
manuroe 19e81f4e65 CallKit branch: fixed compilation issues 2017-08-31 15:51:05 +02:00
manuroe f00fe2046e Merge branch 'develop' into incoming_call_screen 2017-08-31 14:04:53 +02:00
manuroe 6702eedb82 Widget: In comments, replace scalar by modular, the official public name that replaces the codename 2017-08-30 11:28:51 +02:00
Denis Morozov 1965d3ba9a Add new option to notification settings 2017-08-29 11:55:56 +03:00
Giom Foret e65697c41b Merge branch 'master' into callkit
# Conflicts:
#	Riot/AppDelegate.m
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/ViewController/SettingsViewController.m
2017-08-25 16:48:13 +02:00
Denis Morozov c03c69b97f Add screen for incoming calls 2017-08-25 03:02:29 +03:00
Denis Morozov 56fcd7e4a8 Rollback #1470 2017-08-23 19:26:10 +03:00
Denis Morozov 7f3822c63f Improvements in notification registration flow 2017-08-23 19:07:14 +03:00
Denis Morozov 76de80e831 Fix control event value which is used for adding target to UISwitch on settings screen 2017-08-23 13:31:19 +03:00
giomfo c499b84161 Merge branch 'develop' into app-extension 2017-08-22 17:35:11 +02:00
Denis Morozov f39246fb16 Create app level category for MXSession to count missed notifications count 2017-08-22 10:46:53 +03:00
manuroe c7ad4ebf32 Jitsi widget: Fix occasional crash on hang up
Apparently, jitsi does not call delegate methods always on the same thread. Come back to the main thread for safety.

https://github.com/matrix-org/riot-ios-rageshakes/issues/220
2017-08-18 16:42:50 +02:00
manuroe 29a98c12ce Merge pull request #1449 from vector-im/jitsi_widget
Integrating Jitsi into mobile apps
2017-08-18 13:26:30 +02:00
manuroe a7cfb02f1f Jitsi widget: add display or creation of jitsi conference under USE_JITSI_WIDGET compilation flag 2017-08-18 11:56:32 +02:00
manuroe 00f4d1da39 Jitsi widget: polishing 2017-08-18 11:40:56 +02:00
manuroe 7ea057645f Jitsi widget: naming sanitisation 2017-08-18 09:49:14 +02:00
manuroe ca36d73df2 Jitsi widget: "Use jitsi for conference calls" -> "Create conference calls with jitsi" 2017-08-18 09:23:24 +02:00
manuroe ec468798a3 Jitsi widget: Make sure permission to access camera and mic are ok before doing calls 2017-08-18 09:02:54 +02:00
manuroe 8d32b87245 Jitsi widget: Hook up the call button for group room to jitsi 2017-08-17 18:59:02 +02:00
Giom Foret bf03660aa1 Merge branch 'develop' into app-extension 2017-08-17 15:28:43 +02:00
Giom Foret 6296df0519 Bug Fix: App have crashed whilst uploading photos
#1445

Set up only one session at the time!
2017-08-17 14:45:20 +02:00
manuroe bea78f79bd Jitsi widget: Customise the error for widget permission issues for jitsi 2017-08-17 12:26:20 +02:00
manuroe fd100e1a11 Jitsi widget: Add [WidgetManager closeWidget] and use it for jitsi conference 2017-08-17 12:17:07 +02:00
manuroe b4210d4495 Merge remote-tracking branch 'origin/develop' into jitsi_widget
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2017-08-16 17:14:20 +02:00
manuroe 60d6ccfc67 Jitsi widget: Create a specific [NSUserDefaults standardUserDefaults] key for useJitsiForConferenceCalls 2017-08-16 11:51:56 +02:00
Giom Foret bad3f8fa93 SettingsViewController: Release correctly the pushed view controller 2017-08-16 09:55:52 +02:00
Giom Foret 0d8ecc64d1 Dark Theme - Fix Manu's remarks 2017-08-16 09:40:47 +02:00
Giom Foret 6dfebcee12 Dark Theme - Bug Fix
Customize correctly the event details views
2017-08-14 20:01:59 +02:00
Giom Foret bd2d7281bb Dark Theme - Bug Fix
Recents List: some room avatars have an unexpected black background.
We apply here the new property `defaultBackgroundColor` defined in MXKImageView class to initialize correctly image background.
2017-08-14 19:11:13 +02:00
Giom Foret 8fd1789c83 Dark Theme - Bug fix
Room settings: the wrong color is used for some check box labels.
2017-08-14 16:48:26 +02:00
Giom Foret 63a6fcea52 Dark Theme - Bug Fix
Handle correctly the status bar display when the current view controller is presented in a temporary navigation controller.
2017-08-14 16:43:30 +02:00
Giom Foret 3a353964ce Dark Theme - Improvement
Recents Cell drag&drop: force the background color of the dragged cell.
2017-08-14 13:13:43 +02:00
Giom Foret 384bd4157e Dark Theme - Improvement
Add a top view in pickers (country, language) to display the right background in case of vertical bounce.
2017-08-14 13:09:11 +02:00
Giom Foret 60484dac53 Dark Theme - Improvement
WebViewViewController extends MXKWebViewViewController to handle customization.
2017-08-14 10:32:31 +02:00
Giom Foret 49d1459440 Dark Theme
fix App freeze when user changes the theme
2017-08-11 17:41:22 +02:00
manuroe 409cfc7f3a Jitsi widget: If there is already a jitsi conference widget, pressing call joins the conf 2017-08-11 17:02:45 +02:00
Giom Foret c4aa8013be Enable Dark theme
TODO:
- fix the app freeze when user changes the app theme.
2017-08-11 16:56:09 +02:00
manuroe 270001874e Jitsi widget: Display the hangup button when we are back-to-app 2017-08-11 14:59:05 +02:00
manuroe c52f7c85b2 Jitsi widget: Manage "Back To App" 2017-08-11 14:18:10 +02:00
manuroe 8ef4495bf0 Jitsi widget: Enable voice or video 2017-08-10 16:41:19 +02:00
manuroe 7c0644b08b Jitsi widget: Add Settings > LABS > Use jitsi for conference calls 2017-08-10 15:43:25 +02:00
manuroe 744c0907e4 Jitsi widget: Show/hide the widget presence in RoomVC at runtime 2017-08-09 17:31:15 +02:00
manuroe dbb852d34e Merge remote-tracking branch 'origin/master' into jitsi_widget 2017-08-08 17:35:12 +02:00
Giom Foret 1c9fc7a910 Merge branch 'develop' into meta_riot_22 2017-08-08 16:06:53 +02:00
Giom Foret a67af15740 Prepare Dark theme - Handle table view cell customization 2017-08-08 16:05:43 +02:00
manuroe 4db1ceff27 Bug Report: Make the crash dump appear in GH issues created for crashes.
This will help triaging. Example at https://github.com/matrix-org/riot-ios-rageshakes/issues/176
2017-08-08 14:39:01 +02:00
manuroe 93f9458760 Jitsi widget: RoomVC: Show it in the banner when there is an active jitsi conference in a room. 2017-08-04 13:47:50 +02:00
manuroe 9aa2ddffde Jitsi widget: Add JitsiViewController, a dedicated widget viewer for jitsi widgets based on jitsi-meet sdk. 2017-08-04 13:08:37 +02:00