diff options
103 files changed, 23 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index 0504778..94c8ee1 100644..100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,10 @@ Django==1.9 MySQL-python==1.2.5 oauthlib==0.7.2 -PyJWT==1.3.0 +#PyJWT==1.3.0 python-openid==2.2.5 python-social-auth==0.2.11 requests==2.7.0 requests-oauthlib==0.5.0 six==1.9.0 + diff --git a/scipy2016/__init__.py b/scipy2016/__init__.py index e69de29..e69de29 100644..100755 --- a/scipy2016/__init__.py +++ b/scipy2016/__init__.py diff --git a/scipy2016/__init__.pyc b/scipy2016/__init__.pyc Binary files differindex aa01bef..9584aa2 100644 --- a/scipy2016/__init__.pyc +++ b/scipy2016/__init__.pyc diff --git a/scipy2016/settings.py b/scipy2016/settings.py index b6113cb..fa8430a 100644..100755 --- a/scipy2016/settings.py +++ b/scipy2016/settings.py @@ -96,7 +96,7 @@ DATABASES = { 'NAME': 'scipy2016', # Or path to database file if using sqlite3. # The following settings are not used with sqlite3: 'USER': 'root', - 'PASSWORD': 'root', + 'PASSWORD': 'aero123', 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. 'PORT': '', } @@ -143,4 +143,4 @@ EMAIL_PORT = 1025 EMAIL_HOST_USER = '' EMAIL_HOST_PASSWORD = '' EMAIL_USE_TLS = False -DEFAULT_FROM_EMAIL = 'komal@gmail.com'
\ No newline at end of file +DEFAULT_FROM_EMAIL = 'komal@gmail.com' diff --git a/scipy2016/settings.pyc b/scipy2016/settings.pyc Binary files differindex 33aa847..304a8ed 100644 --- a/scipy2016/settings.pyc +++ b/scipy2016/settings.pyc diff --git a/scipy2016/urls.py b/scipy2016/urls.py index e1259cf..e1259cf 100644..100755 --- a/scipy2016/urls.py +++ b/scipy2016/urls.py diff --git a/scipy2016/urls.pyc b/scipy2016/urls.pyc Binary files differindex a963a87..d797f72 100644 --- a/scipy2016/urls.pyc +++ b/scipy2016/urls.pyc diff --git a/scipy2016/wsgi.py b/scipy2016/wsgi.py index 8a257db..e8c8013 100644..100755 --- a/scipy2016/wsgi.py +++ b/scipy2016/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for scipy2016 project. +WSGI config for online_test project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -8,7 +8,25 @@ https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/ """ import os +import sys + + +sys.path.insert(0, '/Site/scipy_in_2016/scipy/scipy2016') +sys.path.insert(1, '/Site/scipy_in_2016/scipy') +sys.path.insert(2, '/Site/scipy_in_2016/scipy_env/lib/python2.7/site-packages') +# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks +# if running multiple sites in the same mod_wsgi process. To fix this, use +# mod_wsgi daemon mode with each site in its own daemon process, or use + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scipy2016.settings") +activate_this = '/Site/scipy_in_2016/scipy_env/bin/activate_this.py' +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. from django.core.wsgi import get_wsgi_application application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/scipy2016/wsgi.pyc b/scipy2016/wsgi.pyc Binary files differindex 92805c3..ae7c175 100644 --- a/scipy2016/wsgi.pyc +++ b/scipy2016/wsgi.pyc diff --git a/website/__init__.py b/website/__init__.py index e69de29..e69de29 100644..100755 --- a/website/__init__.py +++ b/website/__init__.py diff --git a/website/__init__.pyc b/website/__init__.pyc Binary files differindex e945cc2..e122838 100644 --- a/website/__init__.pyc +++ b/website/__init__.pyc diff --git a/website/admin.py b/website/admin.py index 5e2a00f..5e2a00f 100644..100755 --- a/website/admin.py +++ b/website/admin.py diff --git a/website/admin.pyc b/website/admin.pyc Binary files differindex 30f6bad..d3d12dd 100644 --- a/website/admin.pyc +++ b/website/admin.pyc diff --git a/website/forms.py b/website/forms.py index 2ce8219..2ce8219 100644..100755 --- a/website/forms.py +++ b/website/forms.py diff --git a/website/forms.pyc b/website/forms.pyc Binary files differindex 27fb812..1f5150d 100644 --- a/website/forms.pyc +++ b/website/forms.pyc diff --git a/website/models.py b/website/models.py index c4236c6..c4236c6 100644..100755 --- a/website/models.py +++ b/website/models.py diff --git a/website/models.pyc b/website/models.pyc Binary files differindex f9a9b81..06f851b 100644 --- a/website/models.pyc +++ b/website/models.pyc diff --git a/website/static/css/base.css b/website/static/css/base.css index fc85d8d..fc85d8d 100644..100755 --- a/website/static/css/base.css +++ b/website/static/css/base.css diff --git a/website/static/css/bootstrap.min.css b/website/static/css/bootstrap.min.css index a9c36c5..a9c36c5 100644..100755 --- a/website/static/css/bootstrap.min.css +++ b/website/static/css/bootstrap.min.css diff --git a/website/static/css/fileuploader.css b/website/static/css/fileuploader.css index 721d762..721d762 100644..100755 --- a/website/static/css/fileuploader.css +++ b/website/static/css/fileuploader.css diff --git a/website/static/css/font-awesome.min.css b/website/static/css/font-awesome.min.css index 4d8bb8a..4d8bb8a 100644..100755 --- a/website/static/css/font-awesome.min.css +++ b/website/static/css/font-awesome.min.css diff --git a/website/static/css/ie8.css b/website/static/css/ie8.css index ea64923..ea64923 100644..100755 --- a/website/static/css/ie8.css +++ b/website/static/css/ie8.css diff --git a/website/static/css/ie9.css b/website/static/css/ie9.css index 94ebce7..94ebce7 100644..100755 --- a/website/static/css/ie9.css +++ b/website/static/css/ie9.css diff --git a/website/static/css/images/overlay.png b/website/static/css/images/overlay.png Binary files differindex a561943..a561943 100644..100755 --- a/website/static/css/images/overlay.png +++ b/website/static/css/images/overlay.png diff --git a/website/static/css/main.css b/website/static/css/main.css index 2c0ef97..2c0ef97 100644..100755 --- a/website/static/css/main.css +++ b/website/static/css/main.css diff --git a/website/static/fonts/FontAwesome.otf b/website/static/fonts/FontAwesome.otf Binary files differindex d4de13e..d4de13e 100644..100755 --- a/website/static/fonts/FontAwesome.otf +++ b/website/static/fonts/FontAwesome.otf diff --git a/website/static/fonts/fontawesome-webfont.eot b/website/static/fonts/fontawesome-webfont.eot Binary files differindex c7b00d2..c7b00d2 100644..100755 --- a/website/static/fonts/fontawesome-webfont.eot +++ b/website/static/fonts/fontawesome-webfont.eot diff --git a/website/static/fonts/fontawesome-webfont.svg b/website/static/fonts/fontawesome-webfont.svg index 8b66187..8b66187 100644..100755 --- a/website/static/fonts/fontawesome-webfont.svg +++ b/website/static/fonts/fontawesome-webfont.svg diff --git a/website/static/fonts/fontawesome-webfont.ttf b/website/static/fonts/fontawesome-webfont.ttf Binary files differindex f221e50..f221e50 100644..100755 --- a/website/static/fonts/fontawesome-webfont.ttf +++ b/website/static/fonts/fontawesome-webfont.ttf diff --git a/website/static/fonts/fontawesome-webfont.woff b/website/static/fonts/fontawesome-webfont.woff Binary files differindex 6e7483c..6e7483c 100644..100755 --- a/website/static/fonts/fontawesome-webfont.woff +++ b/website/static/fonts/fontawesome-webfont.woff diff --git a/website/static/fonts/fontawesome-webfont.woff2 b/website/static/fonts/fontawesome-webfont.woff2 Binary files differindex 7eb74fd..7eb74fd 100644..100755 --- a/website/static/fonts/fontawesome-webfont.woff2 +++ b/website/static/fonts/fontawesome-webfont.woff2 diff --git a/website/static/img/1.png b/website/static/img/1.png Binary files differindex 1fd17ae..1fd17ae 100644..100755 --- a/website/static/img/1.png +++ b/website/static/img/1.png diff --git a/website/static/img/2.jpg b/website/static/img/2.jpg Binary files differindex 660fdca..660fdca 100644..100755 --- a/website/static/img/2.jpg +++ b/website/static/img/2.jpg diff --git a/website/static/img/3.jpg b/website/static/img/3.jpg Binary files differindex c76c44e..c76c44e 100644..100755 --- a/website/static/img/3.jpg +++ b/website/static/img/3.jpg diff --git a/website/static/img/3.png b/website/static/img/3.png Binary files differindex ea9be22..ea9be22 100644..100755 --- a/website/static/img/3.png +++ b/website/static/img/3.png diff --git a/website/static/img/c1.png b/website/static/img/c1.png Binary files differindex 314353f..314353f 100644..100755 --- a/website/static/img/c1.png +++ b/website/static/img/c1.png diff --git a/website/static/img/c2.png b/website/static/img/c2.png Binary files differindex b43bc75..b43bc75 100644..100755 --- a/website/static/img/c2.png +++ b/website/static/img/c2.png diff --git a/website/static/img/c3.png b/website/static/img/c3.png Binary files differindex b8e5af2..b8e5af2 100644..100755 --- a/website/static/img/c3.png +++ b/website/static/img/c3.png diff --git a/website/static/img/fossee.png b/website/static/img/fossee.png Binary files differindex 6feda2d..6feda2d 100644..100755 --- a/website/static/img/fossee.png +++ b/website/static/img/fossee.png diff --git a/website/static/img/logo.png b/website/static/img/logo.png Binary files differindex 3c54a02..3c54a02 100644..100755 --- a/website/static/img/logo.png +++ b/website/static/img/logo.png diff --git a/website/static/img/logo.svg b/website/static/img/logo.svg index a3248c9..a3248c9 100644..100755 --- a/website/static/img/logo.svg +++ b/website/static/img/logo.svg diff --git a/website/static/img/mhrd.png b/website/static/img/mhrd.png Binary files differindex f949b42..f949b42 100644..100755 --- a/website/static/img/mhrd.png +++ b/website/static/img/mhrd.png diff --git a/website/static/img/pic01.jpg b/website/static/img/pic01.jpg Binary files differindex 25477aa..25477aa 100644..100755 --- a/website/static/img/pic01.jpg +++ b/website/static/img/pic01.jpg diff --git a/website/static/img/pic02.jpg b/website/static/img/pic02.jpg Binary files differindex 7cf8346..7cf8346 100644..100755 --- a/website/static/img/pic02.jpg +++ b/website/static/img/pic02.jpg diff --git a/website/static/img/pic03.jpg b/website/static/img/pic03.jpg Binary files differindex 51192cb..51192cb 100644..100755 --- a/website/static/img/pic03.jpg +++ b/website/static/img/pic03.jpg diff --git a/website/static/img/pic04.jpg b/website/static/img/pic04.jpg Binary files differindex 18063b1..18063b1 100644..100755 --- a/website/static/img/pic04.jpg +++ b/website/static/img/pic04.jpg diff --git a/website/static/img/pic05.jpg b/website/static/img/pic05.jpg Binary files differindex b7b49ed..b7b49ed 100644..100755 --- a/website/static/img/pic05.jpg +++ b/website/static/img/pic05.jpg diff --git a/website/static/img/pic06.jpg b/website/static/img/pic06.jpg Binary files differindex cf78a92..cf78a92 100644..100755 --- a/website/static/img/pic06.jpg +++ b/website/static/img/pic06.jpg diff --git a/website/static/js/bootstrap.min.js b/website/static/js/bootstrap.min.js index 1765631..1765631 100644..100755 --- a/website/static/js/bootstrap.min.js +++ b/website/static/js/bootstrap.min.js diff --git a/website/static/js/fileuploader.js b/website/static/js/fileuploader.js index 0eb5d23..0eb5d23 100644..100755 --- a/website/static/js/fileuploader.js +++ b/website/static/js/fileuploader.js diff --git a/website/static/js/ie/PIE.htc b/website/static/js/ie/PIE.htc index ca3b547..ca3b547 100644..100755 --- a/website/static/js/ie/PIE.htc +++ b/website/static/js/ie/PIE.htc diff --git a/website/static/js/ie/html5shiv.js b/website/static/js/ie/html5shiv.js index dcf351c..dcf351c 100644..100755 --- a/website/static/js/ie/html5shiv.js +++ b/website/static/js/ie/html5shiv.js diff --git a/website/static/js/ie/respond.min.js b/website/static/js/ie/respond.min.js index e8d6207..e8d6207 100644..100755 --- a/website/static/js/ie/respond.min.js +++ b/website/static/js/ie/respond.min.js diff --git a/website/static/js/jquery.min.js b/website/static/js/jquery.min.js index 0f60b7b..0f60b7b 100644..100755 --- a/website/static/js/jquery.min.js +++ b/website/static/js/jquery.min.js diff --git a/website/static/js/jquery.scrollex.min.js b/website/static/js/jquery.scrollex.min.js index a4727fe..a4727fe 100644..100755 --- a/website/static/js/jquery.scrollex.min.js +++ b/website/static/js/jquery.scrollex.min.js diff --git a/website/static/js/jquery.scrolly.min.js b/website/static/js/jquery.scrolly.min.js index 947194e..947194e 100644..100755 --- a/website/static/js/jquery.scrolly.min.js +++ b/website/static/js/jquery.scrolly.min.js diff --git a/website/static/js/main.js b/website/static/js/main.js index 0e35e2e..0e35e2e 100644..100755 --- a/website/static/js/main.js +++ b/website/static/js/main.js diff --git a/website/static/js/skel.min.js b/website/static/js/skel.min.js index 0e7633a..0e7633a 100644..100755 --- a/website/static/js/skel.min.js +++ b/website/static/js/skel.min.js diff --git a/website/static/js/util.js b/website/static/js/util.js index bdb8e9f..bdb8e9f 100644..100755 --- a/website/static/js/util.js +++ b/website/static/js/util.js diff --git a/website/static/sass/base/_page.scss b/website/static/sass/base/_page.scss index 3603091..3603091 100644..100755 --- a/website/static/sass/base/_page.scss +++ b/website/static/sass/base/_page.scss diff --git a/website/static/sass/base/_typography.scss b/website/static/sass/base/_typography.scss index f60b3ac..f60b3ac 100644..100755 --- a/website/static/sass/base/_typography.scss +++ b/website/static/sass/base/_typography.scss diff --git a/website/static/sass/components/_box.scss b/website/static/sass/components/_box.scss index 13458fb..13458fb 100644..100755 --- a/website/static/sass/components/_box.scss +++ b/website/static/sass/components/_box.scss diff --git a/website/static/sass/components/_button.scss b/website/static/sass/components/_button.scss index 92c9412..92c9412 100644..100755 --- a/website/static/sass/components/_button.scss +++ b/website/static/sass/components/_button.scss diff --git a/website/static/sass/components/_features.scss b/website/static/sass/components/_features.scss index 0a913b3..0a913b3 100644..100755 --- a/website/static/sass/components/_features.scss +++ b/website/static/sass/components/_features.scss diff --git a/website/static/sass/components/_form.scss b/website/static/sass/components/_form.scss index 807ed9b..807ed9b 100644..100755 --- a/website/static/sass/components/_form.scss +++ b/website/static/sass/components/_form.scss diff --git a/website/static/sass/components/_icon.scss b/website/static/sass/components/_icon.scss index bf2731b..bf2731b 100644..100755 --- a/website/static/sass/components/_icon.scss +++ b/website/static/sass/components/_icon.scss diff --git a/website/static/sass/components/_image.scss b/website/static/sass/components/_image.scss index 3c4db8c..3c4db8c 100644..100755 --- a/website/static/sass/components/_image.scss +++ b/website/static/sass/components/_image.scss diff --git a/website/static/sass/components/_list.scss b/website/static/sass/components/_list.scss index 0c8b644..0c8b644 100644..100755 --- a/website/static/sass/components/_list.scss +++ b/website/static/sass/components/_list.scss diff --git a/website/static/sass/components/_section.scss b/website/static/sass/components/_section.scss index 849297d..849297d 100644..100755 --- a/website/static/sass/components/_section.scss +++ b/website/static/sass/components/_section.scss diff --git a/website/static/sass/components/_spotlight.scss b/website/static/sass/components/_spotlight.scss index 90c6c5b..90c6c5b 100644..100755 --- a/website/static/sass/components/_spotlight.scss +++ b/website/static/sass/components/_spotlight.scss diff --git a/website/static/sass/components/_statistics.scss b/website/static/sass/components/_statistics.scss index 3e49fc0..3e49fc0 100644..100755 --- a/website/static/sass/components/_statistics.scss +++ b/website/static/sass/components/_statistics.scss diff --git a/website/static/sass/components/_table.scss b/website/static/sass/components/_table.scss index 961513a..961513a 100644..100755 --- a/website/static/sass/components/_table.scss +++ b/website/static/sass/components/_table.scss diff --git a/website/static/sass/ie8.scss b/website/static/sass/ie8.scss index 0245b4a..0245b4a 100644..100755 --- a/website/static/sass/ie8.scss +++ b/website/static/sass/ie8.scss diff --git a/website/static/sass/ie9.scss b/website/static/sass/ie9.scss index 158f35f..158f35f 100644..100755 --- a/website/static/sass/ie9.scss +++ b/website/static/sass/ie9.scss diff --git a/website/static/sass/layout/_footer.scss b/website/static/sass/layout/_footer.scss index 478d73e..478d73e 100644..100755 --- a/website/static/sass/layout/_footer.scss +++ b/website/static/sass/layout/_footer.scss diff --git a/website/static/sass/layout/_header.scss b/website/static/sass/layout/_header.scss index f13ca67..f13ca67 100644..100755 --- a/website/static/sass/layout/_header.scss +++ b/website/static/sass/layout/_header.scss diff --git a/website/static/sass/layout/_main.scss b/website/static/sass/layout/_main.scss index b6a8708..b6a8708 100644..100755 --- a/website/static/sass/layout/_main.scss +++ b/website/static/sass/layout/_main.scss diff --git a/website/static/sass/layout/_nav.scss b/website/static/sass/layout/_nav.scss index d6eda19..d6eda19 100644..100755 --- a/website/static/sass/layout/_nav.scss +++ b/website/static/sass/layout/_nav.scss diff --git a/website/static/sass/layout/_wrapper.scss b/website/static/sass/layout/_wrapper.scss index c5a05eb..c5a05eb 100644..100755 --- a/website/static/sass/layout/_wrapper.scss +++ b/website/static/sass/layout/_wrapper.scss diff --git a/website/static/sass/libs/_functions.scss b/website/static/sass/libs/_functions.scss index 0e08c1a..0e08c1a 100644..100755 --- a/website/static/sass/libs/_functions.scss +++ b/website/static/sass/libs/_functions.scss diff --git a/website/static/sass/libs/_mixins.scss b/website/static/sass/libs/_mixins.scss index 3325df0..3325df0 100644..100755 --- a/website/static/sass/libs/_mixins.scss +++ b/website/static/sass/libs/_mixins.scss diff --git a/website/static/sass/libs/_skel.scss b/website/static/sass/libs/_skel.scss index 438b147..438b147 100644..100755 --- a/website/static/sass/libs/_skel.scss +++ b/website/static/sass/libs/_skel.scss diff --git a/website/static/sass/libs/_vars.scss b/website/static/sass/libs/_vars.scss index 9f1d089..9f1d089 100644..100755 --- a/website/static/sass/libs/_vars.scss +++ b/website/static/sass/libs/_vars.scss diff --git a/website/static/sass/main.scss b/website/static/sass/main.scss index a7df9d9..a7df9d9 100644..100755 --- a/website/static/sass/main.scss +++ b/website/static/sass/main.scss diff --git a/website/templates/abstract-details.html b/website/templates/abstract-details.html index 30a6dea..30a6dea 100644..100755 --- a/website/templates/abstract-details.html +++ b/website/templates/abstract-details.html diff --git a/website/templates/base.html b/website/templates/base.html index 4855a50..4855a50 100644..100755 --- a/website/templates/base.html +++ b/website/templates/base.html diff --git a/website/templates/cfp.html b/website/templates/cfp.html index ec5bf0c..ec5bf0c 100644..100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html diff --git a/website/templates/comment-abstract.html b/website/templates/comment-abstract.html index 92d9e9b..92d9e9b 100644..100755 --- a/website/templates/comment-abstract.html +++ b/website/templates/comment-abstract.html diff --git a/website/templates/down.html b/website/templates/down.html index c382393..c382393 100644..100755 --- a/website/templates/down.html +++ b/website/templates/down.html diff --git a/website/templates/registration/password_change_done.html b/website/templates/registration/password_change_done.html index 7edddfa..7edddfa 100644..100755 --- a/website/templates/registration/password_change_done.html +++ b/website/templates/registration/password_change_done.html diff --git a/website/templates/registration/password_change_form.html b/website/templates/registration/password_change_form.html index 4884aca..4884aca 100644..100755 --- a/website/templates/registration/password_change_form.html +++ b/website/templates/registration/password_change_form.html diff --git a/website/templates/registration/password_reset_complete.html b/website/templates/registration/password_reset_complete.html index c36c1f2..c36c1f2 100644..100755 --- a/website/templates/registration/password_reset_complete.html +++ b/website/templates/registration/password_reset_complete.html diff --git a/website/templates/registration/password_reset_confirm.html b/website/templates/registration/password_reset_confirm.html index 32c6bbd..32c6bbd 100644..100755 --- a/website/templates/registration/password_reset_confirm.html +++ b/website/templates/registration/password_reset_confirm.html diff --git a/website/templates/registration/password_reset_done.html b/website/templates/registration/password_reset_done.html index 1a3dfae..1a3dfae 100644..100755 --- a/website/templates/registration/password_reset_done.html +++ b/website/templates/registration/password_reset_done.html diff --git a/website/templates/registration/password_reset_form.html b/website/templates/registration/password_reset_form.html index 5b40bbf..5b40bbf 100644..100755 --- a/website/templates/registration/password_reset_form.html +++ b/website/templates/registration/password_reset_form.html diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html index b0413b8..b0413b8 100644..100755 --- a/website/templates/submit-cfw.html +++ b/website/templates/submit-cfw.html diff --git a/website/templates/user-register.html b/website/templates/user-register.html index cecaa33..cecaa33 100644..100755 --- a/website/templates/user-register.html +++ b/website/templates/user-register.html diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html index a48f2e0..a48f2e0 100644..100755 --- a/website/templates/view-abstracts.html +++ b/website/templates/view-abstracts.html diff --git a/website/tests.py b/website/tests.py index 7ce503c..7ce503c 100644..100755 --- a/website/tests.py +++ b/website/tests.py diff --git a/website/urls.py b/website/urls.py index 243d9bf..243d9bf 100644..100755 --- a/website/urls.py +++ b/website/urls.py diff --git a/website/urls.pyc b/website/urls.pyc Binary files differindex ec44ed6..ac0de64 100644 --- a/website/urls.pyc +++ b/website/urls.pyc diff --git a/website/views.py b/website/views.py index f53cf51..f53cf51 100644..100755 --- a/website/views.py +++ b/website/views.py diff --git a/website/views.pyc b/website/views.pyc Binary files differindex 97ab16b..00c8807 100644 --- a/website/views.pyc +++ b/website/views.pyc |
