Commit Graph

26 Commits

Author SHA1 Message Date
Michael Mayer
e0f9ca95cd Shorten "Additional Terms" in LICENSE and license.vue 2022-02-21 13:29:40 +01:00
Michael Mayer
87b808aca7 Reformat "Additional Terms" in LICENSE file
Shorter text lines for better readability.
2022-02-21 12:55:04 +01:00
Michael Mayer
11a08cbfbe Prefix "Additional Terms" with two spaces in LICENSE file 2022-02-21 12:43:35 +01:00
Michael Mayer
8466e40e58 Update "Additional Terms" in LICENSE and license.vue
Wording and layout have been improved. The text is now selectable
in the user interface.
2022-02-21 10:55:31 +01:00
Michael Mayer
a9c99594ee Update license for separate assets and downloads
This removes the Digital Assets License from the main LICENSE file.
2022-01-20 17:51:12 +01:00
Michael Mayer
3d036c7fc8 Update Digital Assets License
Clarify redistribution terms.
2022-01-19 18:32:24 +01:00
Michael Mayer
2fe663e257 Update Digital Assets License
Clarify redistribution terms.
2022-01-19 18:02:12 +01:00
Michael Mayer
a9a3746169 Update Digital Assets License 2022-01-19 12:21:46 +01:00
Michael Mayer
5ec822eb45 Add more examples to Digital Assets License 2022-01-19 11:16:01 +01:00
Michael Mayer
114e88b00d Update PhotoPrism® Digital Assets License
Conditions are more specific now and include special terms for
brand assets and the documentation.
2022-01-19 10:45:56 +01:00
Michael Mayer
c60f461ea7 Shorten LICENSE 2022-01-16 13:26:32 +01:00
Michael Mayer
781d8e8a03 Docs: Update trademark info
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
2021-12-25 20:01:34 +01:00
Michael Mayer
fe06501bd7 Docs: Include link to trademark guidelines in README and LICENSE files 2021-12-20 18:49:55 +01:00
Michael Mayer
d38c84bbfb Update trademark
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
2020-09-21 02:48:22 +02:00
Michael Mayer
6e681ec95d Update LICENSE: Move trademark info to the bottom
Original license should not be changed, so it's better to append additional conditions.

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
2020-06-23 14:32:04 +02:00
Michael Mayer
4154715512 Docs: Update package information and copyright
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
2020-06-23 13:44:14 +02:00
Michael Mayer
a14d298bdf Switch to GNU Affero General Public License (AGPL)
See https://github.com/photoprism/photoprism/issues/152#issuecomment-643949603

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
2020-06-16 10:08:34 +02:00
Michael Mayer
59b70ea75b Change license to GPL v3
See https://groups.google.com/a/photoprism.org/forum/#!topic/developers/ntddgu3uiNM
2018-12-03 17:53:06 +01:00
Michael Mayer
df98ed162f Changed license to Apache 2.0
See https://medium.com/@robmuh/why-choose-apache-2-0-license-4253379b00ce
2018-10-31 03:05:51 +01:00
Michael Mayer
addffa1257 Changed copyright holder to "The PhotoPrism contributors" 2018-10-13 22:13:08 +02:00
Michael Mayer
ee5d97df56 Changed license back to MIT in the hope it will not be used to undermine our intentions :) 2018-10-13 16:08:14 +02:00
Michael Mayer
bfe9d32b41 Changed license from MIT to GPL 2018-10-06 16:51:44 +02:00
Michael Mayer
5030d95fb4 Updated copyright in LICENSE file 2018-09-05 18:52:04 +02:00
Michael Mayer
2eb077f826 Updated README 2018-02-27 20:51:19 +01:00
Michael Mayer
6f8d5cdd83 Updated README 2018-02-27 19:46:50 +01:00
Michael Mayer
ae91906416
Initial commit 2018-01-27 13:00:15 +01:00