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

2197 commits

Author SHA1 Message Date
manuroe
157065c9d3 Device Verification: Fix bell emoji name 2019-05-06 08:19:48 +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
manuroe
8a50ccb077 SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00
manuroe
01e699fdf1 Device Verification: Plug it in the code more 2019-04-17 08:09:43 +02:00
manuroe
dd34bfe716 Device Verification: Plug it in the code 2019-04-16 17:55:40 +02:00
manuroe
e8ed9a19f9 Device Verification: Plug the legacy verification modal 2019-04-16 15:00:57 +02:00
manuroe
4889690698 Device Verification: Do not show back button 2019-04-16 11:36:51 +02:00
manuroe
b12c2af145 Device Verification: Translate emoji 2019-04-16 09:33:25 +02:00
Jeremy O'Brien
70f19f6235 Fix remaining full-width '%' symbols in strings 2019-04-15 20:21:57 -04:00
manuroe
aeb0031fda Device Verification: Verified screen 2019-04-15 18:40:04 +02:00
manuroe
1a7d642325 Device Verification: Verified screen 2019-04-15 18:22:24 +02:00
manuroe
dc978c7f31 Template: Add SimpleScreenTemplate 2019-04-15 17:52:55 +02:00
manuroe
e721b6cf60 Device Verification: Incoming screen: UI: Use a rounded MXKImageView 2019-04-15 15:28:59 +02:00
manuroe
a4a2064970 Device Verification: Incoming screen: UI: plug data 2019-04-15 14:18:44 +02:00
manuroe
bdefacff0e Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe
db8b3c5648 Device Verification: Incoming screen: working on UI 2019-04-13 00:19:01 +02:00
manuroe
a9502603d6 Device Verification: Incoming screen: beginning 2019-04-12 23:19:07 +02:00
manuroe
785bc7f176 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe
d7d78b063b Device Verification: Verify screen: Try to make emoji names fit in their cell 2019-04-11 18:13:55 +02:00
manuroe
b88d4d4f2d Device Verification: Verify screen: bind transaction.confirmSASMatch() 2019-04-11 18:12:30 +02:00
SBiOSoftWhare
125d8eefbb Remove embedded Jitsi framework. 2019-04-11 17:31:56 +02:00
SBiOSoftWhare
5292d2cbaa Update SettingsKeyBackupTableViewSection to prepare restore button removal when all keys are stored on device. 2019-04-11 10:40:26 +02:00
SBiOSoftWhare
7263b268e1
Merge branch 'develop' into avoid_tableview_crashes_settings 2019-04-10 17:49:37 +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
24e74f3577 Make read receipt label text color use primary text color (Fix #2294). 2019-04-10 12:10:15 +02:00
manuroe
b934b26f25 Device Verification: Verify screen: Theme emojis names 2019-04-08 17:10:40 +02:00
manuroe
c9989aef29 Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 16:51:07 +02:00
manuroe
3b6e230c86 Device Verification: Verify screen: Make emojis fit on 2 lines on SE 2019-04-08 16:50:55 +02:00
manuroe
aee917a00d Device Verification: Verify screen: We do not need scrolling for that screen 2019-04-08 16:05:28 +02:00
manuroe
b0a8f8167e Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 15:47:34 +02:00
SBiOSoftWhare
afedb617ec Use one external entry point on AppDelegate to navigate to a room 2019-04-08 13:32:46 +02:00
manuroe
f14b92ba5d Device Verification: Verify screen: display emojis 2019-04-07 00:04:36 +02:00
manuroe
d5102d1611 Device Verification: Start screen: Improve a bit layout (maybe) 2019-04-07 00:00:49 +02:00
manuroe
e32f32668b Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +02:00
manuroe
7269e2fc8b Device Verification: Start verify screen 2019-04-05 19:09:29 +02:00
manuroe
befc960714 Device Verification: Start screen: add transaction cancel 2019-04-05 18:39:57 +02:00
manuroe
b8ee5d7cd6 Device Verification: Start screen: add "Waiting for partner to accept..." 2019-04-05 18:15:05 +02:00
manuroe
0a944c73aa Device Verification: Start start screen UI 2019-04-05 17:43:15 +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
manuroe
c684d0bf6d Device Verification: Start start screen business logic 2019-04-05 15:20:20 +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
3058a92506 Device Verification: boilerplate for the start screen 2019-04-05 09:41:57 +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
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
manuroe
49d5157df3 Push: More logs 2019-04-02 09:51:53 +02:00
manuroe
aa45c141dd Widgets: Use scalar prod urls in Riot mobile apps 
#2349
 2019-03-27 15:45:54 +01:00
manuroe
5857f49dc3 Fix grammar in registration text 
I assume some script needs to be run to generate the other string files, but if you want to just do that yourselves and take the text in this PR I'm totally fine with that.
 2019-03-27 15:44:01 +01:00
manuroe
c24e25a45d
Merge pull request #2344 from vector-im/anoadragon453-patch-1 
Fix grammar in registration text
 2019-03-27 14:04:41 +01:00