Skip to content

Commit 1c606ff

Browse files
AndyScherzingerAndyScherzinger
committed
chore: Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent ddb840c commit 1c606ff

360 files changed

Lines changed: 1104 additions & 6505 deletions

File tree

Some content is hidden

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

‎.reuse/dep5‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Files: tests/data/l10n/cs.json tests/data/l10n/de.json tests/data/l10n/ru.json
3939
Copyright: 2015 ownCloud, Inc., 2021 Nextcloud GmbH and Nextcloud contributors
4040
License: AGPL-3.0-only
4141

42-
Files: tests/data/lorem.txt
42+
Files: tests/data/lorem.txt apps/files/l10n/xgettextfiles
4343
Copyright: 2012 ownCloud, Inc.
4444
License: AGPL-3.0-only
4545

@@ -147,14 +147,18 @@ Files: core/vendor/zxcvbn/dist/zxcvbn.js
147147
Copyright: 2012-2016 Dan Wheeler and Dropbox, Inc.
148148
License: MIT
149149

150-
Files: core/img/twitter.svg
150+
Files: core/img/twitter.svg apps/federatedfilesharing/img/social-twitter.svg
151151
Copyright: X Corp.
152152
License: LicenseRef-XTrademarks
153153

154-
Files: core/img/facebook.svg
154+
Files: core/img/facebook.svg apps/federatedfilesharing/img/social-facebook.svg
155155
Copyright: 2024 Meta
156156
License: LicenseRef-FacebookTrademarks
157157

158+
Files: apps/federatedfilesharing/img/social-diaspora.svg
159+
Copyright: 2024 Diaspora
160+
License: LicenseRef-DiasporaTrademarks
161+
158162
Files: core/img/mastodon.svg
159163
Copyright: 2024 Mastodon gGmbH
160164
License: LicenseRef-MastodonTrademarks

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
- Eric Masseran <rico.masseran@gmail.com>
134134
- Erik van Velzen <erik@evanv.nl>
135135
- Evgeny Golyshev <eugulixes@gmail.com>
136+
- Fabian Dreßler <nudelsalat@clouz.de>
136137
- Fabien Potencier <fabien@symfony.com>
137138
- Fabrizio Steiner <fabrizio.steiner@gmail.com>
138139
- Faraz Samapoor <f.samapoor@gmail.com>
@@ -409,6 +410,7 @@
409410
- SA <stephen@mthosting.net>
410411
- Sam Bull <aa6bs0@sambull.org>
411412
- Sam Tuke <mail@samtuke.com>
413+
- Sam Tuke <samtuke@owncloud.com>
412414
- Samuel <faust64@gmail.com>
413415
- Samuel CHEMLA <chemla.samuel@gmail.com>
414416
- Sander Ruitenbeek <s.ruitenbeek@getgoing.nl>

‎LICENSES/LicenseRef-DiasporaTrademarks.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Branding
2+
3+
'''diaspora*''' (and some alternate spellings, see below) is a registered trademark to avoid abuse by using the name for similar projects that may create confusion. The exact terms cannot be provided here since this is a complex legal topic, but here are some guidelines.
4+
5+
You are free to use the diaspora* logo and its wordmarks...
6+
7+
* ... if you are describing the software. That may be, for example, in your pods assets ("this is based on diaspora*"), in your terms of service, etc.
8+
* ... in any publication related to the project. This can, for example, be a blog article, a social media post, a YouTube video, etc.
9+
* ... for creating and publishing marketing materials for promoting the project or your instance, as long as you do not benefit financially in any way.
10+
11+
In any case, you are '''not allowed''' to use the logo and the wordmark for...
12+
13+
* ... ''"anything that involves money"'', with the exclusion of donation campaigns raised for running and maintaining a pod. This includes the public sale of t-shirts or stickers (you are, however, fine if you want to print some stickers for yourself). If you want to raise donations for the project, please get in touch with the project team first.
14+
* ... for any distributed social network project that is not based on our software. If you fork diaspora* into a different project, you are fine to do so (in respect with the license terms), but you have to choose a different name.
15+
16+
If in doubt, please write an email to [mailto:team@diasporafoundation.org team@diasporafoundation.org] and we will help you figure things out.
17+
18+
===Using the diaspora* brand===
19+
20+
* We use the Roboto font in bold or Helvetica font.
21+
* diaspora* can be used lower-cased or upper-cased but '''all the letters should be the same''': diaspora* is preferred, DIASPORA* is valid, Diaspora* or DiAsPoRa* are not.
22+
* You are encouraged to systematically add the * after diaspora*. * can be used itself as the brand.
23+
24+
You can find many more images by the community on the logos, icons and visual_art page at https://wiki.diasporafoundation.org/Logos,_icons_and_visual_art.
25+
26+
A copy can be found at https://wiki.diasporafoundation.org/Branding

