symposion_app Changeset - 9e851c31fac3

@@ ... / @@ -14,3 +14,2 @@ def do_monkey_patch(): @@
     fix_sitetree_check_access_500s()
     never_cache_login_page()
     patch_stripe_payment_form()
@@ ... / @@ -53,8 +52,2 @@ def fix_sitetree_check_access_500s(): @@
 def never_cache_login_page():
     from django.views.decorators.cache import never_cache
     from account.views import LoginView
     LoginView.get = never_cache(LoginView.get)
 def patch_stripe_payment_form():  # noqa: C901

pinaxcon/receivers.py

➞

Show inline comments

deleted file

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -70,3 +70,2 @@ TEMPLATES = [ @@
                 "django.contrib.messages.context_processors.messages",
                 "account.context_processors.account",
                 "pinax_theme_bootstrap.context_processors.theme",
@@ ... / @@ -114,3 +113,2 @@ INSTALLED_APPS = [ @@
     # external
     "account",
     "easy_thumbnails",
@@ ... @@
 ACCOUNT_OPEN_SIGNUP = True
 ACCOUNT_EMAIL_UNIQUE = True
 ACCOUNT_EMAIL_CONFIRMATION_REQUIRED = False
 ACCOUNT_LOGIN_REDIRECT_URL = "dashboard"
 ACCOUNT_LOGOUT_REDIRECT_URL = "/"
 ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 2
 ACCOUNT_USE_AUTH_AUTHENTICATE = True
 THEME_CONTACT_EMAIL = "team@lca2018.org"
@@ ... / @@ -255,4 +245,2 @@ AUTHENTICATION_BACKENDS = [ @@
     "symposion.teams.backends.TeamPermissionsBackend",
     "account.auth_backends.UsernameAuthenticationBackend",
     "account.auth_backends.EmailAuthenticationBackend",
+]

pinaxcon/templates/_account_bar.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/_login_sidebar.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/_signup_sidebar.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/base.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/delete.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/email_confirmation_message.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/email_confirmation_subject.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/invite_user.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/invite_user_subject.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/password_change.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/password_change_subject.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/password_reset.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email/password_reset_subject.txt

➞

Show inline comments

deleted file

pinaxcon/templates/account/email_confirm.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/email_confirmation_sent.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/email_confirmed.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/login.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/logout.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/password_change.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/password_reset.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/password_reset_sent.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/password_reset_token.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/password_reset_token_fail.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/settings.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/signup.html

➞

Show inline comments

deleted file

pinaxcon/templates/account/signup_closed.html

➞

Show inline comments

deleted file

pinaxcon/templates/symposion/emails/proposal_new_message/message.html

➞

Show inline comments

 {% load account_tags %}
 {% load i18n %}
 {% user_display message.user as user %}
 <p>
   {% blocktrans with title=proposal.title %}<b>{{ user }}</b> has added a message on <b>{{ title }}</b>.{% endblocktrans %}
+  {% blocktrans with title=proposal.title user=message.user %}<b>{{ user }}</b> has added a message on <b>{{ title }}</b>.{% endblocktrans %}
 </p>

pinaxcon/templates/symposion/emails/proposal_new_message/subject.txt

➞

Show inline comments

{% load account_tags i18n %}{% user_display message.user as user %}{% blocktrans with title=proposal.title %}New message on "{{ title }}" from {{ user }}{% endblocktrans %}

{% load i18n %}{% blocktrans with title=proposal.title user=message.user.username %}New message on "{{ title }}" from {{ user }}{% endblocktrans %}

pinaxcon/templates/symposion/emails/proposal_updated/message.html

➞

Show inline comments

 {% load account_tags %}
 {% load i18n %}
 {% user_display user as username %}
 <p>
   {% blocktrans with title=proposal.title %}<b>{{ username }}</b> has made changes to <b>{{ title }}</b> which you have previously reviewed or commented on.{% endblocktrans %}
+  {% blocktrans with title=proposal.title username=user.username %}<b>{{ username }}</b> has made changes to <b>{{ title }}</b> which you have previously reviewed or commented on.{% endblocktrans %}
 </p>

pinaxcon/templates/symposion/emails/proposal_updated/subject.txt

➞

Show inline comments

{% load account_tags i18n %}{% user_display user as username %}{% blocktrans with title=proposal.title %}"{{ title }}" has been updated by {{ username }}{% endblocktrans %}

{% load i18n %}{% blocktrans with title=proposal.title username=user.username %}"{{ title }}" has been updated by {{ username }}{% endblocktrans %}

pinaxcon/templates/symposion/emails/teams_user_applied/message.html

➞

Show inline comments

 {% load i18n account_tags %}
 {% user_display user as username %}
 {% blocktrans with team_name=team team_url=team.get_absolute_url site_name=current_site.name site_url=current_site %}
 {% load i18n %}
 {% blocktrans with team_name=team team_url=team.get_absolute_url site_name=current_site.name site_url=current_site username=user.username %}
     <p>

pinaxcon/templates/symposion/emails/teams_user_applied/subject.txt

➞

Show inline comments

	
{% load i18n account_tags %}{% user_display user as username %}{% blocktrans %}{{ username}} has applied to to join "{{ team }}"{% endblocktrans %}

\ No newline at end of file

{% load i18n %}{% blocktrans with username=user.username %}{{ username }} has applied to to join "{{ team }}"{% endblocktrans %}

pinaxcon/templates/symposion/emails/teams_user_invited/message.html

➞

Show inline comments

		{% load i18n ~~account_tags~~ %}
		{% load i18n %}

pinaxcon/templates/symposion/proposals/proposal_detail.html

➞

Show inline comments

@@ ... / @@ -3,3 +3,2 @@ @@
 {% load i18n %}
 {% load account_tags %}
 {% load bootstrap %}
@@ ... / @@ -67,3 +66,3 @@ @@
                   <div class="comment"><em>{{ message.message|safe }}</em></div>
-                  <div class="dateline"><b>{% user_display message.user %}</b> {{ message.submitted_at|timesince }} ago</div>
+                  <div class="dateline"><b>{{ message.user.username }}</b> {{ message.submitted_at|timesince }} ago</div>
               </div>

pinaxcon/templates/symposion/reviews/review_detail.html

➞

Show inline comments

@@ ... / @@ -4,3 +4,2 @@ @@
 {% load bootstrap %}
 {% load account_tags %}
@@ ... / @@ -139,3 +138,3 @@ @@
                                   {% else %}
-                                    {% user_display review.user %}
+                                    {{ review.user.username }}
                                   {% endif %}
@@ ... / @@ -155,3 +154,3 @@ @@
                             <div class="commment-content">
-                                <b>{% user_display message.user %}</b>
+                                <b>{{ message.user.username }}</b>
                                 {{ message.submitted_at|timesince }} ago <br />

pinaxcon/urls.py

➞

Show inline comments

...		@@ -16,4 +16,2 @@ urlpatterns = [

		url(r"^account/", include("account.urls")),

		url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),

requirements.txt

➞

Show inline comments

@@ ... / @@ -3,3 +3,2 @@ Django==1.9.7 @@
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
@@ ... / @@ -21,3 +20,3 @@ coverage==4.0.3 @@
--e git+https://github.com/lca2017/symposion.git@lca2017#egg=symposion
+-e git+https://gitlab.com/lca2018/symposion.git@lca2018#egg=symposion
 -e git+https://github.com/chrisjrn/registrasion.git@master#egg=registrasion

0 comments (0 inline, 0 general)