Skip to content

Commit

Permalink
Merge pull request #1726 from nextcloud/chore/noid/spdx-images
Browse files Browse the repository at this point in the history
Add SPDX header for images/infra/ci/translations
  • Loading branch information
SystemKeeper committed Jul 24, 2024
2 parents 4a17348 + 8faa056 commit 337a115
Show file tree
Hide file tree
Showing 22 changed files with 146 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
SPDX-License-Identifier: MIT
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT
blank_issues_enabled: false
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
SPDX-License-Identifier: MIT
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT
version: 2
updates:
- package-ecosystem: "github-actions"
Expand Down
2 changes: 2 additions & 0 deletions .github/no-response.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT
# Configuration for probot-no-response - https://github.com/probot/no-response

# Number of days of inactivity before an Issue is closed for lack of response
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/localizable.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT

name: Check for localizable changes

on:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT

name: SwiftLint

on:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/uitests.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT

name: Build main target

on:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later
Pods
Podfile.lock
NextcloudTalk.xcodeproj/xcuserdata
Expand Down
2 changes: 2 additions & 0 deletions .pyspelling.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later
matrix:
- name: English localizable file
aspell:
Expand Down
2 changes: 2 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later
opt_in_rules: # some rules are turned off by default, so you need to opt-in
- empty_collection_literal
- empty_count
Expand Down
9 changes: 9 additions & 0 deletions LICENSES/LicenseRef-NextcloudTrademarks.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The Nextcloud marks
Nextcloud and the Nextcloud logo is a registered trademark of Nextcloud GmbH in Germany and/or other countries.
These guidelines cover the following marks pertaining both to the product names and the logo: “Nextcloud”
and the blue/white cloud logo with or without the word Nextcloud; the service “Nextcloud Enterprise”;
and our products: “Nextcloud Files”; “Nextcloud Groupware” and “Nextcloud Talk”.
This set of marks is collectively referred to as the “Nextcloud marks.”

Use of Nextcloud logos and other marks is only permitted under the guidelines provided by the Nextcloud GmbH.
A copy can be found at https://nextcloud.com/trademarks/
49 changes: 49 additions & 0 deletions LICENSES/LicenseRef-XTrademarks.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Trademark policy
April 2023


You may not violate others’ intellectual property rights, including copyright and trademark.

A trademark is a word, logo, phrase, or device that distinguishes a trademark holder’s good or service in the marketplace. Trademark law may prevent others from using a trademark in an unauthorized or confusing manner.


What is in violation of this policy?

Using another’s trademark in a way that may mislead or confuse people about your affiliation may be a violation of our trademark policy.


What is not a violation of this policy?

Referencing another’s trademark is not automatically a violation of X's trademark policy. Examples of non-violations include:

