manuroe
6e7ea3a3a5
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
d26e358ee0
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
312f693852
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
afeb592833
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
27d813ddc7
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
35927d2117
Share extension mxstore rework
...
- Create the MXRoom instance only when the room is selected.
2017-09-29 10:37:54 +02:00
manuroe
7fdb125f21
Widgets: add notices for widgets events
2017-09-27 17:15:09 +02:00
manuroe
9d7d91df0a
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
6cda1f330a
Merge branch 'develop' into callkit
2017-09-20 17:28:25 +02:00
Giom Foret
21b3672ef9
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
8013a5cbc0
Merge branch 'develop' into callkit
2017-09-19 09:50:21 +02:00
manuroe
3136ba7352
Modular integrations UI: Add Settings > Labs > Matrix Apps
2017-09-15 13:24:01 +02:00
manuroe
d8b9eb3040
Modular integrations UI: Clean i18n strings for modular
2017-09-14 17:52:21 +02:00
manuroe
784e31e40d
Modular integrations UI: Better seperate "Modular postMessage API" code from UIWebview cooking. Manage error sending
2017-09-11 16:22:28 +02:00
manuroe
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
manuroe
a9262546c5
Merge remote-tracking branch 'origin/develop' into callkit
...
# Conflicts:
# Riot/AppDelegate.m
2017-08-31 15:58:28 +02:00
manuroe
1943b9fc2a
Merge branch 'develop' into incoming_call_screen
2017-08-31 14:04:53 +02:00
manuroe
07b14d9f63
Jitsi widget: Add notices for jitsi widget in rooms histories
2017-08-30 17:37:14 +02:00
Denis Morozov
82810f9c17
Add new option to notification settings
2017-08-29 11:55:56 +03:00
Giom Foret
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
Denis Morozov
ce343aaa51
Add screen for incoming calls
2017-08-25 03:02:29 +03:00
giomfo
b516bab5f2
Merge branch 'develop' into app-extension
2017-08-22 17:35:11 +02:00
manuroe
cc4b11592d
Jitsi widget: polishing
2017-08-18 11:40:56 +02:00
manuroe
2dd14754c3
Jitsi widget: "Use jitsi for conference calls" -> "Create conference calls with jitsi"
2017-08-18 09:23:24 +02:00
manuroe
f822bd9c7b
Jitsi widget: WidgetManager: add WidgetManagerErrorCodeCreationFailed
2017-08-17 18:45:49 +02:00
manuroe
8d368c7ace
Jitsi widget: Customise the error for widget permission issues for jitsi
2017-08-17 12:26:20 +02:00
manuroe
cfb6e91f57
Jitsi widget: Add [WidgetManager closeWidget] and use it for jitsi conference
2017-08-17 12:17:07 +02:00
Aram Sargsyan
8162588371
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
30ff28dc7e
Loading HUD usage in the extension, Image resoulution alertController introduced
2017-08-17 00:01:54 +04:00
manuroe
2ca185b80e
Merge remote-tracking branch 'origin/develop' into jitsi_widget
...
# Conflicts:
# Riot.xcodeproj/project.pbxproj
2017-08-16 17:14:20 +02:00
Giom Foret
f7b92e94b2
Add missing Riot strings
2017-08-11 16:56:53 +02:00
manuroe
c45b846ea1
Jitsi widget: Add Settings > LABS > Use jitsi for conference calls
2017-08-10 15:43:25 +02:00
Aram Sargsyan
e114585e75
Merge branch 'develop' of https://github.com/vector-im/riot-ios into share-extension
2017-07-30 21:30:48 +04:00
Aram Sargsyan
a12adf2968
Localized the extension, added fallback view to handle logged out state, finalized NSExtensionActivationRule
2017-07-30 21:29:38 +04:00
manuroe
ea6d3db96d
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
957244e59b
MELS: replace "X member updates" by "X membership changes"
2017-07-21 16:13:07 +02:00
manuroe
6dc23430c6
Settings: Add app language settings
2017-07-21 10:55:21 +02:00
Giom Foret
2664628039
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
df98e9d92e
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
4345b7cd9c
MELS: some i18n
2017-07-07 17:58:39 +02:00
Giom Foret
64c9af8078
Read Receipts Details - Add close button
2017-06-30 14:57:11 +02:00
Aram Sargsyan
1070fe1c7a
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
Aram Sargsyan
e6f3d074e5
Handled the creation of the attributed receipt description, added in Vector.strings for translation
2017-06-29 15:05:12 +04:00
Denis
aa6534cdba
Merge branch 'develop' into callkit
2017-06-16 19:39:59 +03:00
Denis Morozov
f1d2c0c476
Add call section to settings screen
2017-06-16 19:21:07 +03:00
Giom Foret
71de529fbe
UX Rework - Home: Put the new ordering behind a setting.
...
Add 2 settings: Pin rooms with missed notif and pin rooms with unread messages
this will pin the rooms at the beginning of the list on your home page
2017-06-16 15:18:33 +02:00
manuroe
f38e36f013
Contact access permission: Display "You didn't allow Riot to access your local contacts" instead of "No local contacts" when the user has denied the phonebook permission
2017-06-07 15:34:11 +02:00
giomfo
4b9650b09e
Merge pull request #1231 from vector-im/riot_1207
...
Bug Fix: iOS should have 'Send a message (encrypted)' in placeholder
Available only for the iPads, and the iPhones with a large screen (>= 4p7Inch)
2017-06-06 10:10:26 +02:00
Giom Foret
1c31664046
Read markers should be synchronised across clients
...
- Handle read marker display
- TODO: Support jump to the last unread message.
vector-im/riot-meta#8
2017-06-01 17:20:08 +02:00
Giom Foret
b34797525c
Bug Fix: iOS should have 'Send a message (encrypted)' in placeholder
...
#1207
2017-05-19 14:46:30 +02:00