Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
3739 commits 46 branches 261 tags 144 MiB
Commit graph

3739 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
c0ba516a2e 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
5158326d82 Merge pull request #1493 from morozkin/callkit_project 
Handle situation with user that hasn't signed in yet
 2017-09-01 18:02:23 +02:00
Denis Morozov
93aadb498c Handle situation with user that hasn't signed in yet 2017-09-01 18:20:26 +03:00
manuroe
978fe4f03c Callkit branch: Siri: enable app group capabilities in Siri target 2017-09-01 16:42:58 +02:00
manuroe
bd0dfba8b4 Callkit branch: fix merge conflicts in pbxproj 2017-09-01 15:43:18 +02:00
manuroe
8a5fb01480 Callkit branch: fix merge conflict 2017-09-01 10:38:54 +02:00
manuroe
d9dcd2ab6b Merge pull request #1479 from morozkin/sirikit_new 
Add Siri support for calls
 2017-08-31 17:18:27 +02:00
manuroe
c76995e863 Merge branch 'callkit' into sirikit_new 2017-08-31 17:16:51 +02:00
manuroe
35927c50f3 CallKit branch: fixed compilation issues 2017-08-31 16:20:32 +02:00
manuroe
1a026a29f1 Merge remote-tracking branch 'origin/develop' into callkit 
# Conflicts:
#	Riot/AppDelegate.m
 2017-08-31 15:58:28 +02:00
manuroe
5ce098d52d CallKit branch: fixed compilation issues 2017-08-31 15:51:05 +02:00
manuroe
43ae0173d9 Merge pull request #1477 from morozkin/incoming_call_screen 
Add screen for incoming calls
 2017-08-31 14:05:16 +02:00
manuroe
d2cf99b71a Merge branch 'develop' into incoming_call_screen 2017-08-31 14:04:53 +02:00
Denis Morozov
c8ce1dcf5c Add theme support 2017-08-31 12:20:18 +03:00
Denis Morozov
74cc9bc43d Update Siri usage description 2017-08-31 11:12:18 +03:00
Denis Morozov
026f98f168 Simplify customIdentifier check 2017-08-31 11:11:09 +03:00
manuroe
170a7ff8a4 Merge pull request #1488 from vector-im/jitsi_add_notices 
Jitsi widget: Add notices for jitsi widget in rooms histories
 2017-08-30 17:50:42 +02:00
manuroe
2886daf4c6 Jitsi widget: Add notices for jitsi widget in rooms histories 2017-08-30 17:37:14 +02:00
manuroe
4d3c30cf9b Widget: In comments, replace scalar by modular, the official public name that replaces the codename 2017-08-30 11:28:51 +02:00
manuroe
ccb1a7e5bf Merge pull request #1484 from morozkin/callkit_notif 
Start background task when handling call intent in the background
 2017-08-30 10:54:49 +02:00
manuroe
397bf123eb Merge pull request #1481 from morozkin/issue1480 
Fix issue #1480
 2017-08-30 10:51:54 +02:00
David Baker
c28b239aea Merge branch 'master' into develop 2017-08-29 12:51:58 +01:00
David Baker
feec9efc95 share extension version should be same as the app 2017-08-29 12:51:24 +01:00
Denis Morozov
53d635cdc5 Add new option to notification settings 2017-08-29 11:55:56 +03:00
Denis
28017b3dae Set local notification sound 2017-08-29 11:55:45 +03:00
Denis
b444f6639a Don't show display notifications for call invites when CallKit is active 2017-08-29 11:55:32 +03:00
Denis Morozov
7c16ac0647 Add content to notification body connected with image 2017-08-29 11:50:22 +03:00
Denis
6aa49259ed Start background task when handling call intent in the background 2017-08-28 18:14:10 +03:00
Denis Morozov
f3d03d0b31 Fix issue #1480 2017-08-27 16:51:27 +03:00
Denis Morozov
d53945e74b Remove incomingCallNotification property 2017-08-27 16:43:42 +03:00
Denis Morozov
c5a25da058 Fix layout 2017-08-26 18:18:34 +03:00
Denis Morozov
e5a7dcf9c2 Add video calls support 2017-08-26 17:46:12 +03:00
Denis Morozov
283e2b4944 Update async method signature 2017-08-26 16:35:35 +03:00
Denis Morozov
544177fc93 Update Podfile 2017-08-26 16:04:31 +03:00
Denis Morozov
2442d1091d Update Siri usage description 2017-08-26 15:41:15 +03:00
Denis Morozov
92bcbb6027 Update entitlements 2017-08-26 15:40:40 +03:00
Denis Morozov
3ab16243da Change application group id 2017-08-26 15:34:51 +03:00
Denis Morozov
acf4e965f4 Fix method name 2017-08-26 15:19:59 +03:00
Denis Morozov
f61731a9ee Use set for directUserIds 2017-08-26 15:14:18 +03:00
Denis Morozov
232eab3960 Update comments 2017-08-26 15:11:03 +03:00
Denis Morozov
77d481d008 Handle multiple contacts passed to intent 2017-08-26 15:03:32 +03:00
Denis Morozov
28f854e1d7 Improvements in resolution process 2017-08-25 23:43:38 +03:00
Giom Foret
a76a2c4e5c Merge branch 'develop' into callkit 2017-08-25 20:09:30 +02:00
Giom Foret
b278f7d4b3 Re-enable the display of jitsi conference widget on develop 2017-08-25 20:08:23 +02:00
giomfo
3bb1a72402 Merge pull request #1475 from morozkin/callkit_notif 
Add background mode handling
 2017-08-25 18:28:15 +02:00
Giom Foret
7daa966116 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
David Baker
1d5670c75f Change bundle ID of share extension 
Because apparently it can only have one dot after the main app ID,
as Apple kindly informed us just as we were submitting it to the
app store.
 2017-08-25 15:40:17 +01:00
Giom Foret
f093420f78 Podfile: Fix RiotShareExtension target 2017-08-25 15:33:45 +02:00
Giom Foret
0df562f2b1 version ++ 2017-08-25 15:01:09 +02:00
Giom Foret
8a06f8e8bf Disable the display of jitsi conference widget. 2017-08-25 14:04:26 +02:00