chris/django-tinywiki
1
0
Fork 0
mirror of https://git.cmoser.eu/tinytools/django-tinywiki.git synced 2026-02-04 06:06:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

License change to 0-BSD

Browse Source
This commit is contained in:
Christian Moser
2025-12-30 02:33:32 +01:00
parent 18255bc819
commit e4fd21f998
3 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
LICENSE
View File

@@ -1,22 +1,12 @@
Copyright 2025 Christian Moser Copyright (C) 2025 - 2026 by Christian christian@cmoser.eu
Redistribution and use in source and binary forms, with or without Permission to use, copy, modify, and/or distribute this software for any
modification,are permitted provided that the following conditions are met: purpose with or without fee is hereby granted.
1. Redistributions of source code must retain the above copyright notice, this THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
list of conditions and the following disclaimer. REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
2. Redistributions in binary form must reproduce the above copyright notice, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
this list of conditions and the following disclaimer in the documentation LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
and/or other materials provided with the distribution. OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

6
tinywiki/management/commands/twimport.py
View File

@@ -63,7 +63,7 @@ class Command(BaseCommand):
if has_images: if has_images:
import_builtin_images_from_zip(filename, user) import_builtin_images_from_zip(filename, user)
else: else:
with open(file, "rt", encoding="utf-8") as json_file: with open(filename, "rt", encoding="utf-8") as json_file:
try: try:
json_data = json.loads(json_file.read()) json_data = json.loads(json_file.read())
except Exception: except Exception:
@@ -76,6 +76,6 @@ class Command(BaseCommand):
raise CommandError("Not a valid json file!") raise CommandError("Not a valid json file!")
if has_images: if has_images:
import_builtin_images(file) import_builtin_images(filename)
if has_pages: if has_pages:
import_builtin_pages(file) import_builtin_pages(filename)

11
tinywiki/migrations/pages/license.bbcode
View File

@@ -1,10 +1,3 @@
[h2]Copyright [copy] 2025 Christian Moser[/h2] [h2]Copyright [copy] 2025 Christian Moser[/h2]
[p]Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.[/p]
[p]Redistribution and use in source and binary forms, with or without modification,are permitted provided that the following conditions are met:[/p] [p]THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.[/p]
[ol]
[li]Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.[/li]
[li]Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.[/li]
[/ol]
[p][b]THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.[/b][/p]