Commit Graph

5661 Commits

Author SHA1 Message Date
manuroe e9cef1ccb1 Merge pull request #2381 from vector-im/riot_2375_more
Clarify key backup details when backup exists but is not trusted in b…
2019-04-24 10:30:05 +02:00
manuroe 620be4497a 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 74003e19bc 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 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 5b9026b723 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 a38917dbf7 Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +02:00
SBiOSoftWhare 56691f33c8 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 cde4189e0d Update changes 2019-04-10 15:00:43 +02:00
SBiOSoftWhare a7fb92adfa [SettingsViewController] Avoid some crashes when reload rows animated. 2019-04-10 14:50:47 +02:00
SBiOSoftWhare fc5061808b [RoomSettingsViewController] Avoid some crashes when reload sections animated. 2019-04-10 14:50:14 +02:00
SBiOSoftWhare fd822fd368 Update changes 2019-04-10 12:11:12 +02:00
SBiOSoftWhare 6375721c72 Make read receipt label text color use primary text color (Fix #2294). 2019-04-10 12:10:15 +02:00
SBiOSoftWhare 55a79582b0 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 30dd6ed8c9 Update changes 2019-04-09 19:23:48 +02:00
SBiOSoftWhare 98526e9c21 [Share extension] Fix upgraded rooms show up twice (Fix #2293). 2019-04-09 19:20:33 +02:00
SBiOSoftWhare 3481195043 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 802350922c Use one external entry point on AppDelegate to navigate to a room 2019-04-08 13:32:46 +02:00
SBiOSoftWhare 7f2e4f1c11 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 c5df3cd5cb Fix an issue in AppDelegate 2019-04-05 16:48:24 +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 74c6e746b2 Add logs on related push methods 2019-04-05 16:03:27 +02:00
manuroe 3daa0fa7ab Update Riot/AppDelegate.m
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2019-04-05 15:55:05 +02:00
SBiOSoftWhare a963a92b05 Update changes 2019-04-05 15:11:50 +02:00
SBiOSoftWhare 5e0f7121a9 Remove commented code about notification provisional authorization. 2019-04-05 14:57:55 +02:00
SBiOSoftWhare 73f00428f0 When navigate to room, remove associated delivered notifications. 2019-04-05 14:51:56 +02:00
SBiOSoftWhare 374b45fead Update iOS 10+ notification titles 2019-04-05 10:59:18 +02:00
manuroe 989c4f18d6 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 d92d0407cb Productivity: Fix templates small issue 2019-04-05 09:34:48 +02:00
manuroe d4f9995cba Productivity: Tweak templates: No comments in a storyboard 2019-04-05 08:52:59 +02:00
manuroe a157a9c2a9 Productivity: Tweak templates a bit more 2019-04-05 08:40:10 +02:00
manuroe ad561a06de Productivity: Improve Templates/README.md 2019-04-05 07:57:53 +02:00
manuroe e5c9a26225 Productivity: Create createRootCoordinator.sh 2019-04-04 22:11:52 +02:00
manuroe 33bfc1bb2b Productivity: Tweak templates a bit more 2019-04-04 21:06:46 +02:00
manuroe c756686577 Productivity: Tweak templates a bit 2019-04-04 18:59:06 +02:00
manuroe e4b05606bb Productivity: createScreen.sh: Fix subFolder parameter again 2019-04-04 18:58:32 +02:00
manuroe 9e30a49e60 Productivity: createScreen.sh: Fix subFolder parameter 2019-04-04 18:35:58 +02:00
manuroe 6967b918ec CHANGES 2019-04-04 18:20:21 +02:00
manuroe df32615456 Productivity: Create createScreen.sh 2019-04-04 18:17:19 +02:00
manuroe 576060fba9 Productivity: SwiftGen: expose all storyboards from Modules/
except one that is in Objc
2019-04-04 18:01:46 +02:00
SBiOSoftWhare 5645dfa43f Update notification strings for notification titles 2019-04-04 17:45:13 +02:00
manuroe 6c48ecf0cc Productivity: Create templates for screens and flow root coordinators 2019-04-04 17:10:21 +02:00
SBiOSoftWhare 6b927b7ebe 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 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 85193e280a 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 7b17bc12c4 Update memory usage log in ShareExtensionManager 2019-04-02 15:44:59 +02:00
SBiOSoftWhare 13f77af2d5 Update changes 2019-04-02 15:10:15 +02:00
SBiOSoftWhare 8d02f5799a Log image compression size choice in share extension to help debug memory warnings 2019-04-02 15:01:50 +02:00
SBiOSoftWhare e9e0a09231 Log memory usage when receive a memory warning 2019-04-02 14:42:43 +02:00
SBiOSoftWhare c4e19c07c6 Fix a crash when receive memory warning in ShareExtensionManager 2019-04-02 14:20:05 +02:00
manuroe d8b555b895 Push: More logs 2019-04-02 09:51:53 +02:00