Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

accounts/views.py

@@ -213,11 +213,9 @@ class UserView(TemplateView):
                 'home_form': HomeForm(instance=profile), 'work_form': WorkForm(instance=user),
                 'about_company_form': AboutCompanyForm(instance=profile), 'phone_form': PhoneForm(instance=profile),
                 'email_form': EmailForm(instance=user), 'web_page_form': WebPageForm(instance=profile),
-                'social_form': SocialForm(instance=profile), 'about_form': AboutForm(instance=profile)
+                'social_form': SocialForm(instance=profile), 'about_form': AboutForm(instance=profile),
+                'company_form': CreateCompanyForm()
             }
-            if not user.company:
-                company_form = {'company_form': CreateCompanyForm()}
-                context.update(company_form)
 
             context.update(profile_forms)
 
@@ -441,7 +439,7 @@ def change_password(request):
 from django.views.generic.edit import FormMixin
 class Feed(ListView):
     template_name = 'client/accounts/feed.html'
-    paginate_by = 5
+    paginate_by = 10
     model = Exposition
     filter_form = FeedFilterForm
     success_url = '/profile/feed/'

proj/settings.py

@@ -223,15 +223,20 @@ LOGIN_URL='/'
 #registration info
 ACCOUNT_ACTIVATION_DAYS=2
 # mail settings
-EMAIL_USE_TLS = True
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'smtp.gmail.com'
+EMAIL_HOST = 'localhost'
-#EMAIL_HOST = 'localhost'
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_USE_TLS = False
+EMAIL_PORT = 25
+#test
+#EMAIL_USE_TLS = True
+#EMAIL_HOST = 'smtp.gmail.com'
 #EMAIL_HOST_USER = 'kotzilla'
-EMAIL_HOST_USER = 'kotzillla@gmail.com'
+#EMAIL_HOST_USER = 'kotzillla@gmail.com'
-EMAIL_HOST_PASSWORD = 'fitteR2006!'
+#EMAIL_HOST_PASSWORD = 'fitteR2006!'
 
-
+#EMAIL_PORT = 587
-EMAIL_PORT = 587
 #DEFAULT_FROM_EMAIL = 'kotzillla@gmail.com'