Skip to content

Commit 6c4104a

Browse files
kaylendogkaylendog
authored
Merge branch 'develop' into kaylendog/history-sharing/alert-impl
2 parents 5de5642 + 8638c06 commit 6c4104a

File tree

3,983 files changed

+11679
-7458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,983 files changed

+11679
-7458
lines changed

‎.github/workflows/scripts/maestro/local-recording.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/sh
22

33
#
4+
# Copyright (c) 2025 Element Creations Ltd.
45
# Copyright 2024 New Vector Ltd.
56
#
6-
# SPDX-License-Identifier: AGPL-3.0-only
7+
# SPDX-License-Identifier: AGPL-3.0-only.
78
# Please see LICENSE in the repository root for full details.
89
#
910

‎.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/sh
22

33
#
4+
# Copyright (c) 2025 Element Creations Ltd.
45
# Copyright 2024 New Vector Ltd.
56
#
6-
# SPDX-License-Identifier: AGPL-3.0-only
7+
# SPDX-License-Identifier: AGPL-3.0-only.
78
# Please see LICENSE in the repository root for full details.
89
#
910

‎.github/workflows/scripts/recordScreenshots.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

3+
# Copyright (c) 2025 Element Creations Ltd.
34
# Copyright 2023-2024 New Vector Ltd.
45
#
5-
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
67
# Please see LICENSE files in the repository root for full details.
78

89
set -e

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright (c) 2025 Element Creations Ltd.
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
4+
# Please see LICENSE files in the repository root for full details.
5+
16
# Built application files
27
*.apk
38
*.ap_

‎.idea/copyright/Element_Enterprise.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/Element_FOSS.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,10 @@ If after your research you still have a question, ask at [#element-x-android:mat
102102

103103
## Copyright and License
104104

105-
Copyright (c) 2022 - 2025 New Vector Ltd
105+
Copyright (c) 2025 Element Creations Ltd.
106+
Copyright (c) 2022 - 2025 New Vector Ltd.
106107

107-
This software is dual licensed by New Vector Ltd (Element). It can be used either:
108+
This software is dual licensed by Element Creations Ltd (Element). It can be used either:
108109

109110
(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
110111

‎annotations/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2-
* Copyright 2022-2024 New Vector Ltd.
2+
* Copyright (c) 2025 Element Creations Ltd.
3+
* Copyright 2022-2025 New Vector Ltd.
34
*
4-
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
56
* Please see LICENSE files in the repository root for full details.
67
*/
78
plugins {

‎annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2-
* Copyright 2023, 2024 New Vector Ltd.
2+
* Copyright (c) 2025 Element Creations Ltd.
3+
* Copyright 2023-2025 New Vector Ltd.
34
*
4-
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
56
* Please see LICENSE files in the repository root for full details.
67
*/
78

‎app/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2-
* Copyright 2022-2024 New Vector Ltd.
2+
* Copyright (c) 2025 Element Creations Ltd.
3+
* Copyright 2022-2025 New Vector Ltd.
34
*
4-
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
56
* Please see LICENSE files in the repository root for full details.
67
*/
78

0 commit comments

Comments
 (0)