Commit graph

261 commits

Author SHA1 Message Date
manuroe
6ff7530d8a Device Verification: Name for 🔒 is "Lock"
#2526
2019-06-24 15:46:16 +02:00
SBiOSoftWhare
affaa9dfbd Update changes 2019-06-19 15:48:40 +02:00
manuroe
c71abd5edc
Update CHANGES.rst 2019-06-19 15:43:42 +02:00
manuroe
f155f99374
Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
manuroe
3f55981cc3
Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
manuroe
ba6d5939a3 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare
ecce667483 Update changes 2019-06-13 16:42:21 +02:00
SBiOSoftWhare
61f777faba Update changes 2019-06-12 16:07:16 +02:00
SBiOSoftWhare
c1b1e5c730 Update changes 2019-06-06 13:51:55 +02:00
SBiOSoftWhare
c81c3fb9e8 Update changes 2019-05-29 13:01:25 +02:00
David Cordero
eede36dabe Update changelog 2019-05-24 22:23:36 +02:00
fridtjof
ed507ff524
Document changes done (PiwikTracker ~4.4.2 -> MatomoTracker 6.0.0) 2019-05-23 22:06:45 +02:00
manuroe
90784d13a0
Merge pull request #2438 from dcordero/verification_id_labels_fix
Verification id labels fix
2019-05-23 17:57:49 +02:00
SBiOSoftWhare
2252561088 Update changes 2019-05-23 17:50:59 +02:00
SBiOSoftWhare
cc188209a7 Update changes 2019-05-23 16:49:13 +02:00
David Cordero
627291529b Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare
4edf817a5d Update changes 2019-05-22 18:49:35 +02:00
SBiOSoftWhare
60a9644a7e Update changes 2019-05-22 16:43:28 +02:00
SBiOSoftWhare
3704c3325d Update changes 2019-05-20 22:11:15 +02:00
manuroe
f105fadc48
Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
David Cordero
80eacd3b58 Update changelog 2019-05-19 17:23:59 +02:00
SBiOSoftWhare
b49b247138 Update changes 2019-05-15 23:34:21 +02:00
manuroe
97ffa9bf1e Device Verification: Fix buttons colors in dark theme 2019-05-06 08:21:30 +02:00
manuroe
157065c9d3 Device Verification: Fix bell emoji name 2019-05-06 08:19:48 +02:00
manuroe
c3ea8add94 version++ 2019-05-03 12:31:49 +02:00
manuroe
ef4fed1bb2 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
SBiOSoftWhare
1821c35c49
Merge branch 'develop' into remove_iOS9_code 2019-04-25 12:33:47 +02:00
SBiOSoftWhare
6a7a967eb5 Update changes 2019-04-25 11:57:16 +02:00
SBiOSoftWhare
3c72849f2a Update changes 2019-04-25 11:23:07 +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