Commit graph

5679 commits

Author SHA1 Message Date
manuroe
c987e80d54 Clarify key backup details when backup exists but is not trusted in banner too
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
2019-04-24 10:23:27 +02:00
manuroe
b76465ec46
Merge pull request #2375 from jryans/connect-key-backup
Clarify key backup details when backup exists but is not trusted
2019-04-24 09:58:46 +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
d6e3c631d6
Merge pull request #2364 from vector-im/avoid_tableview_crashes_settings
Avoid crashes with tableview reload animation in settings and room settings
2019-04-10 18:10:52 +02:00
SBiOSoftWhare
7263b268e1
Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +02:00
SBiOSoftWhare
169bd7a590
Merge pull request #2363 from vector-im/riot_2294
BF: +N read receipt text is invisible on dark theme
2019-04-10 17:48:53 +02:00
SBiOSoftWhare
6f48db8eb7 Update changes 2019-04-10 15:00:43 +02:00
SBiOSoftWhare
a40988fbc7 [SettingsViewController] Avoid some crashes when reload rows animated. 2019-04-10 14:50:47 +02:00
SBiOSoftWhare
bf3750f254 [RoomSettingsViewController] Avoid some crashes when reload sections animated. 2019-04-10 14:50:14 +02:00
SBiOSoftWhare
f3d1d146ef Update changes 2019-04-10 12:11:12 +02:00
SBiOSoftWhare
24e74f3577 Make read receipt label text color use primary text color (Fix #2294). 2019-04-10 12:10:15 +02:00
SBiOSoftWhare
671e415d27
Merge pull request #2362 from vector-im/riot_2293
Upgraded rooms show up in the share extension twice
2019-04-10 10:19:01 +02:00
SBiOSoftWhare
f2fb1ec727 Update changes 2019-04-09 19:23:48 +02:00
SBiOSoftWhare
d08b8d22a0 [Share extension] Fix upgraded rooms show up twice (Fix #2293). 2019-04-09 19:20:33 +02:00
SBiOSoftWhare
820a42c9e2
Merge pull request #2358 from vector-im/show_room_one_entry
Use one external entry point on AppDelegate to navigate to a room
2019-04-08 17:42:41 +02:00
SBiOSoftWhare
afedb617ec Use one external entry point on AppDelegate to navigate to a room 2019-04-08 13:32:46 +02:00
SBiOSoftWhare
77aa6aef28
Merge pull request #2355 from vector-im/riot_2337
iOS 12 Notification: group them by room
2019-04-05 16:48:46 +02:00
SBiOSoftWhare
192bf9c5cb Fix an issue in AppDelegate 2019-04-05 16:48:24 +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
538d0605b1 Add logs on related push methods 2019-04-05 16:03:27 +02:00
manuroe
4bd1dfd407
Update Riot/AppDelegate.m
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2019-04-05 15:55:05 +02:00
SBiOSoftWhare
bdbaaa10f0 Update changes 2019-04-05 15:11:50 +02:00
SBiOSoftWhare
a27b3d903e Remove commented code about notification provisional authorization. 2019-04-05 14:57:55 +02:00
SBiOSoftWhare
c48785e45e When navigate to room, remove associated delivered notifications. 2019-04-05 14:51:56 +02:00
SBiOSoftWhare
e3033d630d Update iOS 10+ notification titles 2019-04-05 10:59:18 +02:00
manuroe
314da07e68
Merge pull request #2354 from vector-im/templates
Productivity: Create templates for screens and flow root coordinators
2019-04-05 10:14:42 +02:00
manuroe
3e41449962 Productivity: Fix templates small issue 2019-04-05 09:34:48 +02:00
manuroe
8e97d59c2e Productivity: Tweak templates: No comments in a storyboard 2019-04-05 08:52:59 +02:00
manuroe
354ad0a17f Productivity: Tweak templates a bit more 2019-04-05 08:40:10 +02:00
manuroe
42837d6b3c Productivity: Improve Templates/README.md 2019-04-05 07:57:53 +02:00
manuroe
d637d4b19e Productivity: Create createRootCoordinator.sh 2019-04-04 22:11:52 +02:00
manuroe
6576de6e8c Productivity: Tweak templates a bit more 2019-04-04 21:06:46 +02:00
manuroe
6ddc26d233 Productivity: Tweak templates a bit 2019-04-04 18:59:06 +02:00
manuroe
131be3ccf0 Productivity: createScreen.sh: Fix subFolder parameter again 2019-04-04 18:58:32 +02:00
manuroe
8d146164b8 Productivity: createScreen.sh: Fix subFolder parameter 2019-04-04 18:35:58 +02:00
manuroe
1de7b444ec CHANGES 2019-04-04 18:20:21 +02:00
manuroe
8334c18e01 Productivity: Create createScreen.sh 2019-04-04 18:17:19 +02:00
manuroe
2932d209a2 Productivity: SwiftGen: expose all storyboards from Modules/
except one that is in Objc
2019-04-04 18:01:46 +02:00
SBiOSoftWhare
a005578671 Update notification strings for notification titles 2019-04-04 17:45:13 +02:00
manuroe
e558c89a8e Productivity: Create templates for screens and flow root coordinators 2019-04-04 17:10:21 +02:00
SBiOSoftWhare
55e6cb7cd7
Merge pull request #2347 from fridtjof/riot_2337
Add notification titles and group them properly on iOS 10+
2019-04-03 10:39:19 +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
271d238a11
Merge pull request #2352 from vector-im/share_extension_extra_logs
[Share extension] Fix a crash when receive a memory warning and add extra logs to debug memory limit exception
2019-04-02 15:45:54 +02:00
SBiOSoftWhare
3eff4381a5 Update memory usage log in ShareExtensionManager 2019-04-02 15:44:59 +02:00
SBiOSoftWhare
ab4e16de7d Update changes 2019-04-02 15:10:15 +02:00
SBiOSoftWhare
6f78f03328 Log image compression size choice in share extension to help debug memory warnings 2019-04-02 15:01:50 +02:00
SBiOSoftWhare
b46ccac44a Log memory usage when receive a memory warning 2019-04-02 14:42:43 +02:00
SBiOSoftWhare
257aa809ce Fix a crash when receive memory warning in ShareExtensionManager 2019-04-02 14:20:05 +02:00
manuroe
49d5157df3 Push: More logs 2019-04-02 09:51:53 +02:00
manuroe
07ec67bb2a
Merge pull request #2350 from vector-im/riot_2349
Widgets: Use scalar prod urls in Riot mobile apps
2019-03-27 16:10:12 +01:00