Skip to content

Commit

Permalink
Merge pull request #7897 from element-hq/release/1.11.24/release
Browse files Browse the repository at this point in the history 
Release 1.11.24
  • Loading branch information
@Velin92
Velin92 authored Feb 4, 2025
2 parents 6ed7088 + 2cbf087 commit 8755c1f
Show file tree
Hide file tree
Showing 1,432 changed files with 3,212 additions and 2,884 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Changes in 1.11.24 (2025-02-04)

No significant changes.


## Changes in 1.11.23 (2025-01-10)

🙌 Improvements
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/CommonKit.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

#import <Foundation/Foundation.h>
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/UserIndicator.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2022-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/UserIndicatorQueue.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/UserIndicatorRequest.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions Config/AppConfiguration.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions Config/AppVersion.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
//

// Version
MARKETING_VERSION = 1.11.23
CURRENT_PROJECT_VERSION = 1.11.23
MARKETING_VERSION = 1.11.24
CURRENT_PROJECT_VERSION = 1.11.24
4 changes: 2 additions & 2 deletions Config/BuildSettings.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions Config/CommonConfiguration.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions Config/Configurable.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions Config/MDMSettings.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2023, 2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/DesignKit.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

#import <Foundation/Foundation.h>
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Extensions/UIFont.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import UIKit
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/AvatarSize.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/ColorValues.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/Colors.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/ColorsSwiftUI.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/ColorsUIkit.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/Fonts.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import UIKit
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/FontsSwiftUI.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/FontsUIkit.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Source/ThemeV2.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Variants/Colors/Dark/DarkColors.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Variants/Colors/Light/LightColors.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions DesignKit/Variants/Fonts/ElementFonts.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//

import SwiftUI
Expand Down
4 changes: 2 additions & 2 deletions IDETemplateMacros.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<string>
// Copyright ___YEAR___ New Vector Ltd
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//</string>
</dict>
</plist>
6 changes: 6 additions & 0 deletions LICENSE-COMMERCIAL
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Licensees holding a valid commercial license with Element may use this
software in accordance with the terms contained in a written agreement
between you and Element.

To purchase a commercial license please contact our sales team at
licensing@element.io
1 change: 0 additions & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ end

def import_SwiftUI_pods
pod 'Introspect', '~> 0.1'
pod 'DSBottomSheet', '~> 0.3'
pod 'ZXingObjC', '~> 3.6.9'
end

Expand Down
Loading

0 comments on commit 8755c1f

Please sign in to comment.