[extensions-web/deploy: 62/62] Merge branch 'master' into deploy

[Yuri Konotopov <ykonotopov src gnome org>]

commit 9c99b2385cc5deb9beaef6dc8632e7d7213ecf9d
Merge: 3972edd 9d6f222
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Thu Nov 24 18:35:52 2016 +0300

    Merge branch 'master' into deploy

 README.rst                                         |   53 +-
 bin/sweettooth-cron-update                         |   10 +-
 etc/sweettooth.httpd.conf.example                  |    4 +-
 etc/sweettooth.nginx.conf.example                  |   61 ++
 etc/sweettooth.systemd.service.example             |   10 +
 etc/sweettooth.wsgi.example                        |   38 -
 etc/wsgi.ini.example                               |   16 +
 manage.py                                          |   10 +
 migrate-1.4-1.8.sh                                 |   16 +
 requirements.txt                                   |   13 +-
 sweettooth/auth/__init__.py                        |    1 +
 sweettooth/auth/apps.py                            |    5 +
 sweettooth/auth/context_processors.py              |    2 +-
 sweettooth/auth/forms.py                           |    6 +-
 .../auth/templates/registration/activate.html      |    2 +-
 .../registration/activation_complete.html          |    4 +
 sweettooth/auth/templates/registration/login.html  |    4 +-
 .../templates/registration/login_popup_form.html   |    4 +-
 .../registration/password_reset_email.html         |    2 +-
 .../auth/templates/registration/profile.html       |    4 +-
 .../auth/templates/registration/settings.html      |    2 +-
 sweettooth/auth/urls.py                            |   16 +-
 sweettooth/auth/views.py                           |    6 +-
 sweettooth/context_processors.py                   |   21 +
 sweettooth/errorreports/admin.py                   |    2 +-
 sweettooth/errorreports/forms.py                   |    2 +-
 sweettooth/errorreports/migrations/0001_initial.py |  125 +--
 .../0002_auto__del_field_errorreport_errors.py     |   98 --
 .../0003_auto__del_field_errorreport_email.py      |   97 --
 ...0004_auto__add_field_errorreport_can_contact.py |   98 --
 ...ort_version__add_field_errorreport_extension.py |   87 --
 ...0006_auto__del_field_errorreport_can_contact.py |   84 --
 sweettooth/errorreports/models.py                  |    2 +-
 sweettooth/errorreports/tests.py                   |    8 +-
 sweettooth/errorreports/urls.py                    |    4 +-
 sweettooth/errorreports/views.py                   |   10 +-
 sweettooth/exceptions.py                           |    7 +
 sweettooth/extensions/admin.py                     |    6 +-
 sweettooth/extensions/feeds.py                     |    2 +-
 .../management/commands/indexextensions.py         |    4 +-
 .../management/commands/populatedownloads.py       |    2 +-
 .../management/commands/regeneratemetadata.py      |    2 +-
 .../management/commands/searchextensions.py        |    4 +-
 sweettooth/extensions/migrations/0001_initial.py   |  189 ++--
 .../migrations/0002_auto_20161027_1641.py          |   20 +
 .../migrations/0002_auto__add_shellversion.py      |  106 --
 .../0003_auto__add_field_extension_icon.py         |   90 --
 ...004_auto__chg_field_extensionversion_version.py |   90 --
 .../migrations/0005_auto__add_errorreport.py       |  107 --
 .../migrations/0006_auto__del_errorreport.py       |   98 --
 ...ersion_source__chg_field_extensionversion_ve.py |   96 --
 .../extensions/migrations/0008_new_icon_default.py |   89 --
 .../migrations/0009_icon_and_screenshot_names.py   |  112 --
 .../0010_auto__add_field_extension_downloads.py    |   91 --
 ...enables__add_field_extension_disables__add_f.py |  106 --
 .../migrations/0012_add_extensionpopularityitem.py |  107 --
 .../migrations/0013_move_to_popularity_items.py    |  109 --
 ...el_extension_enables_disables_and_popularity.py |  118 ---
 .../0017_auto__add_field_extension_popularity.py   |   99 --
 .../migrations/0018_new_to_unreviewed.py           |  113 --
 .../0019_auto__chg_field_extension_screenshot.py   |   99 --
 sweettooth/extensions/models.py                    |   32 +-
 sweettooth/extensions/search.py                    |    4 +-
 .../extensions/templates/extensions/comments.html  |    4 +-
 .../extensions/templates/extensions/detail.html    |   10 +-
 .../templates/extensions/detail_edit.html          |   20 +-
 .../templates/extensions/multiversion_status.html  |    2 +-
 sweettooth/extensions/templatetags/gravatar.py     |    2 +-
 .../extensions/testdata/test_upgrade_data.json     |  150 +++-
 sweettooth/extensions/tests.py                     |  132 ++--
 sweettooth/extensions/urls.py                      |   12 +-
 sweettooth/extensions/views.py                     |   77 +-
 sweettooth/manage.py                               |   14 -
 sweettooth/ratings/__init__.py                     |   10 +-
 sweettooth/ratings/admin.py                        |    4 +-
 sweettooth/ratings/forms.py                        |    6 +-
 sweettooth/ratings/migrations/0001_initial.py      |  110 +--
 .../0002_auto__chg_field_ratingcomment_rating.py   |   87 --
 sweettooth/ratings/models.py                       |    6 +-
 sweettooth/ratings/urls.py                         |    4 +-
 sweettooth/ratings/views.py                        |    8 +-
 sweettooth/review/context_processors.py            |    2 +-
 sweettooth/review/migrations/0001_initial.py       |  129 +--
 .../0002_auto__del_field_codereview_newstatus.py   |   98 --
 .../migrations/0003_auto__add_changestatuslog.py   |  113 --
 .../0004_auto__add_field_codereview_changelog.py   |  107 --
 ...uto__add_field_changestatuslog_auto_approved.py |  110 --
 ...__rename_field_changestatuslog_auto_approved.py |  104 --
 .../migrations/0007_remove_changestatuslog.py      |  109 --
 ..._newstatus__add_field_codereview_new_status_.py |  106 --
 sweettooth/review/models.py                        |    2 +-
 sweettooth/review/templates/review/list.html       |    4 +-
 sweettooth/review/templates/review/review.html     |   12 +-
 sweettooth/review/{ => tests}/tests.py             |   20 +-
 .../review/{difftests.py => tests/tests_diff.py}   |    2 +-
 sweettooth/review/urls.py                          |   14 +-
 sweettooth/review/views.py                         |    8 +-
 sweettooth/settings.py                             |  231 +++--
 sweettooth/static/css/960.css                      |  405 +++++++
 sweettooth/static/css/fonts.css                    |   13 +-
 sweettooth/static/css/jquery.colorbox.css          |   54 +
 sweettooth/static/css/reset.css                    |    2 +-
 sweettooth/static/css/review.css                   |   14 +-
 sweettooth/static/css/style.css                    |  994 ++++++++++++++++++
 sweettooth/static/css/sweettooth.css               |  469 +--------
 sweettooth/static/css/text.css                     |  111 ++
 sweettooth/static/fonts/Cantarell-Bold.otf         |  Bin 0 -> 51840 bytes
 sweettooth/static/fonts/Cantarell-Regular.otf      |  Bin 0 -> 47828 bytes
 sweettooth/static/images/action_button-bg.png      |  Bin 0 -> 172 bytes
 sweettooth/static/images/colorbox/border.png       |  Bin 0 -> 76 bytes
 sweettooth/static/images/colorbox/controls.png     |  Bin 0 -> 1261 bytes
 sweettooth/static/images/colorbox/loading.gif      |  Bin 0 -> 8685 bytes
 .../static/images/colorbox/loading_background.png  |  Bin 0 -> 131 bytes
 sweettooth/static/images/colorbox/overlay.png      |  Bin 0 -> 115 bytes
 .../{footer_art => footer_arts}/applications.png   |  Bin 29764 -> 29764 bytes
 sweettooth/static/images/gnome-logo-extensions.png |  Bin 0 -> 14872 bytes
 sweettooth/static/images/nobody.png                |  Bin 5701 -> 0 bytes
 sweettooth/static/images/top_bar-bg.png            |  Bin 0 -> 185 bytes
 sweettooth/static/images/top_bar-item-bg.png       |  Bin 0 -> 190 bytes
 sweettooth/static/images/top_bar-item-hover-bg.png |  Bin 0 -> 187 bytes
 sweettooth/static/js/dbus.js                       |   59 +-
 sweettooth/static/js/jquery.colorbox.js            | 1105 ++++++++++++++++++++
 sweettooth/static/js/main.js                       |   10 +-
 sweettooth/static/js/uploader.js                   |   11 +-
 sweettooth/templates/base.html                     |  120 ++-
 sweettooth/templates/footer_links.html             |   48 +-
 sweettooth/templates/usermenu.html                 |    6 +-
 sweettooth/urls.py                                 |   19 +-
 sweettooth/utils.py                                |    3 +-
 sweettooth/wsgi.py                                 |   16 +
 130 files changed, 3820 insertions(+), 4297 deletions(-)
---