[extensions-web/deploy: 121/121] Merge branch 'master' into deploy
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web/deploy: 121/121] Merge branch 'master' into deploy
- Date: Tue, 26 Nov 2019 16:18:35 +0000 (UTC)
commit 55cad6e4c2cd9799dc13adf99c131e5558b74629
Merge: 0dae104 1896281
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Tue Nov 26 20:12:31 2019 +0400
Merge branch 'master' into deploy
# Conflicts:
# openshift/docker/Dockerfile
# sweettooth/extensions/tests.py
.gitignore | 8 +
.gitlab-ci.yml | 17 +
README.rst | 122 +-
bin/sweettooth-clean-users | 24 +
extensions-web.doap | 2 +-
migrate-1.4-1.8.sh | 16 -
openshift/docker/Dockerfile | 20 +-
openshift/docker/docker-compose.yml | 5 +
openshift/jobs/reindex-extensions.yml | 78 +
openshift/templates/extensions-web-nginx.json | 6 +-
po/LINGUAS | 26 +
po/ca.po | 435 +
po/cs.po | 436 +
po/da.po | 428 +
po/de.po | 441 +
po/el.po | 417 +
po/en_GB.po | 427 +
po/es.po | 439 +
po/eu.po | 411 +
po/extensions-web.pot | 403 +
po/fr.po | 438 +
po/fur.po | 435 +
po/gl.po | 434 +
po/hr.po | 434 +
po/hu.po | 433 +
po/id.po | 428 +
po/it.po | 436 +
po/ja.po | 425 +
po/ko.po | 422 +
po/lt.po | 432 +
po/nl.po | 436 +
po/pl.po | 428 +
po/pt_BR.po | 435 +
po/ro.po | 437 +
po/sl.po | 420 +
po/sr.po | 435 +
po/sv.po | 432 +
po/tr.po | 431 +
requirements.ego.txt | 5 +
requirements.txt | 54 +-
sweettooth/auth/backends.py | 29 +
sweettooth/auth/context_processors.py | 4 +-
sweettooth/auth/forms.py | 31 +-
.../activation_complete.html | 0
.../activation_email_body.txt} | 0
.../activation_email_subject.txt | 0
.../activation_failed.html} | 0
.../registration_complete.html | 0
.../registration_form.html | 2 +-
.../{registration => profile}/profile.html | 0
.../{registration => profile}/settings.html | 2 +-
sweettooth/auth/templates/registration/login.html | 14 +-
.../templates/registration/login_popup_form.html | 9 +-
.../registration/password_change_form.html | 2 +-
.../registration/password_reset_confirm.html | 9 +-
.../registration/password_reset_email.txt | 3 +-
.../registration/password_reset_form.html | 9 +-
sweettooth/auth/tests.py | 88 +-
sweettooth/auth/urls.py | 43 +-
sweettooth/auth/views.py | 9 +-
sweettooth/context_processors.py | 11 +-
sweettooth/core/__init__.py | 0
sweettooth/core/management/__init__.py | 0
sweettooth/core/management/commands/__init__.py | 25 +
.../core/management/commands/compilemessages.py | 55 +
.../core/management/commands/makemessages.py | 125 +
sweettooth/errorreports/forms.py | 2 +-
sweettooth/errorreports/migrations/0001_initial.py | 4 +-
sweettooth/errorreports/models.py | 6 +-
sweettooth/errorreports/tests.py | 3 +-
sweettooth/errorreports/views.py | 4 +-
sweettooth/exceptions.py | 2 +-
.../management/commands/populate_extensions.py | 89 +
sweettooth/extensions/migrations/0001_initial.py | 6 +-
.../migrations/0005_auto_20190112_1733.py | 27 +
.../migrations/0006_auto_20191123_2146.py | 20 +
sweettooth/extensions/models.py | 32 +-
sweettooth/extensions/search.py | 2 +-
.../extensions/templates/extensions/about.html | 6 +-
.../extensions/templates/extensions/comments.html | 18 +-
.../extensions/templates/extensions/detail.html | 17 +-
.../extensions/templates/extensions/list.html | 5 +-
.../extensions/templates/extensions/local.html | 8 +-
.../extensions/templates/extensions/upload.html | 2 +-
.../testdata/DowngradeExtension/v1/metadata.json | 4 +-
.../testdata/DowngradeExtension/v2/metadata.json | 4 +-
.../testdata/RejectedExtension/v1/metadata.json | 4 +-
.../testdata/UpgradeExtension/v1/metadata.json | 4 +-
.../testdata/UpgradeExtension/v2/metadata.json | 4 +-
.../extensions/testdata/test_upgrade_data.json | 10 +-
sweettooth/extensions/tests.py | 73 +-
sweettooth/extensions/views.py | 24 +-
sweettooth/ratings/forms.py | 13 +-
.../management/commands/populate_ratings.py | 101 +
sweettooth/ratings/migrations/0001_initial.py | 2 +-
sweettooth/ratings/models.py | 2 +-
sweettooth/ratings/templates/comments/preview.html | 3 +-
sweettooth/ratings/views.py | 5 +-
sweettooth/review/diffutils.py | 20 +-
sweettooth/review/migrations/0001_initial.py | 4 +-
sweettooth/review/models.py | 11 +-
sweettooth/review/templates/review/review.html | 2 +-
sweettooth/review/tests/tests.py | 2 +-
sweettooth/review/views.py | 2 +-
sweettooth/settings.py | 31 +-
sweettooth/static/css/bootstrap.css | 7 +-
sweettooth/static/css/fonts.css | 2 +-
sweettooth/static/css/jquery.rating.css | 46 -
sweettooth/static/css/jquery.raty.css | 46 +
sweettooth/static/css/sweettooth.css | 55 +-
sweettooth/static/css/switch.css | 8 +
sweettooth/static/fonts/Cantarell-Bold.otf | Bin 51840 -> 143192 bytes
sweettooth/static/fonts/Cantarell-Regular.otf | Bin 47828 -> 137812 bytes
sweettooth/static/fonts/raty.eot | Bin 0 -> 2004 bytes
sweettooth/static/fonts/raty.svg | 15 +
sweettooth/static/fonts/raty.ttf | Bin 0 -> 1852 bytes
sweettooth/static/fonts/raty.woff | Bin 0 -> 1796 bytes
sweettooth/static/images/star-empty.png | Bin 735 -> 0 bytes
sweettooth/static/images/star-full.png | Bin 746 -> 0 bytes
sweettooth/static/js/bootstrap.min.js | 8 +-
sweettooth/static/js/browser_extension.js | 11 +-
sweettooth/static/js/dbus.js | 5 +-
sweettooth/static/js/diff.js | 4 +-
sweettooth/static/js/extensionUtils.js | 4 +-
sweettooth/static/js/extensions.js | 40 +-
sweettooth/static/js/fsui.js | 12 +-
sweettooth/static/js/jquery.cookie.js | 41 -
sweettooth/static/js/jquery.js | 11010 +------------------
sweettooth/static/js/jquery.raty.js | 115 +-
sweettooth/static/js/jquery.timeago.js | 108 +-
sweettooth/static/js/js.cookie.js | 3 +
sweettooth/static/js/main.js | 33 +-
sweettooth/static/js/mustache.js | 623 +-
sweettooth/static/js/paginator.js | 10 +-
sweettooth/static/js/settings.js | 117 +
sweettooth/static/js/switch.js | 46 +-
sweettooth/static/js/template.js | 34 +
sweettooth/static/js/templates.js | 19 -
sweettooth/static/js/templates/build_templates.py | 35 -
...als_chunk_row.mustache => equals_chunk_row.mst} | 0
.../js/templates/extensions/comment.mustache | 14 -
.../js/templates/extensions/comments_list.mst | 26 +
.../js/templates/extensions/comments_list.mustache | 11 -
.../templates/extensions/error_report_template.mst | 23 +
.../extensions/error_report_template.mustache | 23 -
.../extensions/{info.mustache => info.mst} | 0
.../{info_contents.mustache => info_contents.mst} | 2 +-
.../{info_list.mustache => info_list.mst} | 0
.../static/js/templates/extensions/settings.mst | 8 +
.../static/js/templates/extensions/uninstall.mst | 1 +
.../js/templates/extensions/uninstall.mustache | 1 -
.../templates/messages/browser_extension.mustache | 2 -
.../templates/messages/cannot_list_errors.mustache | 1 -
.../templates/messages/cannot_list_local.mustache | 1 -
.../js/templates/messages/dummy_proxy.mustache | 1 -
sweettooth/static/js/templates/templatedata.js | 17 -
sweettooth/static/js/text.js | 408 +
sweettooth/static/js/versions/1/main.js | 26 -
sweettooth/static/js/versions/2/main.js | 28 -
sweettooth/static/js/versions/3/main.js | 28 -
sweettooth/static/js/versions/4/main.js | 28 -
sweettooth/static/js/versions/5/main.js | 16 +-
sweettooth/static/js/versions/6/main.js | 45 +
sweettooth/static/js/versions/common/common.js | 29 +
sweettooth/static/js/voca.js | 9 +
sweettooth/templates/base.html | 16 +-
sweettooth/templates/templatetags/static_paths.py | 4 +-
sweettooth/templates/usermenu.html | 7 +-
sweettooth/testutils.py | 6 +-
sweettooth/urls.py | 5 +-
sweettooth/utils.py | 6 +-
171 files changed, 13891 insertions(+), 12397 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