* using a trademark in a way that is outside the scope of the trademark registration e.g., in a different territory, or a different class of goods or services than that identified in the registration; and
* using a trademark in a nominative or other fair use manner. For more information, see our Misleading and deceptive identities policy (https://help.twitter.com/en/rules-and-policies/twitter-impersonation-and-deceptive-identities-policy.html).


Who can report violations of this policy?

X only investigates requests that are submitted by the trademark holder or their authorized representative e.g., a legal representative or other representative for a brand.


How can I report violations of this policy?

You can submit a trademark report through our trademark report form (https://help.twitter.com/forms/trademark). Please provide all the information requested in the form. If you submit an incomplete report, we’ll need to follow up about the missing information. Please note that this will result in a delay in processing your report.

Note: We may provide the account holder with your name and other information included in the copy of the report.


What happens if you violate this policy?

If we determine that you violated our trademark policy, we may suspend your account. Depending on the type of violation, we may give you an opportunity to comply with our policies. In other instances, an account may be permanently suspended upon first review. If you believe that your account was suspended in error, you can submit an appeal (https://help.twitter.com/forms/general?subtopic=suspended).


Additional resources

Learn more about our range of enforcement options (https://help.twitter.com/rules-and-policies/enforcement-options) and our approach to policy development and enforcement (https://help.twitter.com/rules-and-policies/enforcement-philosophy).


Legal disclaimer

By using the X trademarks and resources on this site, you agree to follow the X Trademark Guidelines in our Brand Guidelines — as well as our Terms of Service and all other X rules and policies. If you have any questions, contact us at [email protected].

A copy can be found at https://about.x.com/en/who-we-are/brand-toolkit and https://help.twitter.com/en/rules-and-policies/x-trademark-policy
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<!--
- SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: GPL-3.0-or-later
-->
# Nextcloud Talk iOS app

**Video & audio calls and chat through Nextcloud on iOS**
Expand Down
38 changes: 37 additions & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,47 @@ SPDX-PackageSupplier = "Nextcloud GmbH <https://nextcloud.com/impressum/>"
SPDX-PackageDownloadLocation = "https://github.com/nextcloud/talk-ios/"

[[annotations]]
path = ["Podfile"]
path = [".gitmodules", "Podfile"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2017 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = ["NextcloudTalk/Images.xcassets/app-logo-callkit.imageset/app-logo-callkit*.png", "NextcloudTalk/Images.xcassets/AppIcon.appiconset/*.png", "NextcloudTalk/Images.xcassets/navigationLogo.imageset/navigationLogo*.png", "NextcloudTalk/Images.xcassets/navigationLogoDark.imageset/navigationLogoDark*.png", "NextcloudTalk/Images.xcassets/loginLogo.imageset/loginLogo*.png", "NextcloudTalk/Images.xcassets/navigationLogoOffline.imageset/navigationLogoOffline*.png", "NextcloudTalk/Images.xcassets/launchscreen.imageset/launchscreen*.png", "NextcloudTalk/Images.xcassets/logo-action.imageset/logo-action*.png", "NextcloudTalk/Images.xcassets/talk-20.imageset/talk-20*.png", "Icons/talk.svg"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2016 Nextcloud GmbH"
SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks"

[[annotations]]
path = ["NextcloudTalk/Images.xcassets/twitter.imageset/twitter*.png"]
precedence = "aggregate"
SPDX-FileCopyrightText = "X Corp."
SPDX-License-Identifier = "LicenseRef-XTrademarks"

[[annotations]]
path = ["NextcloudTalk/Images.xcassets/*.imageset/Contents.json", "NextcloudTalk/Images.xcassets/AppIcon.appiconset/Contents.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2019-2024 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = [".tx/config"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2020 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = ["NextcloudTalk/*.lproj/*.strings", "NextcloudTalk/*.lproj/*.stringsdict"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2020 Nextcloud translators"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = [".pyspelling.wordlist.txt"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = ["ThirdParty/AppRTC/*"]
precedence = "aggregate"
Expand Down
4 changes: 4 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<!--
- SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: GPL-3.0-or-later
-->
# Security Policy

## Supported Versions
Expand Down
3 changes: 3 additions & 0 deletions ci-create-docker-server.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
# Based on the script from Milen Pivchev in nextcloud/ios repository

# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later

# This script starts a nextcloud test instance

echo "Creating nextcloud instance for branch $TEST_BRANCH..."
Expand Down
3 changes: 3 additions & 0 deletions ci-install-talk.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
# Based on the script from Milen Pivchev in nextcloud/ios repository

# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later

# This script downloads and installs talk

echo "Installing talk"
Expand Down
3 changes: 3 additions & 0 deletions ci-setup-rooms.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later

# This script is intended to setup specific rooms that we want to test

# Setup a room with lobby enabled and add admin as a normal participant
Expand Down
3 changes: 3 additions & 0 deletions ci-wait-for-server.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
# Based on the script from Milen Pivchev in nextcloud/ios repository

# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later

# This scripts waits until a server transitions to the "installed" state

SERVER_URL="http://localhost:${SERVER_PORT}"
Expand Down
3 changes: 3 additions & 0 deletions generate-localizable-strings-file.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later

# generate-localizable-strings-file.sh

echo 'Generating Localizable.strings file...'
Expand Down
3 changes: 3 additions & 0 deletions start-instance-for-tests.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
# Based on the script from Milen Pivchev in nextcloud/ios repository

# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later

# This script runs the CI scripts needed to set up a test instance and install talk locally

CONTAINER_NAME=nextcloud_test
Expand Down

0 comments on commit 337a115

Please sign in to comment.