‎apps/encryption/appinfo/app.php‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,9 @@
11
<?php
2+
23
/**
3-
* @copyright Copyright (c) 2016, ownCloud, Inc.
4-
*
5-
* @author Björn Schießle <bjoern@schiessle.org>
6-
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
7-
* @author Clark Tomlinson <fallen013@gmail.com>
8-
* @author Morris Jobke <hey@morrisjobke.de>
9-
*
10-
* @license AGPL-3.0
11-
*
12-
* This code is free software: you can redistribute it and/or modify
13-
* it under the terms of the GNU Affero General Public License, version 3,
14-
* as published by the Free Software Foundation.
15-
*
16-
* This program is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU Affero General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU Affero General Public License, version 3,
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>
23-
*
4+
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
5+
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
6+
* SPDX-License-Identifier: AGPL-3.0-only
247
*/
258
namespace OCA\Encryption\AppInfo;
269

‎apps/encryption/appinfo/info.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0"?>
2+
<!--
3+
- SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
4+
- SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc.
5+
- SPDX-License-Identifier: AGPL-3.0-only
6+
-->
27
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
38
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
49
<id>encryption</id>

‎apps/encryption/appinfo/routes.php‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
<?php
22

33
declare(strict_types=1);
4-
54
/**
6-
* @copyright Copyright (c) 2016, ownCloud, Inc.
7-
*
8-
* @author Clark Tomlinson <fallen013@gmail.com>
9-
* @author Roeland Jago Douma <roeland@famdouma.nl>
10-
*
11-
* @license AGPL-3.0
12-
*
13-
* This code is free software: you can redistribute it and/or modify
14-
* it under the terms of the GNU Affero General Public License, version 3,
15-
* as published by the Free Software Foundation.
16-
*
17-
* This program is distributed in the hope that it will be useful,
18-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
* GNU Affero General Public License for more details.
21-
*
22-
* You should have received a copy of the GNU Affero General Public License, version 3,
23-
* along with this program. If not, see <http://www.gnu.org/licenses/>
24-
*
5+
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
6+
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
7+
* SPDX-License-Identifier: AGPL-3.0-only
258
*/
269
return [
2710
'routes' => [

‎apps/encryption/css/settings-personal.scss‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
/* Copyright (c) 2013, Sam Tuke, <samtuke@owncloud.com>
2-
This file is licensed under the Affero General Public License version 3 or later.
3-
See the COPYING-README file. */
4-
1+
/*!
2+
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
3+
* SPDX-FileCopyrightText: 2013 ownCloud, Inc.
4+
* SPDX-License-Identifier: AGPL-3.0-or-later
5+
*/
56
#encryptAllError,
67
#encryptAllSuccess,
78
#recoveryEnabledError,

‎apps/encryption/js/encryption.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/**
2-
* Copyright (c) 2014
3-
* Bjoern Schiessle <schiessle@owncloud.com>
4-
* This file is licensed under the Affero General Public License version 3 or later.
5-
* See the COPYING-README file.
2+
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
3+
* SPDX-FileCopyrightText: 2014-2015 ownCloud, Inc.
4+
* SPDX-License-Identifier: AGPL-3.0-or-later
65
*/
76

87
/**

‎apps/encryption/js/settings-admin.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
/**
2-
* Copyright (c) 2013
3-
* Sam Tuke <samtuke@owncloud.com>
4-
* Robin Appelman <icewind1991@gmail.com>
5-
* Bjoern Schiessle <schiessle@owncloud.com>
6-
* This file is licensed under the Affero General Public License version 3 or later.
7-
* See the COPYING-README file.
2+
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
3+
* SPDX-FileCopyrightText: 2013-2015 ownCloud, Inc.
4+
* SPDX-License-Identifier: AGPL-3.0-or-later
85
*/
96

107
window.addEventListener('DOMContentLoaded', function () {

‎apps/encryption/js/settings-personal.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
3-
* This file is licensed under the Affero General Public License version 3 or later.
4-
* See the COPYING-README file.
2+
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
3+
* SPDX-FileCopyrightText: 2013-2015 ownCloud, Inc.
4+
* SPDX-License-Identifier: AGPL-3.0-or-later
55
*/
66

77
OC.Encryption = _.extend(OC.Encryption || {}, {

0 commit comments

Comments
 (0)