Skip to content

Commit

Permalink
chore: Add SPDX header
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
  • Loading branch information
AndyScherzinger committed May 28, 2024
1 parent ddb840c commit 1c606ff
Show file tree
Hide file tree
Showing 360 changed files with 1,104 additions and 6,505 deletions.
10 changes: 7 additions & 3 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Files: tests/data/l10n/cs.json tests/data/l10n/de.json tests/data/l10n/ru.json
Copyright: 2015 ownCloud, Inc., 2021 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-only

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

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

Files: core/img/twitter.svg
Files: core/img/twitter.svg apps/federatedfilesharing/img/social-twitter.svg
Copyright: X Corp.
License: LicenseRef-XTrademarks

Files: core/img/facebook.svg
Files: core/img/facebook.svg apps/federatedfilesharing/img/social-facebook.svg
Copyright: 2024 Meta
License: LicenseRef-FacebookTrademarks

Files: apps/federatedfilesharing/img/social-diaspora.svg
Copyright: 2024 Diaspora
License: LicenseRef-DiasporaTrademarks

Files: core/img/mastodon.svg
Copyright: 2024 Mastodon gGmbH
License: LicenseRef-MastodonTrademarks
Expand Down
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
- Eric Masseran <rico.masseran@gmail.com>
- Erik van Velzen <erik@evanv.nl>
- Evgeny Golyshev <eugulixes@gmail.com>
- Fabian Dreßler <nudelsalat@clouz.de>
- Fabien Potencier <fabien@symfony.com>
- Fabrizio Steiner <fabrizio.steiner@gmail.com>
- Faraz Samapoor <f.samapoor@gmail.com>
Expand Down Expand Up @@ -409,6 +410,7 @@
- SA <stephen@mthosting.net>
- Sam Bull <aa6bs0@sambull.org>
- Sam Tuke <mail@samtuke.com>
- Sam Tuke <samtuke@owncloud.com>
- Samuel <faust64@gmail.com>
- Samuel CHEMLA <chemla.samuel@gmail.com>
- Sander Ruitenbeek <s.ruitenbeek@getgoing.nl>
Expand Down
26 changes: 26 additions & 0 deletions LICENSES/LicenseRef-DiasporaTrademarks.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Branding

'''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.

You are free to use the diaspora* logo and its wordmarks...

* ... 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.
* ... in any publication related to the project. This can, for example, be a blog article, a social media post, a YouTube video, etc.
* ... for creating and publishing marketing materials for promoting the project or your instance, as long as you do not benefit financially in any way.

In any case, you are '''not allowed''' to use the logo and the wordmark for...

* ... ''"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.
* ... 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.

If in doubt, please write an email to [mailto:team@diasporafoundation.org team@diasporafoundation.org] and we will help you figure things out.

===Using the diaspora* brand===

* We use the Roboto font in bold or Helvetica font.
* 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.
* You are encouraged to systematically add the * after diaspora*. * can be used itself as the brand.

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.

A copy can be found at https://wiki.diasporafoundation.org/Branding
25 changes: 4 additions & 21 deletions apps/encryption/appinfo/app.php
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
<?php

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Björn Schießle <bjoern@schiessle.org>
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\AppInfo;

Expand Down
5 changes: 5 additions & 0 deletions apps/encryption/appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?xml version="1.0"?>
<!--
- SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc.
- SPDX-License-Identifier: AGPL-3.0-only
-->
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>encryption</id>
Expand Down
23 changes: 3 additions & 20 deletions apps/encryption/appinfo/routes.php
Original file line number Diff line number Diff line change
@@ -1,27 +1,10 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
return [
'routes' => [
Expand Down
9 changes: 5 additions & 4 deletions apps/encryption/css/settings-personal.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* Copyright (c) 2013, Sam Tuke, <samtuke@owncloud.com>
This file is licensed under the Affero General Public License version 3 or later.
See the COPYING-README file. */

/*!
* SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2013 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
#encryptAllError,
#encryptAllSuccess,
#recoveryEnabledError,
Expand Down
7 changes: 3 additions & 4 deletions apps/encryption/js/encryption.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/**
* Copyright (c) 2014
* Bjoern Schiessle <schiessle@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2014-2015 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

/**
Expand Down
9 changes: 3 additions & 6 deletions apps/encryption/js/settings-admin.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/**
* Copyright (c) 2013
* Sam Tuke <samtuke@owncloud.com>
* Robin Appelman <icewind1991@gmail.com>
* Bjoern Schiessle <schiessle@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2013-2015 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

window.addEventListener('DOMContentLoaded', function () {
Expand Down
6 changes: 3 additions & 3 deletions apps/encryption/js/settings-personal.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2013-2015 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

OC.Encryption = _.extend(OC.Encryption || {}, {
Expand Down
27 changes: 4 additions & 23 deletions apps/encryption/lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
<?php

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Björn Schießle <bjoern@schiessle.org>
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\AppInfo;

Expand Down
23 changes: 2 additions & 21 deletions apps/encryption/lib/Command/DisableMasterKey.php
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Command;

Expand Down
21 changes: 2 additions & 19 deletions apps/encryption/lib/Command/DropLegacyFileKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,8 @@
declare(strict_types=1);

/**
* @copyright Copyright (c) 2023, Côme Chilliet <come.chilliet@nextcloud.com>
*
* @author Côme Chilliet <come.chilliet@nextcloud.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Encryption\Command;
Expand Down
24 changes: 4 additions & 20 deletions apps/encryption/lib/Command/EnableMasterKey.php
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
<?php

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Björn Schießle <bjoern@schiessle.org>
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
* SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption\Command;

Expand Down
22 changes: 4 additions & 18 deletions apps/encryption/lib/Command/FixEncryptedVersion.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
<?php

/**
* @author Sujith Haridasan <sharidasan@owncloud.com>
* @author Ilja Neumann <ineumann@owncloud.com>
*
* @copyright Copyright (c) 2019, ownCloud GmbH
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
* SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2019 ownCloud GmbH
* SPDX-License-Identifier: AGPL-3.0-only
*/

namespace OCA\Encryption\Command;
Expand Down
19 changes: 2 additions & 17 deletions apps/encryption/lib/Command/FixKeyLocation.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,8 @@

declare(strict_types=1);
/**
* @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Encryption\Command;
Expand Down
23 changes: 2 additions & 21 deletions apps/encryption/lib/Command/RecoverUser.php
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Encryption\Command;

Expand Down
Loading

0 comments on commit 1c606ff

Please sign in to comment.