diff --git a/LICENSE b/LICENSE index dbca6f4a7..96b7cd744 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,21 @@ +ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4) + Copyright © 2020 Mouse Reeve This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles. -Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to use, copy, modify, merge, distribute, and/or sell copies of the Software, subject to the following conditions: + +1. The above copyright notice and this permission notice shall be included in all copies or modified versions of the Software. -1. The above copyright notice and this permission notice shall be included in all copies of the Software. 2. The User is one of the following: - a. An individual person - b. An organization of people that does not seek profit - c. An organization of people that seeks shared profit for all its members and does not exploit the labor of non-members -3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal share. -4. If the User is an organization, then the User is not law enforcement or military, or working under either. +a. An individual person, laboring for themselves +b. A non-profit organization +c. An educational institution +d. An organization that seeks shared profit for all of its members, and allows non-members to set the cost of their labor + +3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal equity and/or equal vote. + +4. If the User is an organization, then the User is not law enforcement or military, or working for or under either. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/bookwyrm/admin.py b/bookwyrm/admin.py new file mode 100644 index 000000000..2ea0a1d1e --- /dev/null +++ b/bookwyrm/admin.py @@ -0,0 +1,6 @@ +''' models that will show up in django admin for superuser ''' +from django.contrib import admin +from bookwyrm import models + +admin.site.register(models.SiteSettings) +admin.site.register(models.User)