Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
5787 commits 46 branches 261 tags 144 MiB
Commit graph

2150 commits

Author SHA1 Message Date
manuroe
65ec1e9988 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00
manuroe
7cd5e79bc6 Reactions: Customise primary reactions buttons 2019-05-15 23:35:09 +02:00
manuroe
52a480db92 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe
e419eecfeb Reactions: Add primary reactions as message actions 2019-05-15 16:00:36 +02:00
manuroe
ef4fed1bb2 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe
16dc04e18d RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode 
because message editing (#2404) is coming
 2019-04-30 17:08:52 +02:00
SBiOSoftWhare
3e430e7b45 Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
SBiOSoftWhare
49fc828012 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
6a9c95b59e Add a description for NSCalendarsUsageDescription 
This permission has been introduced by the jitsi update.
 2019-04-26 15:42:05 +02:00
manuroe
98bd723a9b Strings.swift 2019-04-26 15:11:20 +02:00
manuroe
15698b8b91 Add a description for NSCalendarsUsageDescription 
This permission has been introduced by the jitsi update.
 2019-04-26 15:10:56 +02:00
manuroe
08d83114fe
Merge pull request #2378 from aaronraimist/homeserver 
home server -> homeserver (#2345)
 2019-04-26 11:41:47 +02:00
SBiOSoftWhare
3da89a05ce Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare
cdede7fcce Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare
24d7c087fb Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare
04b5dd0b58 Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare
d1d9b9f990 Remove iOS 9 local notification API usage 2019-04-25 11:52:33 +02:00
manuroe
07a5cba40a
Update Riot/Assets/de.lproj/Vector.strings 
Co-Authored-By: aaronraimist <aaron@raim.ist>
 2019-04-24 14:02:07 -05:00
manuroe
27d6842e2d
Update Riot/Assets/de.lproj/Vector.strings 
Co-Authored-By: aaronraimist <aaron@raim.ist>
 2019-04-24 14:02:02 -05:00
manuroe
aa7661052d
Update Riot/Assets/de.lproj/Vector.strings 
Co-Authored-By: aaronraimist <aaron@raim.ist>
 2019-04-24 14:01:49 -05:00
SBiOSoftWhare
cd009f5fd1
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
5466e87452
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
42ddca925f Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare
87a6d13855 [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare
84660597fb Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe
8d68da4da8
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
cab15e7477
Merge pull request #2372 from vector-im/riot_2323 
E2E: SAS Verification
 2019-04-24 14:51:04 +02:00
manuroe
b4c0a77ca1 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe
a1901e6238 Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
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
7bc6ba25af Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe
6eadbbdae0 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00
manuroe
3c0237a4bd Device Verification: Fix Steve's PR comments 2019-04-24 08:18:56 +02:00
manuroe
4b2af64d0a Device Verification: Update SDK constant names changes 2019-04-24 08:07:50 +02:00
Aaron Raimist
d710b3788d
home server -> homeserver (#2345) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-04-19 21:27:10 -05:00
SBiOSoftWhare
b4c1cd0376 Update JistiViewController to use new JitsiMeet SDK API 2019-04-19 18:34:44 +02:00
SBiOSoftWhare
4c40fa2e4d Configure handle Jitsi configuration in AppDelegate 2019-04-19 18:33:21 +02:00
SBiOSoftWhare
b6e847c638 Create JitsiService to abstract and configure Jisti Meet SDK 2019-04-19 18:29:53 +02:00
SBiOSoftWhare
39e51910f8 Put Jitsi server URL in Riot-Defaults.plist 2019-04-19 18:28:39 +02:00
manuroe
e90fa1c323 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
manuroe
bffe14f760 Device Verification: Manage display of SAS decimals 2019-04-19 11:31:19 +02:00
manuroe
b838e1c2d5 Device Verification: Clean dev code 2019-04-19 10:35:02 +02:00
manuroe
7ffe79748a Device Verification: Manage queue of incoming requests 2019-04-18 23:15:01 +02:00
manuroe
1df16d8ac7 Device Verification: Start: Fix missing cancelledByMe state 2019-04-18 23:12:01 +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
manuroe
771444573d Device Verification: MXUser.displayname and avatar can be nil 2019-04-17 13:54:51 +02:00
manuroe
bcacc78b3c Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe
5cad9743fb Device Verification: Removed unused code from templates 2019-04-17 12:52:45 +02:00
manuroe
d49dce7dcb Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe
ce47ea0277 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