# HG changeset patch # User Parth buch # Date 1322903087 -19800 # Node ID 3fcab949fc594b48ae41726cdcc835677ca0b320 # Parent 08aaf89016e3b9ee2c7a35c4ad5e1f1fc4c99a14# Parent 3c981ecb6b8e0140274dd799801a0373d96d650b merge diff -r 3c981ecb6b8e -r 3fcab949fc59 .hgignore --- a/.hgignore Sat Dec 03 12:51:00 2011 +0530 +++ b/.hgignore Sat Dec 03 14:34:47 2011 +0530 @@ -40,4 +40,5 @@ project/scipycon/user/*.pyc apache/* *.db - +buildout.cfg +project/production.py diff -r 3c981ecb6b8e -r 3fcab949fc59 buildout.cfg --- a/buildout.cfg Sat Dec 03 12:51:00 2011 +0530 +++ b/buildout.cfg Sat Dec 03 14:34:47 2011 +0530 @@ -1,5 +1,5 @@ [buildout] -parts = django tagging django-robots south reportlab +parts = django tagging django-robots reportlab eggs = Werkzeug PIL @@ -26,7 +26,6 @@ pythonpath = ${tagging:location} ${django-robots:location} - ${south:location} [tagging] recipe = infrae.subversion @@ -36,6 +35,3 @@ recipe = zerokspot.recipe.git repository = https://github.com/jezdez/django-robots.git -[south] -recipe = mercurialrecipe -repository = http://bitbucket.org/andrewgodwin/south/ diff -r 3c981ecb6b8e -r 3fcab949fc59 project/production.py --- a/project/production.py Sat Dec 03 12:51:00 2011 +0530 +++ b/project/production.py Sat Dec 03 14:34:47 2011 +0530 @@ -1,6 +1,6 @@ from project.settings import * -DEBUG=False +DEBUG=True TEMPLATE_DEBUG=DEBUG SITE_ID = 3 @@ -25,8 +25,8 @@ 'robots', ) -DATABASE_ENGINE = 'mysql' -DATABASE_NAME = 'scipycon' -DATABASE_USER = 'scipy' +#DATABASE_ENGINE = 'mysql' +#DATABASE_NAME = 'scipycon' +#DATABASE_USER = 'scipy' # Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo -from project.local import DATABASE_PASSWORD +#from project.local import DATABASE_PASSWORD diff -r 3c981ecb6b8e -r 3fcab949fc59 project/static/files/Reaching_IITB.pdf Binary file project/static/files/Reaching_IITB.pdf has changed diff -r 3c981ecb6b8e -r 3fcab949fc59 project/templates/_right_menu.html --- a/project/templates/_right_menu.html Sat Dec 03 12:51:00 2011 +0530 +++ b/project/templates/_right_menu.html Sat Dec 03 14:34:47 2011 +0530 @@ -1,8 +1,9 @@

News and Updates

diff -r 3c981ecb6b8e -r 3fcab949fc59 project/templates/about/contact.html --- a/project/templates/about/contact.html Sat Dec 03 12:51:00 2011 +0530 +++ b/project/templates/about/contact.html Sat Dec 03 14:34:47 2011 +0530 @@ -23,5 +23,11 @@ Email id: primal@fossee.in


+
  • + Deepak Kharat
    + Phone No: +919819650310
    + Email id: deepak@fossee.in
    +
    • +

    {% endblock content %} diff -r 3c981ecb6b8e -r 3fcab949fc59 project/templates/about/links.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project/templates/about/links.html Sat Dec 03 14:34:47 2011 +0530 @@ -0,0 +1,1 @@ +` diff -r 3c981ecb6b8e -r 3fcab949fc59 project/templates/about/tutorial.html --- a/project/templates/about/tutorial.html Sat Dec 03 12:51:00 2011 +0530 +++ b/project/templates/about/tutorial.html Sat Dec 03 14:34:47 2011 +0530 @@ -13,11 +13,11 @@ TimeSpeakerTitle -09:00-11:00Jarrod MillmanGit/Github + NumPy/SciPy/MPL basics +09:00-11:00Puneeth ChagantiGit/Github + NumPy/SciPy/MPL basics 11:00-13:00Emmanuelle GouillartImage processing using NumPy, SciPy and scikits-image 13:00-14:00Lunch 14:00-16:00Gael VaroquauxMachine learning with scikit-learn -16:00-18:00Mateusz PaprockiSymPy +16:00-18:00Ole NielsenMapping and Geoprocessing with Python @@ -32,7 +32,7 @@ TimeSpeakerTitle -09:00-11:00Ole NielsenMapping and Geoprocessing with Python +09:00-11:00Mateusz PaprockiSymPy 11:00-13:00Eric JonesTraits + Traits UI 13:00-14:00Lunch 14:00-16:00Prabhu Ramachandran and Gael VaroquauxMayavi for 3D visualization @@ -78,7 +78,7 @@ -

    Jarrod Millman, Git/Github + NumPy/SciPy/MPL basics (2 hrs)

    +

    Puneeth Chaganti, Git/Github + NumPy/SciPy/MPL basics (2 hrs)

    -

    Eric Jones: Traits + Traits UI (2 hrs)