88cd9db785
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
7690b8b6de
Add missing marketing icon
2017-10-04 12:25:49 +02:00
8f7878b413
version ++
2017-10-04 11:23:05 +02:00
b665a80f35
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
025ea5fa07
Bug Fix - Some rooms have gone nameless after upgrade
...
https://github.com/matrix-org/riot-ios-rageshakes/issues/388
2017-10-03 18:53:05 +02:00
9f9bf2f008
version ++
2017-10-03 16:11:21 +02:00
ed7c8b4e90
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
953027b0c4
Merge pull request #1549 from vector-im/enable_jitsi_by_default
...
Jitsi: Enable the "Create conference calls with jitsi" settings by default
2017-10-03 13:48:47 +02:00
6291fda01c
Jitsi: Enable the "Create conference calls with jitsi" settings by default
2017-10-03 13:17:07 +02:00
b2998d9219
Language: Enable Basque and Chinese (Simplified).
2017-10-03 13:04:54 +02:00
d535dcbfb6
Merge pull request #1548 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
...
Update from Weblate.
2017-10-03 12:43:36 +02:00
8b314e05df
Merge pull request #1547 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
...
Update from Weblate.
2017-10-03 12:43:11 +02:00
d7f13da714
Translated using Weblate (Basque)
...
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/eu/
2017-10-03 10:38:21 +00:00
1d31cb1b26
Translated using Weblate (Basque)
...
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/eu/
2017-10-03 10:30:50 +00:00
1fb4cf57ac
Merge remote-tracking branch 'origin/develop' into develop
2017-10-03 10:21:16 +00:00
41fc99b3d0
Translated using Weblate (French)
...
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/fr/
2017-10-03 10:21:08 +00:00
2847654f84
Merge remote-tracking branch 'origin/develop' into develop
2017-10-03 10:20:35 +00:00
b7e83a7725
Translated using Weblate (French)
...
Currently translated at 100.0% (4 of 4 strings)
Translation: Riot iOS/Riot iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/fr/
2017-10-03 10:20:30 +00:00
4d09116e78
Merge remote-tracking branch 'origin/develop' into develop
2017-10-03 10:18:13 +00:00
4b60de98e2
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
45319ca575
Share extension mxstore rework
...
- Create the MXRoom instance only when the room is selected.
2017-09-29 10:37:54 +02:00
ca989534f4
Merge pull request #1536 from vector-im/format_widgets
...
Widgets: add notices for widgets events
2017-09-28 14:33:10 +02:00
dad906e01c
Merge pull request #1535 from vector-im/list_widgets
...
Widgets: list active widgets in a room
2017-09-28 10:01:43 +02:00
fee3d69b1a
Merge pull request #1537 from vector-im/fix_ios_11
...
Fix ios 11 disruption
2017-09-28 09:57:00 +02:00
6132937b2f
RoomViewController: Fix the position of the missed discussion badge
2017-09-27 22:41:51 +02:00
961d3ad20d
Widgets: add notices for widgets events
2017-09-27 17:15:09 +02:00
78663905fc
Widgets: Use the original "apps-icon" when there is no more widgets
2017-09-27 15:40:21 +02:00
978aa0217d
Widgets: list active widgets in a room
...
List them into an alertVC for the moment
2017-09-27 15:21:38 +02:00
4a13e7e4d0
Fix iOS11 disruption
...
- RoomViewController, RoomDetailsVC, ContactDetailsVC: fix header layout.
- Use UIScrollView+MatrixKit category to handle the adjusted content inset which is not defined before iOS 11.
2017-09-27 09:26:34 +02:00
a092491686
Fixed warnings now detected by Xcode 9
2017-09-26 16:10:42 +02:00
84771f992e
Merge pull request #1533 from vector-im/rageshake_290
...
RoomsViewController: Crash in [RoomsViewController prepareForSegue:se…
2017-09-26 14:52:53 +02:00
a93a932dd8
RoomsViewController: Crash in [RoomsViewController prepareForSegue:sender:]_block_invoke_2 (in Riot) (RoomsViewController.m:182)
...
https://github.com/matrix-org/riot-ios-rageshakes/issues/290
2017-09-26 09:56:25 +02:00
cf5a395615
MediaPickerViewController: Add sanity checks to avoid crashes
...
- [MediaPickerViewController setupAVCapture] (in Riot) (MediaPickerViewController.m:1158) (https://github.com/matrix-org/riot-ios-rageshakes/issues/312 )
- [MediaPickerViewController tearDownAVCapture] (in Riot) (MediaPickerViewController.m:1198) (https://github.com/matrix-org/riot-ios-rageshakes/issues/314 )
2017-09-25 18:13:14 +02:00
86d4b2438c
Fix - Room member details: the member's avatar is cropped in the header
...
Define directly the navigation titleView with the custom title view instance. Do not use anymore a container.
We had to add some constraints to keep the custom title at the right position.
2017-09-25 16:56:18 +02:00
c639c2a359
Translated using Weblate (French)
...
Currently translated at 100.0% (427 of 427 strings)
Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2017-09-25 12:49:29 +00:00
075f7cbfb4
Translated using Weblate (French)
...
Currently translated at 97.1% (415 of 427 strings)
Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2017-09-25 11:37:37 +00:00
6160c8321f
Merge pull request #1513 from vivlim/hardware-keyboard-return
...
Return key on hardware keyboards now sends messages
2017-09-25 10:36:40 +02:00
787e3f2019
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-09-23 01:50:23 +00:00
d68e0d4b1d
Return key to send: use delegate instead of traversing view hierarchy
...
Signed-off-by: Vivian Lim <vivvnlim@gmail.com >
2017-09-22 17:49:53 -07:00
51ac97ae3f
@available(iOS 11.0, *) use requires Xcode 9
2017-09-22 16:48:49 +02:00
e2e6af8f17
Fix compilation error
...
@available(iOS 11.0, *)) requires Xcode 9
2017-09-22 10:39:50 +02:00
f60123e9ee
BF: [iOS11] "Smart [colors] Invert" renders badly in the app
...
Take into account Giom's review
2017-09-21 17:03:43 +02:00
40e476f678
Widget: code cleaning
2017-09-21 15:36:09 +02:00
3f5f0f4d52
Translated using Weblate (Russian)
...
Currently translated at 100.0% (427 of 427 strings)
Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
2017-09-21 13:29:57 +00:00
3a624fa99d
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
c48f823bad
Merge pull request #1527 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
...
Update from Weblate.
2017-09-21 15:11:49 +02:00
91ddbea28d
Merge pull request #1526 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
...
Update from Weblate.
2017-09-21 15:11:34 +02:00
42677a51d8
Merge remote-tracking branch 'origin/develop' into develop
2017-09-21 13:09:13 +00:00
1ed7cbe8ed
Merge remote-tracking branch 'origin/develop' into develop
2017-09-21 13:09:02 +00:00
a637e94023
Merge remote-tracking branch 'origin/develop' into develop
2017-09-21 13:08:32 +00:00
Giom Foret
manuroe
manuroe
Weblate
Kévin C
Bruno Bigras
Jeff Huang
Vivian Lim
Andrey