Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to Element 1.11.18 and Matrix 0.27.14 #1097

Merged
merged 56 commits into from
Oct 7, 2024
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
1e5077b
Merge branch 'master' into develop
Velin92 Jun 18, 2024
f65a4bd
Prepare for new sprint
Velin92 Jun 18, 2024
515cfde
Update the SDK. (#7819)
pixlwave Jun 24, 2024
2063a4a
updated SDK
Velin92 Jul 5, 2024
17d4d68
updated the submodule
Velin92 Jul 5, 2024
bc69a31
Merge pull request #7820 from element-hq/mauroromito/authenticated_media
Velin92 Jul 8, 2024
269d71d
Translated using Weblate (Estonian)
Jun 17, 2024
9192664
Translated using Weblate (Estonian)
Jun 17, 2024
3f7aa67
Translated using Weblate (Albanian)
ujdhesa Jun 18, 2024
8a021d8
Translated using Weblate (Indonesian)
Linerly Jun 18, 2024
9099ab3
Translated using Weblate (Swedish)
LinAGKar Jun 20, 2024
61a942e
Translated using Weblate (Slovak)
dodog Jun 26, 2024
1da77bc
Translated using Weblate (Hungarian)
Jun 28, 2024
74c54d0
Translated using Weblate (Ukrainian)
IhorHordiichuk Jun 30, 2024
63e547d
Translated using Weblate (Italian)
Jul 13, 2024
f477807
Translated using Weblate (Hungarian)
simsononroad Jul 14, 2024
d06b601
Merge pull request #7823 from RiotTranslateBot/weblate-riot-ios-riot-ios
Velin92 Jul 23, 2024
b7ff327
version++
Velin92 Jul 23, 2024
14a6892
Merge pull request #7824 from element-hq/release/1.11.16/release
Velin92 Jul 23, 2024
3ba9683
finish version++
Velin92 Jul 23, 2024
56d9e1f
Merge branch 'release/1.11.16/master'
Velin92 Jul 23, 2024
f8a8c90
Merge branch 'master' into develop
Velin92 Jul 23, 2024
3149392
Prepare for new sprint
Velin92 Jul 23, 2024
0d65fc1
Update sonarcloud project key (#7826)
guillaumevillemont Aug 5, 2024
2229487
Update FLEX.
pixlwave Aug 7, 2024
ac3fcbd
Merge pull request #7829 from element-hq/doug/update-flex
stefanceriu Aug 12, 2024
c4387b9
Check power level before starting live sharing location (#7832)
pixlwave Aug 14, 2024
39a359d
Fix dead image link (#7682)
hughns Aug 14, 2024
09b9f4e
Use the codecov token. (#7834)
pixlwave Aug 20, 2024
6169266
Update the SDK submodule.
pixlwave Aug 20, 2024
1c2282e
version++
pixlwave Aug 20, 2024
2230d3b
Merge pull request #7835 from element-hq/release/1.11.17/release
pixlwave Aug 20, 2024
6c9b06c
finish version++
pixlwave Aug 20, 2024
4064000
Merge branch 'release/1.11.17/master'
pixlwave Aug 20, 2024
4bd059f
Merge branch 'master' into develop
pixlwave Aug 20, 2024
907be3f
Prepare for new sprint
pixlwave Aug 20, 2024
3c58143
fixed some swiftlint errors
Velin92 Sep 13, 2024
f8d7cff
update SDK commit
Velin92 Sep 16, 2024
909c38b
update podfile.lock
Velin92 Sep 16, 2024
1ec19bd
Merge pull request #7843 from element-hq/mauroromito/swap_contentscan…
Velin92 Sep 16, 2024
260aed1
Translated using Weblate (Korean)
A1ae17 Aug 26, 2024
5d21439
Translated using Weblate (Korean)
A1ae17 Aug 26, 2024
85226c1
Translated using Weblate (Korean)
A1ae17 Aug 26, 2024
80ef908
Merge branch 'weblate-riot-ios-riot-ios-dialogs' into mauroromito/web…
Velin92 Sep 17, 2024
98c02de
Merge branch 'weblate-riot-ios-riot-ios-push' into mauroromito/weblat…
Velin92 Sep 17, 2024
7e4426d
Merge pull request #7848 from element-hq/mauroromito/weblate_release
Velin92 Sep 17, 2024
1e19a46
version++
Velin92 Sep 17, 2024
24eb2e9
Update CHANGES.md
Velin92 Sep 17, 2024
3cebb60
Merge pull request #7849 from element-hq/release/1.11.18/release
Velin92 Sep 17, 2024
5e77997
finish version++
Velin92 Sep 17, 2024
fa72182
Merge branch 'release/1.11.18/master'
Velin92 Sep 17, 2024
7d851f0
Merge vector-im/element-ios v1.11.18 into element-rebase
NicolasBuquet Sep 26, 2024
36258ee
Resolve conflicts on Rebase/Element-v1.11.18 into Tchap
NicolasBuquet Sep 26, 2024
747b11c
Matrix-ios-SDK Updated
NicolasBuquet Sep 26, 2024
0d2f4e0
Add changelog
NicolasBuquet Sep 26, 2024
0c0cdd1
Bump codecov-action version
NicolasBuquet Oct 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update podfile.lock
  • Loading branch information
Velin92 committed Sep 16, 2024
commit 909c38bc1c465b49e6bbce3264d3bbad0526ffd5
36 changes: 18 additions & 18 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ PODS:
- GBDeviceInfo/Core (= 7.1.0)
- GBDeviceInfo/Core (7.1.0)
- GZIP (1.3.2)
- Introspect (0.11.0)
- Introspect (0.12.0)
- JitsiMeetSDKLite (8.1.2-lite):
- JitsiWebRTC (~> 111.0)
- JitsiWebRTC (111.0.2)
@@ -39,20 +39,20 @@ PODS:
- LoggerAPI (1.9.200):
- Logging (~> 1.1)
- Logging (1.4.0)
- MatrixSDK (0.27.11):
- MatrixSDK/Core (= 0.27.11)
- MatrixSDK/Core (0.27.11):
- MatrixSDK (0.27.13):
- MatrixSDK/Core (= 0.27.13)
- MatrixSDK/Core (0.27.13):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- MatrixSDKCrypto (= 0.4.2)
- MatrixSDKCrypto (= 0.4.3)
- OLMKit (~> 3.2.5)
- Realm (= 10.27.0)
- SwiftyBeaver (= 1.9.5)
- MatrixSDK/JingleCallStack (0.27.11):
- MatrixSDK/JingleCallStack (0.27.13):
- JitsiMeetSDKLite (= 8.1.2-lite)
- MatrixSDK/Core
- MatrixSDKCrypto (0.4.2)
- MatrixSDKCrypto (0.4.3)
- OLMKit (3.2.12):
- OLMKit/olmc (= 3.2.12)
- OLMKit/olmcpp (= 3.2.12)
@@ -72,15 +72,15 @@ PODS:
- Sentry/Core (7.15.0)
- SideMenu (6.5.0)
- SwiftBase32 (0.9.0)
- SwiftFormat/CLI (0.50.2)
- SwiftGen (6.6.2)
- SwiftFormat/CLI (0.54.5)
- SwiftGen (6.6.3)
- SwiftJWT (3.6.200):
- BlueCryptor (~> 1.0)
- BlueECC (~> 1.1)
- BlueRSA (~> 1.0)
- KituraContracts (~> 1.2)
- LoggerAPI (~> 1.7)
- SwiftLint (0.49.1)
- SwiftLint (0.57.0)
- SwiftyBeaver (1.9.5)
- UICollectionViewLeftAlignedLayout (1.0.2)
- UICollectionViewRightAlignedLayout (0.0.3)
@@ -177,7 +177,7 @@ SPEC CHECKSUMS:
FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
Introspect: 4cc1e4c34dd016540c8d86a591c231c09dafbee3
Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
@@ -187,26 +187,26 @@ SPEC CHECKSUMS:
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatrixSDK: 7c29e5cc8934cfc1f81f83fcfa17cd652612086d
MatrixSDKCrypto: 736069ee0a5ec12852ab3498bf2242acecc443fc
MatrixSDK: 1dae186c839eb145974fc1fc127ec903de60a297
MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
SwiftFormat: 710117321c55c82675c0dc03055128efbb13c38f
SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c
SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99
SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
SwiftLint: eb47480d47c982481592c195c221d11013a679cc
SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: 7e14a7efb021fca69b3ffc2ffbe5fe632e6df7ea
PODFILE CHECKSUM: fb3e1c62f9e35a9bdbafce743664bf4f620af028

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2