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
9549 commits 46 branches 261 tags 144 MiB
Commit graph

9549 commits

This branch
This branch
All branches
Author SHA1 Message Date
SBiOSoftWhare
b822da44cc Jitsi Well-Known: Add links to the documentation. 2020-11-02 15:34:53 +01:00
SBiOSoftWhare
fc517a683f Merge branch 'develop' into element_3655 2020-11-02 15:11:55 +01:00
manuroe
4624636612 Fix CHANGES 2020-10-30 13:01:33 +01:00
manuroe
504a0ea22d
Merge pull request #3764 from vector-im/xcode12 
Upgrade to Xcode 12
 2020-10-30 10:19:07 +01:00
manuroe
054e5d2618 Update CHANGES after coming back to develop 2020-10-30 09:48:02 +01:00
manuroe
301044deb5 Podfile.lock: Use Jitsi 2.10.2 for xcode 12 2020-10-30 09:47:20 +01:00
manuroe
b7807f9f81 Merge branch 'develop' into xcode12 2020-10-30 09:43:04 +01:00
manuroe
691cbec4d8 Podfile: Revert the xcode12 branch 2020-10-30 09:40:25 +01:00
SBiOSoftWhare
1928b8d39c Add SwiftBase32 and SwiftJWT pods. 2020-10-28 00:24:19 +01:00
SBiOSoftWhare
fd5707b6ec Update pbxproj. 2020-10-28 00:02:52 +01:00
SBiOSoftWhare
ad85da3d1b JitsiViewController: Handle authenticated Jitsi widget when needed. 2020-10-28 00:00:23 +01:00
SBiOSoftWhare
0c1181fec9 JitsiService: Handle Jitsi JWT token generation. 2020-10-27 23:54:36 +01:00
SBiOSoftWhare
b8f6a81659 Create JitsiJWTTokenBuilder that creates a JWT token for jitsi openidtoken-jwt authentication. 2020-10-27 23:42:18 +01:00
SBiOSoftWhare
21171b6716 WidgetManager: Use JitsiService to generate Jitsi widget content. 2020-10-27 15:35:57 +01:00
SBiOSoftWhare
aafdf53598 JitsiService: Handle Well Known retrieval and Jitsi widget content creation. 2020-10-27 15:31:30 +01:00
SBiOSoftWhare
7902a66c07 JitsiWidgetData: Add authentication type field. 2020-10-27 15:30:15 +01:00
SBiOSoftWhare
3696f63890 Add Base32Coder class. 2020-10-27 15:27:27 +01:00
manuroe
b1d2024ea4 Prepare for new sprint 2020-10-27 14:22:06 +01:00
manuroe
0ee6f3927b Merge branch 'master' into develop 2020-10-27 14:22:01 +01:00
manuroe
be1ad9f82e Merge branch 'release/1.0.18/master' 2020-10-27 14:21:51 +01:00
manuroe
4812a79ae7 finish version++ 2020-10-27 14:21:51 +01:00
manuroe
b09b947147
Merge pull request #3771 from vector-im/release/1.0.18/release 
Release 1.0.18
 2020-10-27 14:21:10 +01:00
manuroe
893e611e52 version++ 2020-10-27 13:58:56 +01:00
manuroe
dc1dbcd2af
Merge pull request #3763 from stragu/patch-1 
fix typos in English UI messages
 2020-10-27 10:37:14 +01:00
SBiOSoftWhare
894c4f88d0 Add Jitsi Well Known codable representation. 2020-10-27 10:16:39 +01:00
manuroe
e5f625a323
Merge pull request #3769 from vector-im/pin_code_skip_fast_switching 
PIN: Fix code bypass on fast switching
 2020-10-26 16:28:47 +01:00
manuroe
c211bf3bc9 PIN: Fix code bypass on fast switching 2020-10-26 16:09:39 +01:00
manuroe
27ce345b9f
Merge pull request #3768 from vector-im/ImageSizeDialog 
BuildSettings: Centralise RoomInputToolbar compression mode setting
 2020-10-26 10:58:37 +01:00
manuroe
58d9f6d447 BuildSettings: Centralise RoomInputToolbar compression mode setting 2020-10-26 10:24:40 +01:00
manuroe
931c3aae50 Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated 
Apply what https://stackoverflow.com/a/63955114 describes
 2020-10-23 13:58:53 +02:00
manuroe
e52a9f895e Update Gems 2020-10-23 13:54:46 +02:00
manuroe
cd0dfa3379 Upgrade to Xcode 12 
#3712
 2020-10-22 14:31:17 +02:00
ismailgulek
0f5d23db2a
Merge pull request #3726 from vector-im/element_3570 
Update Pods
 2020-10-22 12:31:11 +03:00
Stéphane Guillou
17699bc3af
mention typo fixes 2020-10-22 13:41:37 +10:00
Stéphane Guillou
cd75c832b1
fix two typos 2020-10-22 13:33:40 +10:00
ismailgulek
a2efe16aa7
Merge pull request #3755 from vector-im/crash_fixes 
Crash fixes
 2020-10-19 22:54:32 +03:00
ismailgulek
f59204eca9 Move removing back title to viewDidLoad 2020-10-19 22:37:28 +03:00
ismailgulek
226f12bf15 Fix crash when navigating to a room member 2020-10-16 14:27:45 +03:00
ismailgulek
804c62bf17 Fix navigationBar transcluency in ContactDetailtsViewController 2020-10-16 13:41:24 +03:00
ismailgulek
9174e9630e
Merge branch 'develop' into element_3570 2020-10-16 11:52:12 +03:00
SBiOSoftWhare
a444f2aef2
Merge pull request #3753 from vector-im/secure_backup_hide_key 
Secure backup: Add possibility to not expose recovery key when creating a secure backup
 2020-10-15 16:40:15 +02:00
SBiOSoftWhare
01f0a6ccf3
Update Riot/Assets/en.lproj/Vector.strings 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-10-15 16:08:12 +02:00
SBiOSoftWhare
fb8704c2a1 Update changes 2020-10-15 15:28:44 +02:00
SBiOSoftWhare
f725770586 Secure backup: Add possibility to not expose recovery key when creating a secure backup. 2020-10-15 15:27:26 +02:00
ismailgulek
e62e9dac8d Remove old segue identifiers and handling 2020-10-15 14:43:01 +03:00
ismailgulek
e4cdbf4fd0 Remove old segue identifiers and handling 2020-10-15 14:18:13 +03:00
ismailgulek
567d0bf1ba Fix crash when navigating to file search result 2020-10-15 14:17:37 +03:00
ismailgulek
ee124ebb43 Fix crash when navigating to message search result 2020-10-15 14:17:06 +03:00
manuroe
2a6fb14f34 Prepare for new sprint 2020-10-14 17:47:45 +02:00
manuroe
58192ebfca Merge branch 'master' into develop 2020-10-14 17:47:40 +02:00