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

Update copyright and license information and link it to one place #1111

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Update copyright and license information and link it to one place #1111

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
16 changes: 2 additions & 14 deletions activity_browser/static/startscreen/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,8 @@ <h2>Contributing</h2>
page on contributing </a>for more detailed instructions.<br>

<h2>Copyright and License</h2>
Copyright (c) 2016-2023, Bernhard Steubing (Leiden University)<br>
For copyright information please see the copyright on <a href="https://github.com/LCA-ActivityBrowser/activity-browser/tree/master#copyright">this page</a>.<br><br>

<h2>Copyright and License</h2>
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 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 General Public License for more details.
You should have received a copy of the GNU General Public
License
along with this program. If not, see <a href="http://www.gnu.org/licenses/" rel="nofollow">http://www.gnu.org/licenses/</a>.
For license information please see the copyright on <a href="https://github.com/LCA-ActivityBrowser/activity-browser/blob/master/LICENSE.txt">this page</a>.<br><br>
</body></html>
11 changes: 2 additions & 9 deletions activity_browser/ui/menu_bar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,8 @@ def about(self):
Activity Browser - a graphical interface for Brightway2.<br><br>
Application version: <b>{}</b><br><br>
All development happens on <a href="https://github.com/LCA-ActivityBrowser/activity-browser">github</a>.<br><br>
Main developers:<br>
- Bernhard Steubing (CML Leiden University)<br>
- Jonathan Kidner (CML Leiden University)<br><br>
For copyright information please see the copyright on <a href="https://github.com/LCA-ActivityBrowser/activity-browser>github</a>.<br><br>
<br>
LICENSE:<br>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>
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 Lesser General Public License for more details.<br><br>
You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.
For copyright information please see the copyright on <a href="https://github.com/LCA-ActivityBrowser/activity-browser/tree/master#copyright">this page</a>.<br><br>
For license information please see the copyright on <a href="https://github.com/LCA-ActivityBrowser/activity-browser/blob/master/LICENSE.txt">this page</a>.<br><br>
"""
msgBox = QtWidgets.QMessageBox(parent=self.window)
msgBox.setWindowTitle('About the Activity Browser')
Expand Down