Commit graph

85 commits

Author SHA1 Message Date
Aaron Raimist
2c1d87b032 Add basic OLED black theme 2017-11-21 20:55:11 -06:00
manuroe
6f303b0554 Crypto: Add key sharing dialog for incoming room key requests 2017-11-14 18:21:01 +01:00
Giom Foret
fd1f5bcb26 Bug Fix - Switching network filter in room directory is ignored when searching the dir
Search is working well, but it takes time. We add "Searching..." string to improve the UX

#1579
2017-10-16 16:32:39 +02:00
Giom Foret
bd20877b65 Merge branch 'develop' into callkit
# Conflicts:
#	Riot/AppDelegate.m
2017-10-09 16:23:18 +02:00
manuroe
b92cde9e3e Merge pull request #1550 from vector-im/cancel_event_sending
RoomVC: Add the ability to cancel the sending of a room message and i…
2017-10-06 14:28:22 +02:00
Giom Foret
7801cabe32 Merge branch 'master' into callkit
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/AppDelegate.m
#	Riot/ViewController/SettingsViewController.m
2017-10-04 13:04:21 +02:00
manuroe
d7ee7dbf79 Rageshake: Add a setting to enable (disable) it.
https://github.com/vector-im/riot-ios/issues/1387
https://github.com/vector-im/riot-ios/issues/535

There is also a new "Do not ask again" button in the rageshake popup as a shortcut for this setting.
2017-10-04 11:09:02 +02:00
manuroe
2cd8bc8b89 RoomVC: Add the ability to cancel the sending of a room message and improve the cancellation of a media upload 2017-10-03 14:57:32 +02:00
giomfo
b893bc2003 Merge pull request #1478 from aramsargsyan/share-extesion-mxstore-rework
Share extesion mxstore rework
+ multiple images support
2017-09-29 16:05:07 +02:00
Giom Foret
038d4d50da Share extension mxstore rework
- Create the MXRoom instance only when the room is selected.
2017-09-29 10:37:54 +02:00
manuroe
31051d145b Widgets: add notices for widgets events 2017-09-27 17:15:09 +02:00
manuroe
819f407ae1 BF: [iOS11] "Smart [colors] Invert" renders badly in the app
https://github.com/vector-im/riot-ios/issues/1524

- the app does its own dark theme and prevents the OS from automatically revert the colors in the app
- there are 3 choices on iOS11 for the Riot theme: "auto", "light", "dark". "auto" uses the system settings
2017-09-21 15:29:46 +02:00
Giom Foret
f53b1f8c2a Merge branch 'develop' into callkit 2017-09-20 17:28:25 +02:00
Giom Foret
8ee6e6f8f0 Improvement: Alter DMness from Room Settings.
https://github.com/vector-im/riot-ios/issues/1370
2017-09-20 15:08:25 +02:00
Giom Foret
6c5c162aba Merge branch 'develop' into callkit 2017-09-19 09:50:21 +02:00
manuroe
dea81dadf4 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
manuroe
fa0c5a80c5 Modular integrations UI: Add Settings > Labs > Matrix Apps 2017-09-15 13:24:01 +02:00
manuroe
ed50951c51 Modular integrations UI: Clean i18n strings for modular 2017-09-14 17:52:21 +02:00
manuroe
6a8ff41457 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
247d5c529d Merge branch 'develop' into callkit 2017-09-08 12:42:58 +02:00
giomfo
8d71335596 Merge pull request #1486 from morozkin/notif_strings
Update strings for push notifications
2017-09-07 16:31:52 +02:00
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
1a026a29f1 Merge remote-tracking branch 'origin/develop' into callkit
# Conflicts:
#	Riot/AppDelegate.m
2017-08-31 15:58:28 +02:00
manuroe
d2cf99b71a Merge branch 'develop' into incoming_call_screen 2017-08-31 14:04:53 +02:00
manuroe
2886daf4c6 Jitsi widget: Add notices for jitsi widget in rooms histories 2017-08-30 17:37:14 +02:00
Denis Morozov
53d635cdc5 Add new option to notification settings 2017-08-29 11:55:56 +03:00
Denis Morozov
5b56b91321 Update strings for push notifications 2017-08-29 11:39:08 +03: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
Denis Morozov
f92f20e9c4 Add screen for incoming calls 2017-08-25 03:02:29 +03:00
giomfo
62f6ee0e39 Merge branch 'develop' into app-extension 2017-08-22 17:35:11 +02:00
manuroe
e593d0c45d Jitsi widget: polishing 2017-08-18 11:40:56 +02:00
manuroe
3fa814713f Jitsi widget: "Use jitsi for conference calls" -> "Create conference calls with jitsi" 2017-08-18 09:23:24 +02:00
manuroe
191e449337 Jitsi widget: WidgetManager: add WidgetManagerErrorCodeCreationFailed 2017-08-17 18:45:49 +02:00
manuroe
cccbb143ef Jitsi widget: Customise the error for widget permission issues for jitsi 2017-08-17 12:26:20 +02:00
manuroe
9e02006abd Jitsi widget: Add [WidgetManager closeWidget] and use it for jitsi conference 2017-08-17 12:17:07 +02:00
Aram Sargsyan
baa94e4e3e 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
1c95d51372 Loading HUD usage in the extension, Image resoulution alertController introduced 2017-08-17 00:01:54 +04:00
manuroe
f13baec441 Merge remote-tracking branch 'origin/develop' into jitsi_widget
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2017-08-16 17:14:20 +02:00
Giom Foret
3b6a9a3cf9 Add missing Riot strings 2017-08-11 16:56:53 +02:00
manuroe
c7e2ca6de2 Jitsi widget: Add Settings > LABS > Use jitsi for conference calls 2017-08-10 15:43:25 +02:00
Aram Sargsyan
67495f6e35 Merge branch 'develop' of https://github.com/vector-im/riot-ios into share-extension 2017-07-30 21:30:48 +04:00
Aram Sargsyan
72be3ad892 Localized the extension, added fallback view to handle logged out state, finalized NSExtensionActivationRule 2017-07-30 21:29:38 +04:00
manuroe
736d9bb0c0 User directory: Use the new hs api (https://github.com/vector-im/riot-meta/issues/95) 2017-07-28 15:00:45 +02:00
manuroe
21a33f285c MELS: replace "X member updates" by "X membership changes" 2017-07-21 16:13:07 +02:00
manuroe
bcdea698d0 Settings: Add app language settings 2017-07-21 10:55:21 +02:00
Giom Foret
21513419b5 Prepare Dark theme
- Add User Interface section in settings

https://github.com/vector-im/riot-meta/issues/22
2017-07-19 15:26:09 +02:00
Giom Foret
69c84ded85 Translate the potential error observed during 3pid handling
https://github.com/vector-im/riot-meta/issues/85
2017-07-18 15:57:11 +02:00
manuroe
c093c34b1f MELS: some i18n 2017-07-07 17:58:39 +02:00
Giom Foret
0a8f837617 Read Receipts Details - Add close button 2017-06-30 14:57:11 +02:00
Aram Sargsyan
f287dc453e Brought the key receipt_status_read to app level + some minor changes. Signed-off-by: Aram Sargsyan aram.sargsyan.1997@gmail.com 2017-06-29 19:40:07 +04:00