git.onelab.eu Git - myslice.git/commit

git://git.onelab.eu / myslice.git / commit

author	Loic & Edelberto <loic.baron@lip6.fr>
	Wed, 23 Apr 2014 13:38:33 +0000 (10:38 -0300)
committer	Loic & Edelberto <loic.baron@lip6.fr>
	Wed, 23 Apr 2014 13:38:33 +0000 (10:38 -0300)
commit	114043cbf2203977fc4c149578fd49ea684048cf
tree	d407dd551fda219e836ca41fc2f7427d76b3f10b	tree \| snapshot
parent	5ffad1dedf2e0fd3be2006d72e7d06662ece2419	commit \| diff

Merging with OneLab latest

71 files changed:

.settings/org.eclipse.core.resources.prefs		diff \| blob \| history
README		diff \| blob \| history
auth/static/js/logout.js		diff \| blob \| history
debian/control		diff \| blob \| history
debian/deb-cheat-sheet		diff \| blob \| history
debian/unfold.install		diff \| blob \| history
manifoldapi/manifoldapi.py		diff \| blob \| history
manifoldapi/static/js/manifold.js		diff \| blob \| history
plugins/googlemap/static/js/googlemap.js		diff \| blob \| history
plugins/querytable/__init__.py		diff \| blob \| history
plugins/querytable/static/css/querytable.css		diff \| blob \| history
plugins/querytable/static/js/querytable.js		diff \| blob \| history
plugins/querytable/templates/querytable.html		diff \| blob \| history
plugins/queryupdater/static/js/queryupdater.js		diff \| blob \| history
plugins/scheduler2/asdf.txt	[changed mode: 0644->0755]	blob \| history
portal/about.py		diff \| blob \| history
portal/accountview.py		diff \| blob \| history
portal/contactview.py		diff \| blob \| history
portal/dashboardview.py		diff \| blob \| history
portal/django_passresetview.py		diff \| blob \| history
portal/documentationview.py		diff \| blob \| history
portal/institution.py		diff \| blob \| history
portal/joinview.py		diff \| blob \| history
portal/manageuserview.py		diff \| blob \| history
portal/platformsview.py		diff \| blob \| history
portal/platformview.py		diff \| blob \| history
portal/resourceview.py		diff \| blob \| history
portal/slicerequestview.py		diff \| blob \| history
portal/sliceresourceview.py		diff \| blob \| history
portal/slicetabexperiment.py		diff \| blob \| history
portal/slicetabinfo.py		diff \| blob \| history
portal/slicetabtestbeds.py		diff \| blob \| history
portal/sliceview.py		diff \| blob \| history
portal/sliceviewold.py		diff \| blob \| history
portal/static/css/fed4fire.css		diff \| blob \| history
portal/static/css/onelab.css		diff \| blob \| history
portal/static/js/institution.js		diff \| blob \| history
portal/static/js/myslice.js		diff \| blob \| history
portal/static/js/onelab_slice-resource-view.js		diff \| blob \| history
portal/supportview.py		diff \| blob \| history
portal/templates/about.html		diff \| blob \| history
portal/templates/account-view.html		diff \| blob \| history
portal/templates/contact_sent.html		diff \| blob \| history
portal/templates/home-view.html		diff \| blob \| history
portal/templates/institution.html		diff \| blob \| history
portal/templates/join_view.html		diff \| blob \| history
portal/templates/manageuserview.html		diff \| blob \| history
portal/templates/onelab/onelab_slice-user-view.html		diff \| blob \| history
portal/templates/onelab/onelab_slice-view.html		diff \| blob \| history
portal/templates/onelab/onelab_widget-slice-sections.html		diff \| blob \| history
portal/templates/password_reset_complete.html		diff \| blob \| history
portal/templates/password_reset_confirm.html		diff \| blob \| history
portal/templates/password_reset_done.html		diff \| blob \| history
portal/templates/password_reset_form.html		diff \| blob \| history
portal/templates/slice-request-ack-view.html		diff \| blob \| history
portal/templates/slice-tab-info.html		diff \| blob \| history
portal/templates/slice-tab-testbeds.html		diff \| blob \| history
portal/templates/slice_request_email.html		diff \| blob \| history
portal/templates/slice_request_email.txt		diff \| blob \| history
portal/templates/slicerequest_view.html		diff \| blob \| history
portal/templates/supportview.html		diff \| blob \| history
portal/templates/user_register_complete.html		diff \| blob \| history
portal/templates/user_request_email.html		diff \| blob \| history
portal/templates/user_request_email.txt		diff \| blob \| history
portal/templates/validate_pending.html		diff \| blob \| history
portal/urls.py		diff \| blob \| history
portal/usersview.py		diff \| blob \| history
portal/validationview.py		diff \| blob \| history
rest/__init__.py		diff \| blob \| history
rest/create.py		diff \| blob \| history
rest/update.py		diff \| blob \| history

myslice (django)

RSS Atom