[extensions-web/wip/api/v1: 15/15] Merge branch 'master' into wip/api/v1
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web/wip/api/v1: 15/15] Merge branch 'master' into wip/api/v1
- Date: Sat, 13 Aug 2022 09:51:28 +0000 (UTC)
commit ed691de6f55e29bd90f3ad20048cd12537add079
Merge: 5e04c9c bebabd5
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Sat Aug 13 13:50:56 2022 +0400
Merge branch 'master' into wip/api/v1
po/LINGUAS | 1 +
po/extensions-web.pot | 66 +++-
po/ka.po | 409 +++++++++++++++++++++
po/ru.po | 18 +-
requirements.in | 2 +-
requirements.txt | 6 +-
.../migrations/0011_extension_allow_comments.py | 18 +
sweettooth/extensions/models.py | 5 +-
.../extensions/templates/extensions/detail.html | 5 +
.../templates/extensions/detail_edit.html | 5 +-
.../extensions/templates/extensions/local.html | 4 +-
sweettooth/extensions/tests.py | 24 +-
sweettooth/extensions/views.py | 11 +-
sweettooth/ratings/__init__.py | 11 +
sweettooth/ratings/moderation.py | 6 +
sweettooth/ratings/views.py | 5 +
sweettooth/static/css/sweettooth.css | 12 +-
sweettooth/static/js/browser_extension.js | 13 +-
sweettooth/static/js/extensions.js | 12 +
sweettooth/static/js/settings.js | 2 +-
sweettooth/static/js/versions/5/main.js | 2 +
sweettooth/static/js/versions/6/main.js | 2 +
22 files changed, 574 insertions(+), 65 deletions(-)
---
diff --cc requirements.in
index d47c8b2,54e1669..79b3965
--- a/requirements.in
+++ b/requirements.in
@@@ -1,9 -1,6 +1,9 @@@
- Django==3.2.13
+ Django==3.2.15
+djangorestframework==3.13.1
django-autoslug==1.9.8
django-contrib-comments==2.1.0
+django-elasticsearch-dsl==7.2.2
+django-filter==21.1
django-registration==3.2
Pygments==2.11.2
Pillow==9.0.1
diff --cc sweettooth/extensions/models.py
index 0db1345,760eb1f..fa3e5bb
--- a/sweettooth/extensions/models.py
+++ b/sweettooth/extensions/models.py
@@@ -127,12 -126,9 +127,13 @@@ class Extension(models.Model)
description = models.TextField(blank=True)
url = HttpURLField(blank=True)
created = models.DateTimeField(auto_now_add=True)
+ updated = models.DateTimeField(default=None, null=True)
downloads = models.PositiveIntegerField(default=0)
popularity = models.IntegerField(default=0)
+ recommended = models.BooleanField(default=False)
+ rating = models.FloatField(default=0)
+ rated = models.IntegerField(default=0)
+ allow_comments = models.BooleanField(default=True)
class Meta:
permissions = (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]