gmt-git · AlexandrDidyk · May 31, 2014 · Jun 4, 2014 · Jun 4, 2014 · Jun 4, 2014
diff --git a/Makefile b/Makefile
@@ -1,10 +1,12 @@
-MANAGE=django-admin.py
+PROJECT = django_hello_world
+MANAGE = manage.py
+PWD = cd $(PROJECT)
 
 test:
-	PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=django_hello_world.settings $(MANAGE) test hello
+	$(PWD) && python $(MANAGE) test 
 
 run:
-	PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=django_hello_world.settings $(MANAGE) runserver
+	$(PWD) && python $(MANAGE) runserver
 
 syncdb:
-	PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=django_hello_world.settings $(MANAGE) syncdb --noinput
+	$(PWD) && python $(MANAGE) syncdb --noinput
diff --git a/README b/README
@@ -1 +1,26 @@
-Django Hello World Project
+    #1 base Create basic django project that would present your name, surname, bio, contacts on the main page. Data should be stored in the DB, that's
+        manage.py syncdb
+        manage.py runserver
+        open the browser and all data are in, loaded from fixtures 
+    #3 middleware&lists Create middleware that stores all http requests in the DB
+    #4 template context Create template-context-processor that adds django.settings to the context
+    #5 forms&auth Create page with form that allows to edit data, presented on the main page
+    #6 forms-widgets&jquery For birth date on the same page add calendar widget
+    #8 template-tags Create tag that accepts any object and renders the link to its admin edit page ({% edit_link request.user %})
+    #9 commands Create django command that prints all project models and the count of objects in every model
+    #10 signals Create signal processor that, for every model, creates the db entry about the object creation/editing/deletion
+    #13 understanding Your customer sends the change request. Task: understand what he needs and implement. 
+
+Requirements
+
+    sqlite database, don't forget to add it to .gitignore
+    after python manage.py syncdb --noinput should work everything, including administrator login with admin/admin credentials
+    use virtualenv, create requirements.txt with required django version and additional libraries
+    doublecheck that everything works fine:
+
+    $ git clone github:yourproject.git
+    $ cd yourproject
+    $ virtualenv --no-site-packages .env
+    $ source .env/bin/activate
+    $ .env/bin/pip install -r requirements.txt
+    $ python manage.py syncdb --no-input
diff --git a/django_hello_world/__init__.py b/django_hello_world/__init__.py
diff --git a/django_hello_world/hello/__init__.py b/django_hello_world/hello/__init__.py
diff --git a/django_hello_world/hello/fixtures/initial_data.json b/django_hello_world/hello/fixtures/initial_data.json
diff --git a/django_hello_world/hello/models.py b/django_hello_world/hello/models.py
diff --git a/django_hello_world/hello/templates/base.html b/django_hello_world/hello/templates/base.html
diff --git a/django_hello_world/hello/templates/hello/home.html b/django_hello_world/hello/templates/hello/home.html
diff --git a/django_hello_world/hello/tests.py b/django_hello_world/hello/tests.py
diff --git a/django_hello_world/hello/views.py b/django_hello_world/hello/views.py
diff --git a/django_hello_world/manage.py b/django_hello_world/manage.py
diff --git a/django_hello_world/settings.py b/django_hello_world/settings.py
diff --git a/django_hello_world/urls.py b/django_hello_world/urls.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-Django >= 1.3, < 1.4
+Django >= 1.5
 django-annoying >= 0.7.6