Commit Graph

6199 Commits

Author SHA1 Message Date
SBiOSoftWhare 60d30fb3c7 version++ 2019-05-06 11:02:36 +02:00
manuroe 3951d7a45d Device Verification: Fix buttons colors in dark theme 2019-05-06 08:21:30 +02:00
manuroe 13492e2aa7 Device Verification: Fix bell emoji name 2019-05-06 08:19:48 +02:00
manuroe 948946727d RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe 16687b865f RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
because message editing (#2404) is coming
2019-04-30 17:08:52 +02:00
SBiOSoftWhare 17421aea2e Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
SBiOSoftWhare fc22e00281 Add restoreInitialDisplay parameter on -[AppDelegate showRoom:andEventId:withMatrixSession:] method to choose to display a room from home tab or not. 2019-04-29 14:22:01 +02:00
manuroe 436c3d98ad Add a description for NSCalendarsUsageDescription
This permission has been introduced by the jitsi update.
2019-04-26 15:42:05 +02:00
manuroe befaec289f Strings.swift 2019-04-26 15:11:20 +02:00
manuroe e3d432e4a6 Add a description for NSCalendarsUsageDescription
This permission has been introduced by the jitsi update.
2019-04-26 15:10:56 +02:00
manuroe 58f2fd1d23 Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00
SBiOSoftWhare 33387e15bb Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare 1b820225e5 Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare 084909583b Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare cbe155a8cf Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare f70b221974 Remove iOS 9 local notification API usage 2019-04-25 11:52:33 +02:00
manuroe b9ecc2fdf3 Update Riot/Assets/de.lproj/Vector.strings
Co-Authored-By: aaronraimist <aaron@raim.ist>
2019-04-24 14:02:07 -05:00
manuroe b1f438aea1 Update Riot/Assets/de.lproj/Vector.strings
Co-Authored-By: aaronraimist <aaron@raim.ist>
2019-04-24 14:02:02 -05:00
manuroe 562f4b626e Update Riot/Assets/de.lproj/Vector.strings
Co-Authored-By: aaronraimist <aaron@raim.ist>
2019-04-24 14:01:49 -05:00
SBiOSoftWhare 70131f12cc Merge pull request #2382 from vector-im/media_picker_retain_cycles
[Media picker] Fix some retain cycles
2019-04-24 20:39:26 +02:00
manuroe c7fbd5d52a Merge pull request #2369 from neutralinsomniac/fix_full_width_at
Fix remaining full-width '%' symbols in strings
2019-04-24 18:36:33 +02:00
SBiOSoftWhare e4dfbb48ca Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare e48aed12c8 [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare 0c70565ee2 Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe 70c8f161f0 Update Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2019-04-24 15:55:51 +02:00
manuroe 6913fb0c55 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe 554b3b1a68 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe 49b3880327 Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
manuroe 51cf40d3a0 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 58dc082569 Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe d664159a14 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00
manuroe 4d1b701ed0 Device Verification: Fix Steve's PR comments 2019-04-24 08:18:56 +02:00
manuroe 2e71bb5db2 Device Verification: Update SDK constant names changes 2019-04-24 08:07:50 +02:00
Aaron Raimist 324a8757a5 home server -> homeserver (#2345)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-04-19 21:27:10 -05:00
SBiOSoftWhare f328a0d9cd Update JistiViewController to use new JitsiMeet SDK API 2019-04-19 18:34:44 +02:00
SBiOSoftWhare cb073dafb1 Configure handle Jitsi configuration in AppDelegate 2019-04-19 18:33:21 +02:00
SBiOSoftWhare b56d52ff10 Create JitsiService to abstract and configure Jisti Meet SDK 2019-04-19 18:29:53 +02:00
SBiOSoftWhare 75052c7e8f Put Jitsi server URL in Riot-Defaults.plist 2019-04-19 18:28:39 +02:00
manuroe b6d92f0271 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
manuroe 19d6c55b24 Device Verification: Manage display of SAS decimals 2019-04-19 11:31:19 +02:00
manuroe e45018e222 Device Verification: Clean dev code 2019-04-19 10:35:02 +02:00
manuroe 770386a98f Device Verification: Manage queue of incoming requests 2019-04-18 23:15:01 +02:00
manuroe b91749e494 Device Verification: Start: Fix missing cancelledByMe state 2019-04-18 23:12:01 +02:00
J. Ryan Stinnett b826f7ac8d 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
manuroe 00f4857ce2 Device Verification: MXUser.displayname and avatar can be nil 2019-04-17 13:54:51 +02:00
manuroe f2fc4a1f28 Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe 873d674267 Device Verification: Removed unused code from templates 2019-04-17 12:52:45 +02:00
manuroe bfc7038ae7 Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe 3593907360 Device Verification: Hack EncryptionInfoView to display the new device verification flow when the user taps on "Verify" 2019-04-17 09:51:32 +02:00
manuroe 66f8308451 SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00