Commit Graph

15987 Commits

Author SHA1 Message Date
manuroe 1343ed7d36 Merge pull request #1453 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate.
2017-08-18 17:04:22 +02:00
manuroe 47f1cbc7cf Merge pull request #1452 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate.
2017-08-18 17:04:09 +02:00
Weblate 80e4ca75be Merge remote-tracking branch 'origin/develop' into develop 2017-08-18 15:02:25 +00:00
Weblate fbcb79d21d Merge remote-tracking branch 'origin/develop' into develop 2017-08-18 15:02:15 +00:00
Weblate 829b52170e Merge remote-tracking branch 'origin/develop' into develop 2017-08-18 15:01:50 +00:00
Jeff Huang abdd3e3570 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/zh_Hant/
2017-08-18 15:01:25 +00:00
Andrey a77bc9cc67 Translated using Weblate (Russian)
Currently translated at 99.7% (395 of 396 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
2017-08-18 15:01:25 +00:00
Nathan van Beelen 67996d970c Translated using Weblate (Dutch)
Currently translated at 100.0% (396 of 396 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/nl/
2017-08-18 15:01:25 +00:00
manuroe 42183ced65 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 7bfab5a1f0 Merge pull request #1450 from vector-im/build_jitsi_sdk
Jitsi widget: Improve cooking recipe for building jitsi-meet ios framework
2017-08-18 16:40:33 +02:00
manuroe e01d44cf7c Jitsi widget: Improve cooking recipe for building jitsi-meet ios framework 2017-08-18 15:57:18 +02:00
manuroe b42c85fa5d Jitsi widget: Fix the red and yellow react boxes (https://github.com/jitsi/jitsi-meet/issues/1877). Use version jitsi-meet_2369 for the jitsi-meet ios sdk 2017-08-18 15:01:14 +02:00
manuroe 9cca17d0cf Merge pull request #1449 from vector-im/jitsi_widget
Integrating Jitsi into mobile apps
2017-08-18 13:26:30 +02:00
manuroe 73fdb6b3bf Jitsi widget: add display or creation of jitsi conference under USE_JITSI_WIDGET compilation flag 2017-08-18 11:56:32 +02:00
manuroe 14ca1a088f Jitsi widget: polishing 2017-08-18 11:40:56 +02:00
giomfo 9a840f6e81 Merge pull request #1447 from aramsargsyan/app-extension-improvements
App extension improvements
2017-08-18 11:32:46 +02:00
manuroe bc4e01e842 Jitsi widget: naming sanitisation 2017-08-18 09:49:14 +02:00
Giom Foret 272092ff6b Apply the app group name in app extension
(merge https://github.com/vector-im/riot-ios/pull/1440)
2017-08-18 09:40:37 +02:00
manuroe f5c3a19aac Jitsi widget: Add license notice for jitsi-meet 2017-08-18 09:32:06 +02:00
manuroe 6c43449c79 Jitsi widget: "Use jitsi for conference calls" -> "Create conference calls with jitsi" 2017-08-18 09:23:24 +02:00
manuroe 8db1925680 Jitsi widget: Make sure permission to access camera and mic are ok before doing calls 2017-08-18 09:02:54 +02:00
Aram Sargsyan 5ebe459461 Merge branch 'app-extension-improvements' of https://github.com/aramsargsyan/riot-ios into app-extension-improvements 2017-08-18 02:28:15 +04:00
Aram Sargsyan ca2b519f40 Added comments describing ShareExtensionManager public functionality + small method renaming 2017-08-18 02:27:56 +04:00
manuroe 0bfc10eae8 Jitsi widget: always accept to join ongoing jitsi conf. Only the creation is under the settings 2017-08-17 18:59:58 +02:00
manuroe bb74310d99 Jitsi widget: Hook up the call button for group room to jitsi 2017-08-17 18:59:02 +02:00
manuroe 5ce90da94f Jitsi widget: WidgetManager: add WidgetManagerErrorCodeCreationFailed 2017-08-17 18:45:49 +02:00
manuroe 30dcd982a5 Jitsi widget: WidgetManage add createWidget and createJitsiWidget methods 2017-08-17 18:28:24 +02:00
Giom Foret e1162f2aff Remove unwanted binary file 2017-08-17 18:06:46 +02:00
giomfo 069bb42c03 Merge branch 'app-extension' into app-extension-improvements 2017-08-17 17:43:13 +02:00
Aram Sargsyan e34e0544a3 Fixed retain cycles, changed color constant 2017-08-17 19:28:08 +04:00
giomfo 17a0990cd3 Merge pull request #1446 from vector-im/riot_1445
Bug Fix: App have crashed whilst uploading photos
2017-08-17 15:31:18 +02:00
Giom Foret ac5aefaeaa Merge branch 'develop' into app-extension 2017-08-17 15:28:43 +02:00
Giom Foret 2321fd92ab 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
Aram Sargsyan 982abed063 Merge branch 'develop' of https://github.com/vector-im/riot-ios into app-extension-improvements 2017-08-17 16:40:29 +04:00
manuroe feb30a0158 Jitsi widget: Customise the error for widget permission issues for jitsi 2017-08-17 12:26:20 +02:00
manuroe 2a6ed6882d Jitsi widget: Add [WidgetManager closeWidget] and use it for jitsi conference 2017-08-17 12:17:07 +02:00
giomfo 52fc333c58 Merge pull request #1441 from vector-im/apply_app_group_dev
Apply the actual application group: "group.im.vector"
2017-08-17 09:22:50 +02:00
giomfo 0117cb1368 Merge pull request #1440 from vector-im/apply_app_group
Apply the actual application group: "group.im.vector"
2017-08-17 09:22:23 +02:00
Aram Sargsyan 0ebfa9380c Merge branch 'develop' of https://github.com/vector-im/riot-ios into app-extension-improvements 2017-08-17 00:08:56 +04:00
Aram Sargsyan bbe5a7f82b Loading HUD usage in the extension, Image resoulution alertController introduced 2017-08-17 00:01:54 +04:00
David Baker 4384dfe6ce Change app group to group.im.vector 2017-08-16 18:30:42 +01:00
Giom Foret 160ddfe94e Apply the actual application group: "group.im.vector" 2017-08-16 18:35:32 +02:00
Giom Foret f8e48d7d68 Apply the actual application group: "group.im.vector" 2017-08-16 18:24:07 +02:00
manuroe 88f878f8aa Merge remote-tracking branch 'origin/develop' into jitsi_widget
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2017-08-16 17:14:20 +02:00
manuroe 6a7e8b9147 Jitsi widget: Fix in [WidgetManager widgetsOfTypes:inRoom:] 2017-08-16 17:05:14 +02:00
giomfo ede265ea17 Merge pull request #1439 from vector-im/set_riot_app_group
Set the application group to be able to share userDefaults object.
2017-08-16 15:43:55 +02:00
Giom Foret 3f44faefd5 Set the application group to be able to share userDefaults object. 2017-08-16 15:35:38 +02:00
manuroe 883671cbe4 Jitsi widget: Create a specific [NSUserDefaults standardUserDefaults] key for useJitsiForConferenceCalls 2017-08-16 11:51:56 +02:00
manuroe 044693754d Jitsi widget: Remove WidgetManager.enabled settings. Let's user check what they want with [WidgetManager widgetsOfTypes:inRoom:] 2017-08-16 11:49:01 +02:00
manuroe f14e95125f Jitsi widget: Implement [Widget description] 2017-08-16 11:47:03 +02:00