Commit Graph

285 Commits

Author SHA1 Message Date
SBiOSoftWhare bd2dadfaad Merge branch 'develop' into remove_iOS9_code 2019-04-25 12:33:47 +02:00
SBiOSoftWhare 079ac6335e Update changes 2019-04-25 11:57:16 +02:00
SBiOSoftWhare 8957e3a71a Update changes 2019-04-25 11:23:07 +02:00
SBiOSoftWhare c76bc0244c Update changes 2019-04-24 17:59:44 +02:00
SBiOSoftWhare 16bee22b6a Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
SBiOSoftWhare 49a6975106 Update changes 2019-04-19 18:37:11 +02:00
J. Ryan Stinnett 72f45e7bd0 Clarify key backup details when backup exists but is not trusted
This ports the wording changes from Riot Web
https://github.com/matrix-org/matrix-react-sdk/pull/2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
2019-04-18 13:30:32 +01:00
SBiOSoftWhare a38917dbf7 Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +02:00
SBiOSoftWhare cde4189e0d Update changes 2019-04-10 15:00:43 +02:00
SBiOSoftWhare fd822fd368 Update changes 2019-04-10 12:11:12 +02:00
SBiOSoftWhare 30dd6ed8c9 Update changes 2019-04-09 19:23:48 +02:00
SBiOSoftWhare 776da8af0c Merge branch 'develop' into riot_2337
# Conflicts:
#	CHANGES.rst
#	Riot/AppDelegate.m
2019-04-05 16:31:52 +02:00
SBiOSoftWhare a963a92b05 Update changes 2019-04-05 15:11:50 +02:00
manuroe 6967b918ec CHANGES 2019-04-04 18:20:21 +02:00
fridtjof ef48a1ea1b Merge remote-tracking branch 'origin/riot_2337' into riot_2337
# Conflicts:
#	CHANGES.rst
#	Riot/AppDelegate.m
2019-04-03 00:29:54 +02:00
SBiOSoftWhare 13f77af2d5 Update changes 2019-04-02 15:10:15 +02:00
manuroe 2199da49a0 Widgets: Use scalar prod urls in Riot mobile apps
#2349
2019-03-27 15:45:54 +01:00
manuroe d6fa09968d Push: Add more logs to track spontaneously disabling
#2348
2019-03-27 11:53:31 +01:00
SBiOSoftWhare c3af90be00 Update changes 2019-03-22 11:49:20 +01:00
fridtjof b8a314d7db update CHANGES.rst 2019-03-22 01:30:20 +01:00
SBiOSoftWhare f1ec6b357e Merge pull request #2207 from fridtjof/ios10-notifications
Add code to support the new notification system starting with iOS 10
2019-03-21 16:45:07 +01:00
SBiOSoftWhare d1bef75fde version++ 2019-03-21 14:57:44 +01:00
SBiOSoftWhare ead756cf6f Update changes 2019-03-21 13:12:56 +01:00
manuroe 7977b8d51d CHANGES++ 2019-03-13 09:11:45 +01:00
manuroe b4a43eea0a version++ 2019-03-13 09:10:18 +01:00
manuroe 641225519d CHANGES 2019-03-12 17:35:27 +01:00
SBiOSoftWhare 1431370a8e version++ 2019-03-11 12:01:26 +01:00
SBiOSoftWhare 33297dc427 Update changes 2019-03-07 17:51:39 +01:00
manuroe e8b683043b RoomVC: Use accent color (green) for the ongoing conference call banner 2019-03-07 10:42:55 +01:00
manuroe 4090d66d0b Authentication: .well-known support (#2117). 2019-03-06 18:30:13 +01:00
SBiOSoftWhare 16ec5b1ee5 Merge branch 'develop' into riot_2304 2019-03-05 16:10:41 +01:00
SBiOSoftWhare ab1bcaf6d3 Update changes 2019-03-05 15:55:39 +01:00
manuroe 0b46f4f32e CHANGES 2019-03-05 12:44:37 +01:00
manuroe fb4eaff571 Merge pull request #2305 from vector-im/riot_2292
Reskin: HomeVC: Use notices colors for badges background in section headers
2019-03-04 18:18:59 +00:00
manuroe 89bef5b34d Merge pull request #2307 from vector-im/light_sso_support
Authentication: support SSO by using the fallback URL
2019-03-04 18:18:41 +00:00
SBiOSoftWhare 2cc0a0a70d Update changes 2019-03-04 18:39:28 +01:00
manuroe 3a66ecb2fd CHANGES 2019-03-04 18:38:12 +01:00
manuroe 1b150fcaac Reskin: HomeVC: Use notices colors for badges background in section headers
#2292
2019-02-28 22:09:57 +00:00
SBiOSoftWhare 765bee0ca9 Update changes 2019-02-27 15:34:25 +01:00
SBiOSoftWhare 42472905ac Merge branch 'develop' into swift_lint 2019-02-27 11:32:10 +01:00
SBiOSoftWhare 01e1fa51e2 Update changes 2019-02-27 10:12:04 +01:00
SBiOSoftWhare 5b1dfefb8a Merge pull request #2299 from vector-im/riot_2202
Fastlane: Update to Xcode 10.1
2019-02-26 18:33:43 +01:00
SBiOSoftWhare 2e1487c945 Update changes 2019-02-26 16:48:01 +01:00
manuroe 32f6994857 Fix crash in Settings in 0.8.1
#2295
2019-02-25 16:00:47 +01:00
manuroe 3d3901502f RoomVC: Remove the beta warning modal when enabling e2e in a room
This is the other part of #2239.
2019-02-21 15:07:50 +01:00
manuroe 16d0fbeadb Reskin: Text in badges should be white in dark theme
#2283
2019-02-21 13:07:37 +01:00
Fridtjof Mund 32bdf7b843 Merge branch 'develop' into deprecations/contacts-api 2019-02-20 19:08:12 +01:00
manuroe 5636330f03 Add app store description as app string resource to make them available for translation on weblate
#2201
2019-02-20 18:22:50 +01:00
Fridtjof Mund 23ba14b73c Merge branch 'develop' into deprecations/contacts-api 2019-02-20 18:14:36 +01:00
manuroe 095d9df058 Maintenance: Update cocopoads and pods. Automatic update to Swift4.2 2019-02-20 16:45:32 +01:00