Commit Graph

402 Commits

Author SHA1 Message Date
Frank Rotermund
7758c3faee Feature/3323 bum build 2022-07-18 14:30:28 +00:00
Frank Rotermund
316d2a57bd MESSENGER-3269 Compilability 2022-06-19 14:53:02 +02:00
Frank Rotermund
1ab51f37f8 Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
# Conflicts:
#	Config/AppIdentifiers.xcconfig
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Modules/Analytics/DecryptionFailureTracker.m
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Onboarding/OnboardingCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/SupportingFiles/Info.plist
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.h
#	Riot/Utils/Tools.m
#	Riot/target.yml
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
#	fastlane/Fastfile
#	project.yml
2022-06-12 19:49:46 +02:00
gulekismail
4ac34e8358 changelog.d: Upgrade MatrixSDK version ([v0.23.8](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.8)). 2022-06-03 13:24:15 +03:00
wtimme
3badc14d88 Merge remote-tracking branch 'origin/develop' into feature/No-Ticket-Inhibit-all-warnings-from-pods 2022-05-31 19:51:54 +02:00
Doug
bafce5034c changelog.d: Upgrade MatrixSDK version ([v0.23.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.7)). 2022-05-31 13:06:13 +01:00
wtimme
622e2e2936 Let warnings from MatrixSDK and AnalyticsEvents show up in Xcode
As requested by @pixlwave during their review of #6196, these
`inhibit_warnings` directive configure CocoaPods in a way that the
warnings for both MatrixSDK and AnalyticsEvents show up when building
the workspace in Xcode.
2022-05-31 10:50:28 +02:00
wtimme
05e2575208 Remove redundant "inhibit warnings" direction
Since all warnings are inhibited by default, there is no need to
manually set this parameter here to `true`.
2022-05-23 21:44:44 +02:00
wtimme
d48010d9e0 Prevent warnings from 3rd-party code to show up in Xcode
The warnings from 3rd-party code can mostly be ignored, because it is not
under the control of our team. In Xcode, this allows us to focus on
the issues that we are able to fix.
2022-05-23 21:43:35 +02:00
Andy Uhnak
7f0662069d changelog.d: Upgrade MatrixSDK version ([v0.23.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.6)). 2022-05-19 17:05:37 +01:00
Doug
4aba597727 changelog.d: Upgrade MatrixSDK version ([v0.23.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.5)). 2022-05-18 15:09:15 +01:00
Frank Rotermund
cc287d62c0 MESSENGER_2910 buildtag for macpro && source change cocoapods 2022-05-12 07:37:56 +02:00
Stefan Ceriu
1d156d6685 changelog.d: Upgrade MatrixSDK version ([v0.23.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.4)). 2022-05-05 14:52:05 +03:00
Arnfried Griesert
8f9849bef3 changed AnaylitcsEvent commit in Podfile 2022-05-05 09:19:08 +02:00
Arnfried Griesert
dc06d4afe2 updated sdk version 0.23.3_bwi 2022-05-05 07:08:54 +02:00
Arnfried Griesert
966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Arnfried Griesert
4ac0dcc7a3 set sdk version in podfile 2022-05-03 12:57:56 +02:00
Arnfried Griesert
990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
SBiOSoftWhare
6740d93de4 Podfile: Move to iOS 14. Install DSBottomSheet. 2022-04-22 12:36:40 +02:00
SBiOSoftWhare
b14b74e81b Merge branch 'develop' into steve/5723_lls_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift
2022-04-22 12:15:34 +02:00
gulekismail
b15aba90b8 changelog.d: Upgrade MatrixSDK version ([v0.23.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.3)). 2022-04-20 16:07:43 +03:00
Doug
c967f264fe Stop excluding ARM64 simulator builds.
Follows on from an update to JitsiMeetSDK in matrix-ios-sdk.
2022-04-11 13:05:42 +01:00
SBiOSoftWhare
74c6ba22e2 Add DSBottomSheet and update iOS min version to iOS 13. 2022-04-05 17:26:24 +02:00
Doug
233ce32d00 changelog.d: Upgrade MatrixSDK version ([v0.23.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.2)). 2022-04-05 14:58:15 +01:00
Stefan Ceriu
74ce915cb1 changelog.d: Upgrade MatrixSDK version ([v0.23.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.1)). 2022-03-28 13:45:03 +03:00
Stefan Ceriu
be29088296 changelog.d: Upgrade MatrixSDK version ([v0.23.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.0)). 2022-03-22 16:10:13 +02:00
Frank Rotermund
c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Andy Uhnak
0b148bffaf changelog.d: Upgrade MatrixSDK version ([v0.22.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.6)). 2022-03-14 15:45:54 +00:00
Andy Uhnak
1a0bf7f586 changelog.d: Upgrade MatrixSDK version ([v0.22.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.5)). 2022-03-08 16:30:52 +00:00
Doug
f7cb639956 changelog.d: Upgrade MatrixSDK version ([v0.22.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.4)). 2022-02-25 10:45:56 +00:00
Doug
8b466b4cd0 changelog.d: Upgrade MatrixSDK version ([v0.22.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.2)). 2022-02-22 12:19:37 +00:00
Stefan Ceriu
02ab8eec9e Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Stefan Ceriu
35eb1b1889 changelog.d: Upgrade MatrixSDK version ([v0.22.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.1)). 2022-02-16 12:42:00 +02:00
Stefan Ceriu
4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Doug
5a652fcd46 changelog.d: Upgrade MatrixSDK version ([v0.22.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.0)). 2022-02-09 17:57:55 +00:00
SBiOSoftWhare
22f72fdf28 Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2
Message bubbles: Layout for media (part 2)
2022-02-01 17:52:19 +01:00
David Langley
7378847594 Merge pull request #5293 from vector-im/langleyd/5292_refresh_tokens
App: Refresh Tokens Implementation
2022-01-31 08:59:19 +00:00
David Langley
e6ee4a7381 Disable refresh tokens and revert pod and lockfile 2022-01-31 00:28:31 +00:00
SBiOSoftWhare
eac19d4a09 RoomTimelineCellIdentifier: Add specific indentifiers for incoming and outgoing voice message cells. 2022-01-25 14:51:30 +01:00
Doug
f8d76afabd changelog.d: Upgrade MatrixSDK version ([v0.21.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.21.0)). 2022-01-25 12:58:20 +00:00
David Langley
583d5b32fe Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-24 12:19:45 +00:00
Stefan Ceriu
ec1fbed87d vector-im/element-ios/issues/5298 - Removed cocoapods-keys and moved the MapTiler key to the buildSettings. 2022-01-19 16:11:35 +02:00
David Langley
4bc9df0549 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-14 11:43:09 +00:00
Doug
41508ca3b2 changelog.d: Upgrade MatrixSDK version ([v0.20.16](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.16)). 2022-01-11 13:09:21 +00:00
David Langley
8f014961e8 Temporarily point to refresh sdk branch to build alpha 2022-01-11 08:07:59 +00:00
Stefan Ceriu
11beed22c6 Fixed ffmpeg-kit breaking changes after minor release, fixed version to 4.5.1 2022-01-06 13:31:05 +02:00
Stefan Ceriu
bb0088d2d4 vector-im/element-ios/issues/5298 - Attempting to set up cocoapods-keys. 2022-01-04 17:33:32 +02:00
Doug
ecd4bbd63b Move string formatting to Tools.
Revert contacts tracking from MatrixKit.
Final tweaks before PR.
2021-12-16 17:01:22 +00:00
Doug
2ddb17ec7b Support link/html in analytics prompt strings.
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
2021-12-16 17:01:22 +00:00
Doug
d43bf82bca Use matrix-analytics-events generated stubs (locally for now).
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00