Commit Graph

486 Commits

Author SHA1 Message Date
Arnfried Griesert 8d75466b30 Changed podfile sdk version to v0.26.12_bwi 2023-08-09 09:14:52 +02:00
Arnfried Griesert 4a6b31128c Final changes before release branch 2023-08-04 12:02:43 +00:00
JanNiklas Grabowski dec65229ff Feature/4905 add migration progress information 2023-07-26 14:30:33 +00:00
JanNiklas Grabowski c884df05af fix build problems 2023-07-17 13:56:08 +02:00
Frank Rotermund 18a516db3b MESSENGER-4884 update build files 2023-07-04 08:24:45 +02:00
Frank Rotermund 54dc0322f0 Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
2023-07-04 08:24:05 +02:00
JanNiklas Grabowski 982879c47e Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
JanNiklas Grabowski 56da60de83 Feature/4753 bum test app 2023-06-26 12:22:44 +00:00
Doug 7c6ff1e463 changelog.d: Upgrade MatrixSDK version ([v0.26.12](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.12)). 2023-06-21 12:01:25 +01:00
Mauro Romito cc69de9fd8 changelog.d: Upgrade MatrixSDK version ([v0.26.11](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.11)). 2023-06-13 14:01:36 +02:00
Arnfried Griesert c2b4d7081b Changed sdk version in Podfile2 2023-06-12 06:48:41 +02:00
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Mauro Romito 8caa159a20 added logging 2023-05-31 19:26:40 +02:00
Frank Rotermund 5179eecaa1 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
Frank Rotermund 260c8de584 Feature/4393 poll with visible participant p1 2023-05-25 13:52:30 +00:00
Element CI 8e2761de4e changelog.d: Upgrade MatrixSDK version ([v0.26.10](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.10)). 2023-05-16 15:46:01 +03:00
JanNiklas Grabowski 0d1e16bae9 MESSENGER-4699 update sdk version 2023-05-11 13:39:05 +02:00
JanNiklas Grabowski 674a44b702 Merge commit '98594fd01fc18ee18fde60a45542f1b4d7040c41' into feature/4699_basis_update_element
* commit '98594fd01fc18ee18fde60a45542f1b4d7040c41': (59 commits)
  finish version++
  Tidy up event formatter issues.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)).
  Translated using Weblate (Russian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Albanian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  Translated using Weblate (Slovak)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Utils/EventFormatter.m
#	fastlane/Fastfile
2023-05-11 13:19:24 +02:00
Frank Rotermund ea0d90cb86 MESSENGER-4697 release prep 2023-05-09 08:44:20 +02:00
Frank Rotermund 130813807a MESSENGER try other source for cocoapods 2023-05-03 10:57:17 +02:00
Frank Rotermund 6b1b8ca65c Feature/4424 blocking requests 2023-05-02 11:01:58 +00:00
Doug 5ef0b273a0 changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)). 2023-04-18 17:41:11 +01:00
Arnfried Griesert c46a160065 Changed sdk version in Podfile 2023-04-14 12:44:24 +02:00
Andy Uhnak 7e87e0a2e5 changelog.d: Upgrade MatrixSDK version ([v0.26.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.7)). 2023-04-12 16:53:25 +01:00
Arnfried Griesert f2ee3e80fb Changed sdk version to v0.26.6_bwi 2023-04-11 12:26:44 +02:00
Arnfried Griesert 3736b8c9fd Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Stefan Ceriu 8e63a7ba31 changelog.d: Upgrade MatrixSDK version ([v0.26.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.6)). 2023-04-04 14:06:57 +03:00
Andy Uhnak f697abacd7 changelog.d: Upgrade MatrixSDK version ([v0.26.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.5)). 2023-03-28 16:54:37 +01:00
Frank Rotermund d3958df0ed MESSENGER-4101 matomo consent changes 2023-03-23 13:34:30 +01:00
Andy Uhnak 622e9eaea0 changelog.d: Upgrade MatrixSDK version ([v0.26.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.4)). 2023-03-22 20:36:19 +00:00
Mauro Romito d2fb8e1df1 changelog.d: Upgrade MatrixSDK version ([v0.26.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.2)). 2023-03-21 17:42:21 +01:00
Arnfried Griesert d118536f6e Revert change in Podfile 2023-03-20 08:22:33 +01:00
Arnfried Griesert 4727a3ddf2 Fixed merge conflicts 2023-03-20 07:33:28 +01:00
Arnfried Griesert 28852aa790 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Doug f0c876d0dd changelog.d: Upgrade MatrixSDK version ([v0.26.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1)). 2023-03-13 16:58:07 +00:00
Doug e1eecd0797 changelog.d: Upgrade MatrixSDK version ([v0.26.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.0)). 2023-03-07 11:49:57 +00:00
Andy Uhnak 5dd1ca6601 Use SwiftPM AnalyticsEvents 2023-03-02 16:59:48 +00:00
Andy Uhnak 65c9dd3b40 CryptoSDK phased rollout feature 2023-02-22 11:25:28 +00:00
Mauro Romito f39b921f65 changelog.d: Upgrade MatrixSDK version ([v0.25.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.2)). 2023-02-21 14:54:24 +01:00
JanNiklas Grabowski b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00
Doug 011c8e1794 changelog.d: Upgrade MatrixSDK version ([v0.25.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.1)). 2023-02-07 12:57:52 +00:00
Doug a83e8b5e52 Merge branch 'master' into develop
# Conflicts:
#	Config/AppVersion.xcconfig
2023-02-02 19:24:51 +00:00
Doug 16b124abf3 changelog.d: Upgrade MatrixSDK version ([v0.25.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.0)). 2023-02-02 18:05:50 +00:00
aringenbach a903196e48 Labs: Rich text editor: enable list items indentation 2023-01-30 15:38:56 +01:00
Doug bfb0ee9d57 changelog.d: Upgrade MatrixSDK version ([v0.24.8](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.8)). 2023-01-24 12:39:28 +00:00
Arnfried Griesert 10e66e2e96 merged release_2_2_0 into develop 2023-01-24 09:24:47 +01:00
Frank Rotermund cf6ed6241e MESSENGER-4073 fix version of html formatter package 2023-01-20 16:02:22 +01:00
Frank Rotermund 3288335a79 MESSENGER-4068 buildfixes 2023-01-16 14:37:53 +01:00
Frank Rotermund d9057cd0cb Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Doug bbfbb924c9 changelog.d: Upgrade MatrixSDK version ([v0.24.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.7)). 2023-01-10 14:13:24 +00:00