fixed #14

MySmile · Oct 18, 2015 · 1f6c576 · 1f6c576
1 parent 1e431ac
commit 1f6c576
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,5 @@ docs/build/**
 mysmile/static/vendor/**
 !mysmile/static/jscolor
 apps/**/migrations/**
-#mysmile/db/mysmile.sqlite3
-
+mysmile/db/mysmile.sqlite3
 .idea
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,7 +6,7 @@ Changelog
   - New MySmile API v2 based on Django Rest Framework 3
   - Updated docs
 
-**2015-10-16 Version 0.7.1**
+**2015-10-15 Version 0.7.1**
   - Added IMAGE_AUTOSCALE preference to admin panel
   - Protected admin login page from brute-force attack
   - Added "view on site" button to admin panel

diff --git a/Makefile b/Makefile
@@ -37,8 +37,15 @@ syncdb:
 # migrate - Run makemigrations & migrate command simultaneously
 migrate:
 	python3 manage.py makemigrations --settings=mysmile.settings.local
-	python3 manage.py migrate --settings=mysmile.settings.local
+	python3 manage.py migrate --fake-initial --settings=mysmile.settings.local
 
+# # onemigrate - Run makemigrations & migrate for one apps or table 
+# onemigrate:
+# 	python3 manage.py makemigrations --settings=mysmile.settings.local
+# 	python3 manage.py migrate preferences --settings=mysmile.settings.local
+
+
+
 # newdb - Create new empty database with one page
 newdb:
 	make syncdb

diff --git a/PKG-INFO b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: MySmile
-Version: 0.7.1
+Version: 0.8.0
 Author: Andrii Pryz
 Author-email: info@mysmile com ua
 Home-page: http://mysmile.com.ua

diff --git a/README.rst b/README.rst
@@ -39,7 +39,7 @@ MySmile is the lightweight open-source CMS based on Django. It helps to create w
 
 * The official `project site <http://mysmile.com.ua>`_
 * Try `demo version <http://demo.mysmile.com.ua>`_
-* Read `documentation <http://http://mysmile.com.ua/en/documentation.html>`_
+* Read `documentation <http://mysmile.com.ua/en/documentation.html>`_
 * `Source code <https://github.com/MySmile/MySmile>`_ on GitHub
 
 Dependencies

diff --git a/config/mysmile.py b/config/mysmile.py
@@ -1,7 +1,7 @@
 # MySmile settings
 from apps.preferences.models import Preferences
 
-MYSMILE_VERSION = '0.7.1'
+MYSMILE_VERSION = '0.8.0'
 
 try:
     MYSMILE_THEME = Preferences.objects.filter(key='THEME').values_list('value', flat=True)[0]

diff --git a/config/production.py b/config/production.py
@@ -21,8 +21,8 @@
     }
 }
 
-# for example: ALLOWED_HOSTS = ['mysite.com', 'www.mysite.com']
-ALLOWED_HOSTS = ['demo.mysmile.com.ua', 'www.demo.mysmile.com.ua']
+# for example: ALLOWED_HOSTS = ['mysite.com']
+ALLOWED_HOSTS = ['demo.mysmile.com.ua']
 
 # Enter path to media folder on server.
 MEDIA_ROOT = ''

diff --git a/docs/source/REST API/REST API v1/index.rst b/docs/source/REST API/REST API v1/index.rst
@@ -1,9 +1,7 @@
 REST API v1
 ***********
 
-This is version API based of Django.
-
-.. and don't recommended for use. See :ref:`restapi2` instead of it.
+This is version API based of Django and don't recommended for use. See :ref:`restapi2` instead of it.
 
 .. toctree::
    :maxdepth: 2

diff --git a/docs/source/REST API/index.rst b/docs/source/REST API/index.rst
@@ -7,4 +7,4 @@ REST API
    :titlesonly:
 
    REST API v1/index
-..    REST API v2/index
+   REST API v2/index
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.1'
+version = '0.8.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.1'
+release = '0.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/mysmile/db/.gitignore b/mysmile/db/.gitignore
diff --git a/mysmile/db/mysmile.sqlite3 b/mysmile/db/mysmile.sqlite3