diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index 36155ac67..9395ee3cd 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,37 @@ +Changes in BWI project 2.4.0 (2023-03-14) +=================================================== + +Upstream merge ✨: + +- v1.10.2 + +Features ✨: +- Poll history + +Improvements 🙌: +- Redesigned notes room in chat overview (#4211) +- New login flow for BwM (#4231) +- Better permalink-header handling (#4146) +- Display user search results alphabetically (#3076) +- Text changes for downtime info (#4157) +- Changed text of reset passphrase button (#4167) +- Changed pin confirmation text (#4168) +- Color changes for ui elements (#4179) +- Improved forgot password text (#4161) + +Bugfix 🐛: +- Fix for Cross-Signing error (#4303) +- Fix for status message getting cut off (#4197) +- Fix wrong number for room invites in chat overview (#4173) + +Translations 🗣 : + +SDK API changes ⚠️: + ++Build 🧱: + + + Changes in BWI project 2.3.0 (2023-02-14) =================================================== diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index 36e412c9a..8e8f956ba 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -460,7 +460,7 @@ class BWIBuildSettings: NSObject { var passwordIndicatorOnLogin = true // MARK: Displays the element base version on the settings screen - var elementBaseVersion = "1.9.15" + var elementBaseVersion = "1.10.2" var showElementBaseVersion = true diff --git a/Podfile b/Podfile index d266e5210..1db1e5246 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.25.1_bwi_beta' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.25.1_bwi' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/Podfile.lock b/Podfile.lock index 3e61d0f7e..0c0df8d50 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -126,8 +126,8 @@ DEPENDENCIES: - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - MatomoTracker (~> 7.4.1) - - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v0.25.1_bwi_beta`) - - MatrixSDK/JingleCallStack (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v0.25.1_bwi_beta`) + - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v0.25.1_bwi`) + - MatrixSDK/JingleCallStack (from `https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk`, tag `v0.25.1_bwi`) - OLMKit - PostHog (~> 1.4.4) - ReadMoreTextView (~> 3.0.1) @@ -197,7 +197,7 @@ EXTERNAL SOURCES: :git: https://github.com/matrix-org/matrix-analytics-events.git MatrixSDK: :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk - :tag: v0.25.1_bwi_beta + :tag: v0.25.1_bwi CHECKOUT OPTIONS: AnalyticsEvents: @@ -205,7 +205,7 @@ CHECKOUT OPTIONS: :git: https://github.com/matrix-org/matrix-analytics-events.git MatrixSDK: :git: https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk - :tag: v0.25.1_bwi_beta + :tag: v0.25.1_bwi SPEC CHECKSUMS: AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58 @@ -254,6 +254,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: e4c596034adbad09681a3a6913c9ff04c5a3e0a9 +PODFILE CHECKSUM: 77cc55e6c933c93b7fce2eadb05d0e1a1ed59d1d COCOAPODS: 1.11.3 diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings index e3cc8c99b..4d71ff2ae 100644 --- a/Riot/Assets/de.lproj/Bwi.strings +++ b/Riot/Assets/de.lproj/Bwi.strings @@ -169,6 +169,7 @@ "bwi_room_participants_section_admin" = "Admin"; "bwi_room_participants_section_moderator" = "Moderator"; "bwi_room_participants_section_member" = "Mitglied"; +"bwi_room_participants_section_invite" = "Eingeladen"; // MARK: - Settings diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings index 5b73a50a6..33f5ce266 100644 --- a/Riot/Assets/en.lproj/Bwi.strings +++ b/Riot/Assets/en.lproj/Bwi.strings @@ -139,6 +139,7 @@ "bwi_room_participants_section_admin" = "Admin"; "bwi_room_participants_section_moderator" = "Moderator"; "bwi_room_participants_section_member" = "Member"; +"bwi_room_participants_section_invite" = "Invited"; // MARK: - Settings diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index aaf1b3d8e..fda91bd74 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,35 @@ +
+

+ Version 2.4.0 +

+ +

+ Neue Funktionen +

+

+ +

+ Verbesserungen +

+

+ +

+ Behobene Bugs +

+

+

Version 2.3.0 diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift index 91e714937..95546f92c 100644 --- a/Riot/Generated/BWIStrings.swift +++ b/Riot/Generated/BWIStrings.swift @@ -447,6 +447,10 @@ public class BWIL10n: NSObject { public static var bwiRoomParticipantsSectionAdmin: String { return BWIL10n.tr("Bwi", "bwi_room_participants_section_admin") } + /// Eingeladen + public static var bwiRoomParticipantsSectionInvite: String { + return BWIL10n.tr("Bwi", "bwi_room_participants_section_invite") + } /// Mitglied public static var bwiRoomParticipantsSectionMember: String { return BWIL10n.tr("Bwi", "bwi_room_participants_section_member") diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m index 4a22b0693..2fc6c118a 100644 --- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m +++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m @@ -1199,7 +1199,7 @@ if (section == invitedSection) { - headerLabel.text = [VectorL10n roomParticipantsInvitedSection]; + headerLabel.text = BWIL10n.bwiRoomParticipantsSectionInvite; } else if (section == adminSection) { headerLabel.text = BWIL10n.bwiRoomParticipantsSectionAdmin;