Commit Graph

366 Commits

Author SHA1 Message Date
Giom Foret 35924dccfb Merge branch 'develop' into callkit 2017-09-19 09:50:21 +02:00
Giom Foret bac740c9d2 Improvement: Broaden back icon 2017-09-19 09:35:49 +02:00
manuroe d2411ba8ea Modular integrations Manager: Fix invite and listing of bots.
Use scalar-staging.riot.im for the moment
2017-09-18 17:12:31 +02:00
manuroe 4fdf335bf1 Add WidgetViewController
Not yet use
2017-09-18 16:22:59 +02:00
manuroe b7b8702eff Merge pull request #1511 from vector-im/widget_manager_2
Show the "Integrations Manager" into a webview
2017-09-15 16:55:28 +02:00
Giom Foret 125253023b Improvement - Create DM with Riot-bot on new account creation.
https://github.com/vector-im/riot-meta/issues/94
2017-09-15 15:19:36 +02:00
manuroe d6908eaf1f Modular integrations UI: Do not bounce for all the page 2017-09-15 14:57:40 +02:00
manuroe fa670d3581 Modular integrations UI: Display the webpage in fullscreen 2017-09-15 14:03:49 +02:00
manuroe 9c969091a0 Modular integrations UI: Display the webpage in fullscreen 2017-09-15 13:55:33 +02:00
manuroe 734837955f Modular integrations UI: Make the integrations icon open the main "Manage integrations" page 2017-09-15 13:36:26 +02:00
manuroe 1085b4038b Modular integrations UI: Add the integrations icon to the RoomVC navigation header 2017-09-15 13:27:13 +02:00
manuroe 8a1a3889b5 Modular integrations UI: Add Settings > Labs > Matrix Apps 2017-09-15 13:24:01 +02:00
manuroe 8cd0dcb74b Modular integrations UI: Clean i18n strings for modular 2017-09-14 17:52:21 +02:00
manuroe c2e86317fa Modular integrations UI: Did all modular requests but not tested 2017-09-14 17:48:11 +02:00
Giom Foret ec85532a50 Handle the room display name and its avatar at the room summary level.
- Update the room display name and its avatar url when the Room Summary is updated on state events change (see `[session: updateRoomSummary: withStateEvents:]`).
- Store the riot display room name and its avatar url in the Room Summary.
- Add a new category `MXRoomSummary+Riot` to handle avatar display.

TODO: Increase file store version in `MXFileStore.h`.
2017-09-14 16:00:50 +02:00
giomfo ae3b05319c Merge pull request #1508 from vector-im/riot_1354
Bug Fix - Settings: The "Sign out" button and other buttons of this p…
2017-09-14 12:56:17 +02:00
Giom Foret 4db0281d00 Bug Fix - Settings: The "Sign out" button and other buttons of this page sometimes blinks
#1354
2017-09-14 11:58:02 +02:00
Giom Foret 9ec87ec467 Bug Fix - Settings: some of the labels push the switch controls off screen.
#1506
2017-09-14 11:33:59 +02:00
manuroe cc30abc89e Modular integrations UI: Stubbed all modular requests. 2017-09-14 09:53:07 +02:00
Giom Foret 35daf83e5e Dark theme - Improvements
- the keyboard bubble should be darker too
2017-09-11 22:37:00 +02:00
manuroe a2910d24fa Modular integrations UI: File renaming 2017-09-11 16:34:05 +02:00
manuroe 9d49a9ed8c Modular integrations UI: Better seperate "Modular postMessage API" code from UIWebview cooking. Manage error sending 2017-09-11 16:22:28 +02:00
Giom Foret 978e27da25 Dark theme - Improvements
- spinner bg being white
2017-09-11 14:49:06 +02:00
Giom Foret 0176f68afc Dark theme - Improvements
- some hairlines being too bright
- fading behind dialog modals being white rather than dark
- grey highlight bar in room list being too light (i think)?
2017-09-11 11:27:47 +02:00
manuroe 8116fdceb7 Modular integrations UI: Plumbed all modular requests. But it does not work 2017-09-08 16:27:14 +02:00
manuroe f22c721a68 Modular integrations UI: Move JS code to js resource file. ObjC -> Modular JS starts to work 2017-09-08 13:51:06 +02:00
manuroe 22c69dbe20 Modular integrations UI: Start bridging the modular js postMessage interface with objc 2017-09-08 09:18:45 +02:00
manuroe 307586fa0c Modular integrations UI: Show the Modular integrations webapp into a webview 2017-09-07 11:32:40 +02:00
giomfo b2818bf7d7 Merge branch 'callkit' into decrypted_content 2017-09-06 17:50:09 +02:00
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 e73e686067 Change control event value 2017-08-25 13:36:25 +03: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
Denis Morozov 89edd59ece Add new option to notification settings 2017-08-23 12:58:47 +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