mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-06-03 05:49:35 +00:00
Merge branch 'main' into 2965_export_readthrough
This commit is contained in:
commit
5d13bf8e49
|
@ -10,9 +10,7 @@
|
||||||
{% elif notification.notification_type == 'FOLLOW' %}
|
{% elif notification.notification_type == 'FOLLOW' %}
|
||||||
{% include 'notifications/items/follow.html' %}
|
{% include 'notifications/items/follow.html' %}
|
||||||
{% elif notification.notification_type == 'FOLLOW_REQUEST' %}
|
{% elif notification.notification_type == 'FOLLOW_REQUEST' %}
|
||||||
{% if notification.related_users.0.is_active %}
|
{% include 'notifications/items/follow_request.html' %}
|
||||||
{% include 'notifications/items/follow_request.html' %}
|
|
||||||
{% endif %}
|
|
||||||
{% elif notification.notification_type == 'IMPORT' %}
|
{% elif notification.notification_type == 'IMPORT' %}
|
||||||
{% include 'notifications/items/import.html' %}
|
{% include 'notifications/items/import.html' %}
|
||||||
{% elif notification.notification_type == 'USER_IMPORT' %}
|
{% elif notification.notification_type == 'USER_IMPORT' %}
|
||||||
|
|
|
@ -16,7 +16,7 @@ libsass==0.22.0
|
||||||
Markdown==3.4.1
|
Markdown==3.4.1
|
||||||
Pillow==10.0.1
|
Pillow==10.0.1
|
||||||
psycopg2==2.9.5
|
psycopg2==2.9.5
|
||||||
pycryptodome==3.16.0
|
pycryptodome==3.19.1
|
||||||
python-dateutil==2.8.2
|
python-dateutil==2.8.2
|
||||||
redis==4.5.4
|
redis==4.5.4
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
|
|
Loading…
Reference in a new issue