0ct0pu5/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update license for separate assets and downloads

Browse source 
This removes the Digital Assets License from the main LICENSE file.
This commit is contained in:
Michael Mayer 2022-01-20 17:51:12 +01:00
parent d4ddabaa14
commit a9c99594ee
3 changed files with 19 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
LICENSE
View file

@ -618,51 +618,21 @@ copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
ADDITIONAL TERMS
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
PhotoPrism® Trademark
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
PhotoPrism’s Brand Assets — including trademarks, logos, icons, designs, fonts,
products, services, and any other brand features and elements, whether registered
or unregistered („Brand Assets“) — are proprietary assets owned exclusively by
Michael Mayer and his legal successors („PhotoPrism“).
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
Third parties, including licensees, may never claim ownership of PhotoPrism's
Brand Assets or brands confusingly similar to PhotoPrism's Brand Assets in any
way, including, without limitation, as a trademark, service mark, company name
or designation, domain name, social media profile/handle, or in any other manner.
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 <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.
PhotoPrism® Trademark
You may not include the PhotoPrism trademark in the name of your app, product
You may not include the PhotoPrism trademark in the name of your app, product,
or service, whether commercial or non-commercial in nature. This includes online
services such as e-commerce, community, blog, information, advertising, and personal
home pages, as well as apps, client apps, or third-party apps that interact with
@ -671,46 +641,5 @@ PhotoPrism.
We reserve the right to object to any use or misuse in any jurisdiction worldwide.
Visit <https://photoprism.app/trademark> to learn more.
Digital Assets License
Michael Mayer and his legal successors („PhotoPrism“) hereby grant you a non-exclusive,
non-transferable right to use the Digital Assets included in the software, source code,
website, and documentation — such as images, icons, vector graphics, fonts, videos,
sounds, models, and example files („Digital Assets“) — as part of the Official Software
Distribution, unless otherwise noted. Please ask for written permission to redistribute.
PhotoPrism’s Brand Assets — including trademarks, logos, icons, designs, fonts, products,
services, and any other brand features and elements, whether registered or unregistered
(„Brand Assets“) — are proprietary assets. Third parties, including licensees, may never
claim ownership of PhotoPrism's Brand Assets or brands confusingly similar to PhotoPrism's
Brand Assets in any way, including, without limitation, as a trademark, service mark,
company name or designation, domain name, social media profile/handle, or in any other
manner:
https://photoprism.app/trademark
Because some Digital Assets are licensed to us only for direct distribution, we cannot
redistribute them under a more permissive license for other purposes. If the author or
copyright holder has not released them under a permissive license, you must obtain a
license before using them in your own work, whether commercial or non-commercial in
nature.
The names of authors, copyright holders, and contributors may NOT be used to promote any
products or services without their prior written permission.
THESE DIGITAL ASSETS ARE PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, TITLE,
NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
WE WILL NOT BE LIABLE FOR ANY DAMAGES ASSOCIATED WITH THESE DIGITAL ASSETS, INCLUDING
WITHOUT LIMITATION ORDINARY, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OF ANY KIND,
INCLUDING BUT NOT LIMITED TO DAMAGES RELATING TO LOST DATA OR LOST PROFITS, EVEN IF WE
HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
If the disclaimer provided above cannot be given local legal effect according to its terms,
reviewing courts shall apply local law that most closely approximates an absolute waiver
of all civil liability in connection with these Digital Assets, unless a warranty or
assumption of liability was provided in return for a fee.
In the event that any provision is found to be unenforceable by a court or other competent
jurisdiction, the remaining portions hereof shall remain in full force and effect.

8
assets/LICENSE
View file

@ -2,10 +2,10 @@ PhotoPrism® Digital Assets License
==================================
Michael Mayer and his legal successors („PhotoPrism“) hereby grant you a non-exclusive,
non-transferable right to use the Digital Assets included in the software, source code,
website, and documentation — such as images, icons, vector graphics, fonts, videos,
sounds, models, and example files („Digital Assets“) — as part of the Official Software
Distribution, unless otherwise noted. Please ask for written permission to redistribute.
non-transferable right to use the Digital Assets separately accompanying the software,
embedded in the documentation, or provided for download — such as icons, graphics, fonts,
wallpapers, videos, sounds, models, and sample files („Digital Assets“) — as part of the
Official Software Distribution, unless otherwise noted.
PhotoPrism’s Brand Assets — including trademarks, logos, icons, designs, fonts, products,
services, and any other brand features and elements, whether registered or unregistered

4
frontend/src/pages/about/license.vue
View file

@ -731,6 +731,10 @@
We reserve the right to object to any use or misuse in any jurisdiction worldwide.
Visit <a target="_blank" href="https://photoprism.app/trademark">photoprism.app/trademark</a> to learn more.
</p>
<p>
In the event that any provision is found to be unenforceable by a court or other competent
jurisdiction, the remaining portions hereof shall remain in full force and effect.
</p>
</v-container>
<p-about-footer></p-about-footer>