-
-
Notifications
You must be signed in to change notification settings - Fork 255
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/api/oauth
- Loading branch information
Showing
38 changed files
with
1,182 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# Generated by Django 3.2.20 on 2023-11-14 10:02 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("bookwyrm", "0185_alter_notification_notification_type"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="notification", | ||
name="related_invite_requests", | ||
field=models.ManyToManyField(to="bookwyrm.InviteRequest"), | ||
), | ||
migrations.AlterField( | ||
model_name="notification", | ||
name="notification_type", | ||
field=models.CharField( | ||
choices=[ | ||
("FAVORITE", "Favorite"), | ||
("BOOST", "Boost"), | ||
("REPLY", "Reply"), | ||
("MENTION", "Mention"), | ||
("TAG", "Tag"), | ||
("FOLLOW", "Follow"), | ||
("FOLLOW_REQUEST", "Follow Request"), | ||
("IMPORT", "Import"), | ||
("ADD", "Add"), | ||
("REPORT", "Report"), | ||
("LINK_DOMAIN", "Link Domain"), | ||
("INVITE_REQUEST", "Invite Request"), | ||
("INVITE", "Invite"), | ||
("ACCEPT", "Accept"), | ||
("JOIN", "Join"), | ||
("LEAVE", "Leave"), | ||
("REMOVE", "Remove"), | ||
("GROUP_PRIVACY", "Group Privacy"), | ||
("GROUP_NAME", "Group Name"), | ||
("GROUP_DESCRIPTION", "Group Description"), | ||
("MOVE", "Move"), | ||
], | ||
max_length=255, | ||
), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# Generated by Django 3.2.20 on 2023-11-09 16:57 | ||
|
||
import bookwyrm.models.fields | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("bookwyrm", "0186_invite_request_notification"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="book", | ||
name="first_published_date_precision", | ||
field=models.CharField( | ||
blank=True, | ||
choices=[ | ||
("DAY", "Day prec."), | ||
("MONTH", "Month prec."), | ||
("YEAR", "Year prec."), | ||
], | ||
editable=False, | ||
max_length=10, | ||
null=True, | ||
), | ||
), | ||
migrations.AddField( | ||
model_name="book", | ||
name="published_date_precision", | ||
field=models.CharField( | ||
blank=True, | ||
choices=[ | ||
("DAY", "Day prec."), | ||
("MONTH", "Month prec."), | ||
("YEAR", "Year prec."), | ||
], | ||
editable=False, | ||
max_length=10, | ||
null=True, | ||
), | ||
), | ||
migrations.AlterField( | ||
model_name="book", | ||
name="first_published_date", | ||
field=bookwyrm.models.fields.PartialDateField(blank=True, null=True), | ||
), | ||
migrations.AlterField( | ||
model_name="book", | ||
name="published_date", | ||
field=bookwyrm.models.fields.PartialDateField(blank=True, null=True), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 3.2.23 on 2023-11-20 18:02 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("bookwyrm", "0187_partial_publication_dates"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="theme", | ||
name="loads", | ||
field=models.BooleanField(blank=True, null=True), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{% extends 'layout.html' %} | ||
{% load i18n %} | ||
{% load utilities %} | ||
|
||
{% block title %}{% trans "Oh no!" %}{% endblock %} | ||
|
||
{% block content %} | ||
<div class="block"> | ||
<h1 class="title">{% trans "Permission Denied" %}</h1> | ||
<p class="content"> | ||
{% blocktrans trimmed with level=request.user|get_user_permission %} | ||
You do not have permission to view this page or perform this action. Your user permission level is <code>{{ level }}</code>. | ||
{% endblocktrans %} | ||
</p> | ||
<p class="content">{% trans "If you think you should have access, please speak to your BookWyrm server administrator." %} | ||
</p> | ||
|
||
</div> | ||
{% endblock %} | ||
|
Oops, something went wrong.