From a77cde18440d9911d174dc819ad135a1a5bc570a Mon Sep 17 00:00:00 2001
From: nkotiukadmin <nazarii.kotiuk@notch-interactive.com>
Date: Tue, 16 Feb 2016 11:53:13 +0200
Subject: [PATCH 1/3] fix buf in similar news block

---
 proj/urls.py                       | 6 ++++++
 templates/client/article/news.html | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/proj/urls.py b/proj/urls.py
index dd4d976c..4fc72346 100644
--- a/proj/urls.py
+++ b/proj/urls.py
@@ -73,6 +73,12 @@ urlpatterns = patterns('',
     url(r'^', include('service.urls')),
     )
 if settings.DEBUG:
+    urlpatterns += patterns(
+        'django.views.static',
+        (r'media/(?P<path>.*)',
+        'serve',
+        {'document_root': settings.MEDIA_ROOT}), )
+
     import debug_toolbar
     urlpatterns += patterns('',
         url(r'^__debug__/', include(debug_toolbar.urls)),
diff --git a/templates/client/article/news.html b/templates/client/article/news.html
index 8bd86a60..f562eca8 100644
--- a/templates/client/article/news.html
+++ b/templates/client/article/news.html
@@ -55,7 +55,7 @@
                         </span>
                     </a>
                     <h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title }}</a></h3>
-                    <p>{{ news.preview }}</p>
+                    <p>{{ news.preview|safe }}</p>
                     <strong><span>{{ news.publish_date|date:"d E Y" }}</span>{% if news.get_event %}<a href="{{ news.get_event.get_permanent_url }}" title=""><b>{{ news.get_event.name }}</b></a><{% endif %}</strong>
                 </div>
                 <div class="clearfix"></div>

From df4d0f1f5d1660af6f1ab3194d1aecc641ba539d Mon Sep 17 00:00:00 2001
From: nkotiukadmin <nazarii.kotiuk@notch-interactive.com>
Date: Tue, 16 Feb 2016 12:07:46 +0200
Subject: [PATCH 2/3] fix error when announces status dont change

---
 emencia/django/newsletter/mailer.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py
index 29ced6c5..1872ba4f 100644
--- a/emencia/django/newsletter/mailer.py
+++ b/emencia/django/newsletter/mailer.py
@@ -292,6 +292,10 @@ class NewsLetterSender(object):
                self.newsletter.mails_sent() >= \
                self.newsletter.mailing_list.expedition_set().count():
             self.newsletter.status = Newsletter.SENT
+
+        if self.announce and not self.expedition_list:
+            self.newsletter.status = Newsletter.SENT
+
         self.newsletter.save()
 
     @property

From 4fa3990cf5d7979119b45e002741c0a4b37a6ec0 Mon Sep 17 00:00:00 2001
From: nkotiukadmin <nazarii.kotiuk@notch-interactive.com>
Date: Tue, 16 Feb 2016 14:25:02 +0200
Subject: [PATCH 3/3] fix opening photo via https(nead to check on prodauction)

---
 templates/client/includes/exposition/photo.html               | 4 ++++
 .../client/static_client/js/_modules/page.place.photo.js      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/client/includes/exposition/photo.html b/templates/client/includes/exposition/photo.html
index a21e8a3a..0c87e741 100644
--- a/templates/client/includes/exposition/photo.html
+++ b/templates/client/includes/exposition/photo.html
@@ -61,7 +61,11 @@
 	{% include 'client/popups/photo.html' %}
 {% endblock %}
 {% block scripts %}
+{% comment %}
 <script src="{% static 'client/js_min/_modules/page.place.photo.min.js' %}"></script>
+{% endcomment %}
+<script src="{% static 'client/js/_modules/page.place.photo.js' %}"></script>
+
 
 <script>
 	//js module initialization
diff --git a/templates/client/static_client/js/_modules/page.place.photo.js b/templates/client/static_client/js/_modules/page.place.photo.js
index bc5f7b31..459d0909 100644
--- a/templates/client/static_client/js/_modules/page.place.photo.js
+++ b/templates/client/static_client/js/_modules/page.place.photo.js
@@ -21,7 +21,7 @@ if (EXPO.placePhoto){
 			// object properties
 			var self = this;
 			this.currentId = undefined;
-			this.ajaxUrl = ajaxUrl;
+			this.ajaxUrl = location.protocol+'//'+location.hostname+(location.port ? ':'+location.port: '') + ajaxUrl;
 			//modal Window options
 			this.opt = {
 				gContainerId:containerId,