Mercurial > kallithea
changeset 8236:08c0326e9127
Merge stable
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 12 Feb 2020 14:52:11 +0100 |
| parents | dac0bff4d2a3 (current diff) 85135d4f9fef (diff) |
| children | 34a59bfcebb1 |
| files | development.ini kallithea/lib/paster_commands/template.ini.mako kallithea/templates/base/base.html |
| diffstat | 3 files changed, 19 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/development.ini Fri Feb 07 13:55:27 2020 -0800 +++ b/development.ini Wed Feb 12 14:52:11 2020 +0100 @@ -54,11 +54,11 @@ ## For "SSL", use smtp_use_ssl = true and smtp_port = 465. ## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587. smtp_server = -#smtp_username = -#smtp_password = +smtp_username = +smtp_password = smtp_port = -#smtp_use_ssl = false -#smtp_use_tls = false +smtp_use_ssl = false +smtp_use_tls = false ## Entry point for 'gearbox serve' [server:main] @@ -259,7 +259,7 @@ celery.accept.content = pickle celery.result.backend = amqp celery.result.dburi = amqp:// -celery.result.serialier = json +celery.result.serializer = json #celery.send.task.error.emails = true #celery.amqp.task.result.expires = 18000 @@ -330,10 +330,13 @@ # Propagate email settings to ErrorReporter of TurboGears2 # You do not normally need to change these lines -get trace_errors.error_email = email_to get trace_errors.smtp_server = smtp_server get trace_errors.smtp_port = smtp_port get trace_errors.from_address = error_email_from +get trace_errors.error_email = email_to +get trace_errors.smtp_username = smtp_username +get trace_errors.smtp_password = smtp_password +get trace_errors.smtp_use_tls = smtp_use_tls ################################################################################ ## WARNING: *DEBUG MODE MUST BE OFF IN A PRODUCTION ENVIRONMENT* ##
--- a/kallithea/lib/paster_commands/template.ini.mako Fri Feb 07 13:55:27 2020 -0800 +++ b/kallithea/lib/paster_commands/template.ini.mako Wed Feb 12 14:52:11 2020 +0100 @@ -55,11 +55,11 @@ <%text>## For "SSL", use smtp_use_ssl = true and smtp_port = 465.</%text> <%text>## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587.</%text> smtp_server = -#smtp_username = -#smtp_password = +smtp_username = +smtp_password = smtp_port = -#smtp_use_ssl = false -#smtp_use_tls = false +smtp_use_ssl = false +smtp_use_tls = false %if http_server != 'uwsgi': <%text>## Entry point for 'gearbox serve'</%text> @@ -365,7 +365,7 @@ celery.accept.content = pickle celery.result.backend = amqp celery.result.dburi = amqp:// -celery.result.serialier = json +celery.result.serializer = json #celery.send.task.error.emails = true #celery.amqp.task.result.expires = 18000 @@ -435,10 +435,13 @@ # Propagate email settings to ErrorReporter of TurboGears2 # You do not normally need to change these lines -get trace_errors.error_email = email_to get trace_errors.smtp_server = smtp_server get trace_errors.smtp_port = smtp_port get trace_errors.from_address = error_email_from +get trace_errors.error_email = email_to +get trace_errors.smtp_username = smtp_username +get trace_errors.smtp_password = smtp_password +get trace_errors.smtp_use_tls = smtp_use_tls %if error_aggregation_service == 'appenlight': <%text>####################</%text>
--- a/kallithea/templates/base/base.html Fri Feb 07 13:55:27 2020 -0800 +++ b/kallithea/templates/base/base.html Wed Feb 12 14:52:11 2020 +0100 @@ -163,7 +163,7 @@ ## also it feels like a job for the controller %if request.authuser.username != 'default': <li> - <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});"> + <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="return toggleFollowingRepo(this, ${c.db_repo.repo_id});"> <span class="show-follow"><i class="icon-heart-empty"></i>${_('Follow')}</span> <span class="show-following"><i class="icon-heart"></i>${_('Unfollow')}</span> </a>