Merging with OneLab latest
authorLoic & Edelberto <loic.baron@lip6.fr>
Wed, 23 Apr 2014 13:38:33 +0000 (10:38 -0300)
committerLoic & Edelberto <loic.baron@lip6.fr>
Wed, 23 Apr 2014 13:38:33 +0000 (10:38 -0300)
commit114043cbf2203977fc4c149578fd49ea684048cf
treed407dd551fda219e836ca41fc2f7427d76b3f10b
parent5ffad1dedf2e0fd3be2006d72e7d06662ece2419
Merging with OneLab latest
71 files changed:
.settings/org.eclipse.core.resources.prefs
README
auth/static/js/logout.js
debian/control
debian/deb-cheat-sheet
debian/unfold.install
manifoldapi/manifoldapi.py
manifoldapi/static/js/manifold.js
plugins/googlemap/static/js/googlemap.js
plugins/querytable/__init__.py
plugins/querytable/static/css/querytable.css
plugins/querytable/static/js/querytable.js
plugins/querytable/templates/querytable.html
plugins/queryupdater/static/js/queryupdater.js
plugins/scheduler2/asdf.txt [changed mode: 0644->0755]
portal/about.py
portal/accountview.py
portal/contactview.py
portal/dashboardview.py
portal/django_passresetview.py
portal/documentationview.py
portal/institution.py
portal/joinview.py
portal/manageuserview.py
portal/platformsview.py
portal/platformview.py
portal/resourceview.py
portal/slicerequestview.py
portal/sliceresourceview.py
portal/slicetabexperiment.py
portal/slicetabinfo.py
portal/slicetabtestbeds.py
portal/sliceview.py
portal/sliceviewold.py
portal/static/css/fed4fire.css
portal/static/css/onelab.css
portal/static/js/institution.js
portal/static/js/myslice.js
portal/static/js/onelab_slice-resource-view.js
portal/supportview.py
portal/templates/about.html
portal/templates/account-view.html
portal/templates/contact_sent.html
portal/templates/home-view.html
portal/templates/institution.html
portal/templates/join_view.html
portal/templates/manageuserview.html
portal/templates/onelab/onelab_slice-user-view.html
portal/templates/onelab/onelab_slice-view.html
portal/templates/onelab/onelab_widget-slice-sections.html
portal/templates/password_reset_complete.html
portal/templates/password_reset_confirm.html
portal/templates/password_reset_done.html
portal/templates/password_reset_form.html
portal/templates/slice-request-ack-view.html
portal/templates/slice-tab-info.html
portal/templates/slice-tab-testbeds.html
portal/templates/slice_request_email.html
portal/templates/slice_request_email.txt
portal/templates/slicerequest_view.html
portal/templates/supportview.html
portal/templates/user_register_complete.html
portal/templates/user_request_email.html
portal/templates/user_request_email.txt
portal/templates/validate_pending.html
portal/urls.py
portal/usersview.py
portal/validationview.py
rest/__init__.py
rest/create.py
rest/update.py