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

Re-license under GPLv2 #57

Merged
merged 1 commit into from
Jan 16, 2020
Merged

Re-license under GPLv2 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
339 changes: 339 additions & 0 deletions LICENSE
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 0 additions & 77 deletions LICENSE.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile.release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif
app_name=openidconnect
build_dir=$(CURDIR)/build
dist_dir=$(build_dir)/dist
src_files=README.md LICENSE.md
src_files=README.md LICENSE
src_dirs=appinfo img lib vendor
all_src=$(src_dirs) $(src_files)

Expand Down
22 changes: 14 additions & 8 deletions appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?php
/**
* ownCloud
*
* @author Thomas Müller <[email protected]>
* @copyright (C) 2019 ownCloud GmbH
* @license ownCloud Commercial License
*
* This code is covered by the ownCloud Commercial License.
* @copyright Copyright (c) 2020, ownCloud GmbH
* @license GPL-2.0
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* 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 General Public License for more details.
*
* You should have received a copy of the ownCloud Commercial License
* along with this program. If not, see
* <https://owncloud.com/licenses/owncloud-commercial/>.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
$app = new \OCA\OpenIdConnect\Application();
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>OpenID Connect</name>
<summary>OpenID Connect Integration</summary>
<description>OpenID Connect Integration with ownCloud</description>
<licence>AGPL</licence>
<licence>GPLv2</licence>
<author>Thomas Müller</author>
<version>0.1.0</version>
<namespace>OpenIdConnect</namespace>
Expand Down
22 changes: 14 additions & 8 deletions appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?php
/**
* ownCloud
*
* @author Thomas Müller <[email protected]>
* @copyright (C) 2019 ownCloud GmbH
* @license ownCloud Commercial License
*
* This code is covered by the ownCloud Commercial License.
* @copyright Copyright (c) 2020, ownCloud GmbH
* @license GPL-2.0
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* 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 General Public License for more details.
*
* You should have received a copy of the ownCloud Commercial License
* along with this program. If not, see
* <https://owncloud.com/licenses/owncloud-commercial/>.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
return [
Expand Down
22 changes: 14 additions & 8 deletions lib/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?php
/**
* ownCloud
*
* @author Thomas Müller <[email protected]>
* @copyright (C) 2019 ownCloud GmbH
* @license ownCloud Commercial License
*
* This code is covered by the ownCloud Commercial License.
* @copyright Copyright (c) 2020, ownCloud GmbH
* @license GPL-2.0
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* 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 General Public License for more details.
*
* You should have received a copy of the ownCloud Commercial License
* along with this program. If not, see
* <https://owncloud.com/licenses/owncloud-commercial/>.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\OpenIdConnect;
Expand Down
22 changes: 14 additions & 8 deletions lib/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?php
/**
* ownCloud
*
* @author Thomas Müller <[email protected]>
* @copyright (C) 2019 ownCloud GmbH
* @license ownCloud Commercial License
*
* This code is covered by the ownCloud Commercial License.
* @copyright Copyright (c) 2020, ownCloud GmbH
* @license GPL-2.0
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* 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 General Public License for more details.
*
* You should have received a copy of the ownCloud Commercial License
* along with this program. If not, see
* <https://owncloud.com/licenses/owncloud-commercial/>.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\OpenIdConnect;
Expand Down
22 changes: 14 additions & 8 deletions lib/Controller/LoginFlowController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<?php
/**
* ownCloud
*
* @author Thomas Müller <[email protected]>
* @copyright (C) 2019 ownCloud GmbH
* @license ownCloud Commercial License
*
* This code is covered by the ownCloud Commercial License.
* @copyright Copyright (c) 2020, ownCloud GmbH
* @license GPL-2.0
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* 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 General Public License for more details.
*
* You should have received a copy of the ownCloud Commercial License
* along with this program. If not, see
* <https://owncloud.com/licenses/owncloud-commercial/>.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\OpenIdConnect\Controller;
Expand Down
Loading