Commit Graph

266 Commits

Author SHA1 Message Date
manuroe 09615728a0 Room upgrade: Autojoin the upgraded room when the user taps on the tombstone banner
#2486
2019-07-10 14:58:47 +02:00
manuroe 5945537641 Room upgrade: Use the server_name parameter when joining the new room
#2550
2019-07-08 11:46:10 +02:00
manuroe ea9a43849b Join Room: Support via parameters to better handle federation
#2547
2019-07-08 11:15:44 +02:00
SBiOSoftWhare 06d886c08a Update changes 2019-07-03 11:20:43 +02:00
SBiOSoftWhare 9ca96b7968 Update changes 2019-06-25 14:04:54 +02:00
manuroe 28dabe9061 Device Verification: Name for 🔒 is "Lock"
#2526
2019-06-24 15:46:16 +02:00
SBiOSoftWhare cffe14e7c1 Update changes 2019-06-19 15:48:40 +02:00
manuroe d96b470285 Update CHANGES.rst 2019-06-19 15:43:42 +02:00
manuroe b622242304 Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
manuroe f7bcf42c35 Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
manuroe 611765fb63 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare 2dd5389a7d Update changes 2019-06-13 16:42:21 +02:00
SBiOSoftWhare 4fb69f3333 Update changes 2019-06-12 16:07:16 +02:00
SBiOSoftWhare f9bcad32a4 Update changes 2019-06-06 13:51:55 +02:00
SBiOSoftWhare 53947c9cae Update changes 2019-05-29 13:01:25 +02:00
David Cordero a8b1ab96a4 Update changelog 2019-05-24 22:23:36 +02:00
fridtjof fbcbc49f20 Document changes done (PiwikTracker ~4.4.2 -> MatomoTracker 6.0.0) 2019-05-23 22:06:45 +02:00
manuroe 976d8788d1 Merge pull request #2438 from dcordero/verification_id_labels_fix
Verification id labels fix
2019-05-23 17:57:49 +02:00
SBiOSoftWhare d6b7c60024 Update changes 2019-05-23 17:50:59 +02:00
SBiOSoftWhare 708f9bb32c Update changes 2019-05-23 16:49:13 +02:00
David Cordero 21ff398bac Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare 816df3c331 Update changes 2019-05-22 18:49:35 +02:00
SBiOSoftWhare 2208cf9dba Update changes 2019-05-22 16:43:28 +02:00
SBiOSoftWhare 21d9933a0e Update changes 2019-05-20 22:11:15 +02:00
manuroe 168646092c Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
David Cordero 4b129c9aeb Update changelog 2019-05-19 17:23:59 +02:00
SBiOSoftWhare 30812a881f Update changes 2019-05-15 23:34:21 +02:00
manuroe b4b5824497 Device Verification: Fix buttons colors in dark theme 2019-05-06 08:21:30 +02:00
manuroe 62bee42e96 Device Verification: Fix bell emoji name 2019-05-06 08:19:48 +02:00
manuroe d76eb9e06d version++ 2019-05-03 12:31:49 +02:00
manuroe 106c10a45d RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
SBiOSoftWhare 46241f56a3 Merge branch 'develop' into remove_iOS9_code 2019-04-25 12:33:47 +02:00
SBiOSoftWhare fe3c2ee056 Update changes 2019-04-25 11:57:16 +02:00
SBiOSoftWhare 09e9064347 Update changes 2019-04-25 11:23:07 +02:00
SBiOSoftWhare 4ba631f382 Update changes 2019-04-24 17:59:44 +02:00
SBiOSoftWhare 2c482e9218 Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
SBiOSoftWhare 5a9f774ffc Update changes 2019-04-19 18:37:11 +02:00
J. Ryan Stinnett 4bbb38cc84 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 0f9e38fcca Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +02:00
SBiOSoftWhare 2fe90975da Update changes 2019-04-10 15:00:43 +02:00
SBiOSoftWhare 1a07cdf992 Update changes 2019-04-10 12:11:12 +02:00
SBiOSoftWhare 4527cb478e Update changes 2019-04-09 19:23:48 +02:00
SBiOSoftWhare f07abf3209 Merge branch 'develop' into riot_2337
# Conflicts:
#	CHANGES.rst
#	Riot/AppDelegate.m
2019-04-05 16:31:52 +02:00
SBiOSoftWhare a592dbb0d4 Update changes 2019-04-05 15:11:50 +02:00
manuroe 29538e65c3 CHANGES 2019-04-04 18:20:21 +02:00
fridtjof 0761827152 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 5c44da13a1 Update changes 2019-04-02 15:10:15 +02:00
manuroe 3fcb3c3286 Widgets: Use scalar prod urls in Riot mobile apps
#2349
2019-03-27 15:45:54 +01:00
manuroe 60ec0c4690 Push: Add more logs to track spontaneously disabling
#2348
2019-03-27 11:53:31 +01:00
SBiOSoftWhare 151403f346 Update changes 2019-03-22 11:49:20 +01:00