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.

Sign up for GitHub

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/element ios 1.11.19 #1115

Merged
merged 21 commits into from
Nov 6, 2024
Merged

Rebase/element ios 1.11.19 #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
77d427b
Merge branch 'master' into develop
Velin92 Sep 17, 2024
de8c3ec
Prepare for new sprint
Velin92 Sep 17, 2024
9c13228
update license
Velin92 Sep 25, 2024
761a5f1
update license macro
Velin92 Sep 25, 2024
11d4148
Merge pull request #7851 from element-hq/mauroromito/license_update
Velin92 Sep 25, 2024
4b2029c
Libolm removal
Velin92 Sep 27, 2024
7519524
fix
Velin92 Sep 27, 2024
d7e65fa
update submodule
Velin92 Oct 9, 2024
9d1ba61
removed unused code
Velin92 Oct 9, 2024
611a906
remove obsolete tests
Velin92 Oct 9, 2024
6853e50
update submodule
Velin92 Oct 15, 2024
969aee2
comments
Velin92 Oct 15, 2024
7da255a
Merge pull request #7852 from element-hq/mauroromito/libolm_deprecate…
Velin92 Oct 15, 2024
9e3075e
version++
Velin92 Oct 15, 2024
b0e6377
Merge pull request #7855 from element-hq/release/1.11.19/release
Velin92 Oct 15, 2024
ab45f6c
finish version++
Velin92 Oct 15, 2024
f823ab9
Merge branch 'release/1.11.19/master'
Velin92 Oct 15, 2024
37f0a15
Merge vector-im/element-ios v1.11.19 into element-rebase
Nov 6, 2024
d4d29ec
Resolve conflicts on Rebase/Element-v1.11.19 into Tchap
Nov 6, 2024
88f2493
Update matrix submodule
Nov 6, 2024
6ea74b8
Add changelog
Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Btchap/Generated/InfoPlist.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ internal enum InfoPlist {
internal static let cfBundlePackageType: String = _document["CFBundlePackageType"]
internal static let cfBundleShortVersionString: String = _document["CFBundleShortVersionString"]
internal static let cfBundleSignature: String = _document["CFBundleSignature"]
internal static let cfBundleURLTypes: [[String: Any]] = _document["CFBundleURLTypes"]
internal static let cfBundleVersion: String = _document["CFBundleVersion"]
internal static let itsAppUsesNonExemptEncryption: Bool = _document["ITSAppUsesNonExemptEncryption"]
internal static let itsEncryptionExportComplianceCode: String = _document["ITSEncryptionExportComplianceCode"]
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Changes in 1.11.19 (2024-10-15)

No significant changes.


## Changes in 1.11.18 (2024-09-17)

🙌 Improvements
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/CommonKit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

#import <Foundation/Foundation.h>
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/Tests/UserIndicatorPresenterSpy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/Tests/UserIndicatorQueueTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/Tests/UserIndicatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/UserIndicator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/UserIndicatorDismissal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/UserIndicatorPresentationContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2022 New Vector Ltd
// Copyright 2022-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/UserIndicatorQueue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/UserIndicatorRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions CommonKit/Source/UserIndicators/UserIndicatorViewPresentable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
14 changes: 3 additions & 11 deletions Config/AppConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
//
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
14 changes: 3 additions & 11 deletions Config/BuildSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
//
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
14 changes: 3 additions & 11 deletions Config/CommonConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
//
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
14 changes: 3 additions & 11 deletions Config/Configurable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
//
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions Config/MDMSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2023 New Vector Ltd
// Copyright 2023, 2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
15 changes: 3 additions & 12 deletions DesignKit/DesignKit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

#import <Foundation/Foundation.h>
Expand Down
15 changes: 3 additions & 12 deletions DesignKit/Extensions/UIFont.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import UIKit
Expand Down
15 changes: 3 additions & 12 deletions DesignKit/Source/AvatarSize.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
//
// Copyright 2021 New Vector Ltd
// Copyright 2021-2024 New Vector Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
//

import Foundation
Expand Down
Loading
Loading