95890d2fd0
Merge branch 'callkit' into decrypted_content
2017-09-06 17:50:09 +02:00
61626a332d
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
a9262546c5
Merge remote-tracking branch 'origin/develop' into callkit
...
# Conflicts:
# Riot/AppDelegate.m
2017-08-31 15:58:28 +02:00
49defaef8a
CallKit branch: fixed compilation issues
2017-08-31 15:51:05 +02:00
1943b9fc2a
Merge branch 'develop' into incoming_call_screen
2017-08-31 14:04:53 +02:00
8e865922fe
Widget: In comments, replace scalar by modular, the official public name that replaces the codename
2017-08-30 11:28:51 +02:00
82810f9c17
Add new option to notification settings
2017-08-29 11:55:56 +03:00
08d5da8e4a
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
6cff918820
Change control event value
2017-08-25 13:36:25 +03:00
ce343aaa51
Add screen for incoming calls
2017-08-25 03:02:29 +03:00
966bb338d9
Rollback #1470
2017-08-23 19:26:10 +03:00
58a6e4eb5a
Improvements in notification registration flow
2017-08-23 19:07:14 +03:00
a69c643b90
Fix control event value which is used for adding target to UISwitch on settings screen
2017-08-23 13:31:19 +03:00
4b0a88d6c9
Add new option to notification settings
2017-08-23 12:58:47 +03:00
b516bab5f2
Merge branch 'develop' into app-extension
2017-08-22 17:35:11 +02:00
7a0a919651
Create app level category for MXSession to count missed notifications count
2017-08-22 10:46:53 +03:00
799eb3725d
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
2b4a845ec8
Merge pull request #1449 from vector-im/jitsi_widget
...
Integrating Jitsi into mobile apps
2017-08-18 13:26:30 +02:00
400a3606b1
Jitsi widget: add display or creation of jitsi conference under USE_JITSI_WIDGET compilation flag
2017-08-18 11:56:32 +02:00
cc4b11592d
Jitsi widget: polishing
2017-08-18 11:40:56 +02:00
27e918611c
Jitsi widget: naming sanitisation
2017-08-18 09:49:14 +02:00
2dd14754c3
Jitsi widget: "Use jitsi for conference calls" -> "Create conference calls with jitsi"
2017-08-18 09:23:24 +02:00
93ba49f0d8
Jitsi widget: Make sure permission to access camera and mic are ok before doing calls
2017-08-18 09:02:54 +02:00
78f371051d
Jitsi widget: Hook up the call button for group room to jitsi
2017-08-17 18:59:02 +02:00
ca0d1e03c4
Merge branch 'develop' into app-extension
2017-08-17 15:28:43 +02:00
631c06da4e
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
8d368c7ace
Jitsi widget: Customise the error for widget permission issues for jitsi
2017-08-17 12:26:20 +02:00
cfb6e91f57
Jitsi widget: Add [WidgetManager closeWidget] and use it for jitsi conference
2017-08-17 12:17:07 +02:00
2ca185b80e
Merge remote-tracking branch 'origin/develop' into jitsi_widget
...
# Conflicts:
# Riot.xcodeproj/project.pbxproj
2017-08-16 17:14:20 +02:00
07690a0171
Jitsi widget: Create a specific [NSUserDefaults standardUserDefaults] key for useJitsiForConferenceCalls
2017-08-16 11:51:56 +02:00
4318970da7
SettingsViewController: Release correctly the pushed view controller
2017-08-16 09:55:52 +02:00
6f70d2e283
Dark Theme - Fix Manu's remarks
2017-08-16 09:40:47 +02:00
024b2be2f7
Dark Theme - Bug Fix
...
Customize correctly the event details views
2017-08-14 20:01:59 +02:00
63d0358106
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
5fe3631a60
Dark Theme - Bug fix
...
Room settings: the wrong color is used for some check box labels.
2017-08-14 16:48:26 +02:00
4eddaf0ac2
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
0caf13e309
Dark Theme - Improvement
...
Recents Cell drag&drop: force the background color of the dragged cell.
2017-08-14 13:13:43 +02:00
2b15594f28
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
5ccb5acbc8
Dark Theme - Improvement
...
WebViewViewController extends MXKWebViewViewController to handle customization.
2017-08-14 10:32:31 +02:00
b043ef4179
Dark Theme
...
fix App freeze when user changes the theme
2017-08-11 17:41:22 +02:00
d85f9c5f64
Jitsi widget: If there is already a jitsi conference widget, pressing call joins the conf
2017-08-11 17:02:45 +02:00
a36d824873
Enable Dark theme
...
TODO:
- fix the app freeze when user changes the app theme.
2017-08-11 16:56:09 +02:00
0e3a8a9ce8
Jitsi widget: Display the hangup button when we are back-to-app
2017-08-11 14:59:05 +02:00
1bdbe40c09
Jitsi widget: Manage "Back To App"
2017-08-11 14:18:10 +02:00
30f053baa8
Jitsi widget: Enable voice or video
2017-08-10 16:41:19 +02:00
c45b846ea1
Jitsi widget: Add Settings > LABS > Use jitsi for conference calls
2017-08-10 15:43:25 +02:00
d2f6e8ddb8
Jitsi widget: Show/hide the widget presence in RoomVC at runtime
2017-08-09 17:31:15 +02:00
5ae8377274
Merge remote-tracking branch 'origin/master' into jitsi_widget
2017-08-08 17:35:12 +02:00
6228f2253a
Merge branch 'develop' into meta_riot_22
2017-08-08 16:06:53 +02:00
3ca96e5c95
Prepare Dark theme - Handle table view cell customization
2017-08-08 16:05:43 +02:00
giomfo
manuroe
manuroe
Denis Morozov