Commit graph

233 commits

Author SHA1 Message Date
SBiOSoftWhare
6a7a967eb5 Update changes 2019-04-25 11:57:16 +02:00
SBiOSoftWhare
a440e86dfc Update changes 2019-04-24 17:59:44 +02:00
SBiOSoftWhare
84660597fb Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
SBiOSoftWhare
c0ff595cc3 Update changes 2019-04-19 18:37:11 +02:00
J. Ryan Stinnett
b5ee4a6aa9 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
7263b268e1
Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +02:00
SBiOSoftWhare
6f48db8eb7 Update changes 2019-04-10 15:00:43 +02:00
SBiOSoftWhare
f3d1d146ef Update changes 2019-04-10 12:11:12 +02:00
SBiOSoftWhare
f2fb1ec727 Update changes 2019-04-09 19:23:48 +02:00
SBiOSoftWhare
5a1c23ae8c Merge branch 'develop' into riot_2337
# Conflicts:
#	CHANGES.rst
#	Riot/AppDelegate.m
2019-04-05 16:31:52 +02:00
SBiOSoftWhare
bdbaaa10f0 Update changes 2019-04-05 15:11:50 +02:00
manuroe
1de7b444ec CHANGES 2019-04-04 18:20:21 +02:00
fridtjof
f500de2db3
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
ab4e16de7d Update changes 2019-04-02 15:10:15 +02:00
manuroe
aa45c141dd Widgets: Use scalar prod urls in Riot mobile apps
#2349
2019-03-27 15:45:54 +01:00
manuroe
774e6c0a3d Push: Add more logs to track spontaneously disabling
#2348
2019-03-27 11:53:31 +01:00
SBiOSoftWhare
dd2d544939 Update changes 2019-03-22 11:49:20 +01:00
fridtjof
ae3878957d
update CHANGES.rst 2019-03-22 01:30:20 +01:00
SBiOSoftWhare
93af475cec
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
cfc5d85a3b version++ 2019-03-21 14:57:44 +01:00
SBiOSoftWhare
35579b4f96 Update changes 2019-03-21 13:12:56 +01:00
manuroe
61107d71bc CHANGES++ 2019-03-13 09:11:45 +01:00
manuroe
9f5c0bf2d2 version++ 2019-03-13 09:10:18 +01:00
manuroe
96789114b8 CHANGES 2019-03-12 17:35:27 +01:00
SBiOSoftWhare
018c2adcdc version++ 2019-03-11 12:01:26 +01:00
SBiOSoftWhare
020b500a78 Update changes 2019-03-07 17:51:39 +01:00
manuroe
58e7cba5f3 RoomVC: Use accent color (green) for the ongoing conference call banner 2019-03-07 10:42:55 +01:00
manuroe
4b571ac6dd Authentication: .well-known support (#2117). 2019-03-06 18:30:13 +01:00
SBiOSoftWhare
6c6d500c12
Merge branch 'develop' into riot_2304 2019-03-05 16:10:41 +01:00
SBiOSoftWhare
9e3e0d3d1f Update changes 2019-03-05 15:55:39 +01:00
manuroe
0b2e5635d2 CHANGES 2019-03-05 12:44:37 +01:00
manuroe
76391fbe4b
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
02ceb87ed0
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
4a2b6b3080 Update changes 2019-03-04 18:39:28 +01:00
manuroe
e468dcb0ca CHANGES 2019-03-04 18:38:12 +01:00
manuroe
670952c8e9 Reskin: HomeVC: Use notices colors for badges background in section headers
#2292
2019-02-28 22:09:57 +00:00
SBiOSoftWhare
a75854a03e Update changes 2019-02-27 15:34:25 +01:00
SBiOSoftWhare
fae91c57cf
Merge branch 'develop' into swift_lint 2019-02-27 11:32:10 +01:00
SBiOSoftWhare
b63001d4b6 Update changes 2019-02-27 10:12:04 +01:00
SBiOSoftWhare
97d4b58520
Merge pull request #2299 from vector-im/riot_2202
Fastlane: Update to Xcode 10.1
2019-02-26 18:33:43 +01:00
SBiOSoftWhare
b268777e6a Update changes 2019-02-26 16:48:01 +01:00
manuroe
5517e45f4a Fix crash in Settings in 0.8.1
#2295
2019-02-25 16:00:47 +01:00
manuroe
932fcd888f 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
95f3c07b54 Reskin: Text in badges should be white in dark theme
#2283
2019-02-21 13:07:37 +01:00
Fridtjof Mund
0608d56c72
Merge branch 'develop' into deprecations/contacts-api 2019-02-20 19:08:12 +01:00
manuroe
2d66a7ecd3 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
59f79f4bab
Merge branch 'develop' into deprecations/contacts-api 2019-02-20 18:14:36 +01:00
manuroe
7a5c0bef99 Maintenance: Update cocopoads and pods. Automatic update to Swift4.2 2019-02-20 16:45:32 +01:00
manuroe
16b632fc0c Maintenance: Update cocopoads and pods. 2019-02-20 16:43:45 +01:00
SBiOSoftWhare
b4b85ae147 Update changes 2019-02-20 15:22:53 +01:00