From 46d05954565c370c630568d9885f1b06970c384c Mon Sep 17 00:00:00 2001 From: rubinovitz Date: Sat, 4 Jan 2014 11:01:25 -0500 Subject: [PATCH 1/4] Update README.md Spelling error --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e6708a..4a028de 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ It's assumed you have Python and Postgres already installed. * Create a database in Postgres. Whatever database settings used needs to be added to apps/ch/settings.py ~ line 12. You could also make a settings_local file using your machine name and put that in settings_local/MACHINE_NAME.py * Run ```python manage.py syncdb --migrate``` * Go into static directory and run ```python -m SimpleHTTPServer```. You should create a serve.bat file for this. This is the Angular app. -* Start Django. ```python managae runserver 0.0.0.0:8001``` I created a batch file for this called r.bat. This is your API and admin. +* Start Django. ```python manage runserver 0.0.0.0:8001``` I created a batch file for this called r.bat. This is your API and admin. * Go to [http://localhost:8000/]. This is the Angular app. It's being served directly via SimpleHTTPServer. It can be served from anywhere, even Amazon. There might be cross domain issues if you're hosting on a different domain. Use it From a8a2500aba9ea61bd81d571cf8574b6d2e2b5e8c Mon Sep 17 00:00:00 2001 From: rubinovitz Date: Sat, 4 Jan 2014 11:01:51 -0500 Subject: [PATCH 2/4] Update requirements.txt working requirements.txt --- apps/requirements.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/requirements.txt b/apps/requirements.txt index 9eec3df..590d2ea 100644 --- a/apps/requirements.txt +++ b/apps/requirements.txt @@ -8,7 +8,5 @@ django-debug-toolbar==0.9.4 django-annoying==0.7.7 django-tastypie==0.9.14 python-dateutil==1.5 -mimeparse==0.1.4 -#django-concurrent-server==0.1.0 -git+https://github.com/ashchristopher/django-concurrent-server@586989bda43be0a206c7f1d579d8c0f2a9 -a4580d#egg=django_concurrent_server-dev#egg=Package \ No newline at end of file +mimeparse +django-concurrent-server==0.1.0 From c6a8f6677f0f71ab7c55dbe41462647517a486cd Mon Sep 17 00:00:00 2001 From: rubinovitz Date: Sat, 4 Jan 2014 11:02:01 -0500 Subject: [PATCH 3/4] Update requirements.txt cleaner --- apps/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/requirements.txt b/apps/requirements.txt index 590d2ea..9d5dd74 100644 --- a/apps/requirements.txt +++ b/apps/requirements.txt @@ -2,7 +2,6 @@ Django==1.5 South==0.7.6 psycopg2==2.4.2 virtualenv==1.6.4 -#wsgiref==0.1.2 django-extensions==1.0.3 django-debug-toolbar==0.9.4 django-annoying==0.7.7 From 249861320f43d66e9424ca9c567aa9969df0b796 Mon Sep 17 00:00:00 2001 From: rubinovitz Date: Sat, 4 Jan 2014 11:03:21 -0500 Subject: [PATCH 4/4] Update README.md more spelling errors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a028de..381460f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ It's assumed you have Python and Postgres already installed. * Create a database in Postgres. Whatever database settings used needs to be added to apps/ch/settings.py ~ line 12. You could also make a settings_local file using your machine name and put that in settings_local/MACHINE_NAME.py * Run ```python manage.py syncdb --migrate``` * Go into static directory and run ```python -m SimpleHTTPServer```. You should create a serve.bat file for this. This is the Angular app. -* Start Django. ```python manage runserver 0.0.0.0:8001``` I created a batch file for this called r.bat. This is your API and admin. +* Start Django. ```python manage.py runserver 0.0.0.0:8001``` I created a batch file for this called r.bat. This is your API and admin. * Go to [http://localhost:8000/]. This is the Angular app. It's being served directly via SimpleHTTPServer. It can be served from anywhere, even Amazon. There might be cross domain issues if you're hosting on a different domain. Use it