Jordan Augé [Sun, 6 Jul 2014 17:56:52 +0000 (19:56 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Conflicts:
portal/sliceresourceview.py
Jordan Augé [Sun, 6 Jul 2014 17:55:02 +0000 (19:55 +0200)]
updated myslice
Ciro Scognamiglio [Fri, 4 Jul 2014 15:29:15 +0000 (17:29 +0200)]
added disclaimet for planetlab europe users
Ciro Scognamiglio [Fri, 4 Jul 2014 15:17:08 +0000 (17:17 +0200)]
modifed about page
Ciro Scognamiglio [Fri, 4 Jul 2014 15:11:32 +0000 (17:11 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Fri, 4 Jul 2014 15:11:24 +0000 (17:11 +0200)]
breadcrumbs, copied some templates in the onleab theme dir
Yasin [Fri, 4 Jul 2014 14:38:30 +0000 (16:38 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Fri, 4 Jul 2014 14:37:27 +0000 (16:37 +0200)]
slicereq: template update
Ciro Scognamiglio [Fri, 4 Jul 2014 12:55:21 +0000 (14:55 +0200)]
fixe styles, fixed link to requests to be validated from home
Ciro Scognamiglio [Fri, 4 Jul 2014 12:12:55 +0000 (14:12 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Fri, 4 Jul 2014 12:11:46 +0000 (14:11 +0200)]
styles for inputs and buttons
Yasin [Fri, 4 Jul 2014 09:30:32 +0000 (11:30 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Fri, 4 Jul 2014 09:30:12 +0000 (11:30 +0200)]
Fix: hide management for non pis
Ciro Scognamiglio [Fri, 4 Jul 2014 09:24:06 +0000 (11:24 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Fri, 4 Jul 2014 09:23:17 +0000 (11:23 +0200)]
btn style
Jordan Augé [Fri, 4 Jul 2014 09:09:46 +0000 (11:09 +0200)]
major updates to slice reservation page and plugins
Yasin [Thu, 3 Jul 2014 17:11:37 +0000 (19:11 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Thu, 3 Jul 2014 17:11:22 +0000 (19:11 +0200)]
fix: hide management section
Yasin [Thu, 3 Jul 2014 17:08:15 +0000 (19:08 +0200)]
fix: hide management section for non pi users
Ciro Scognamiglio [Thu, 3 Jul 2014 17:04:21 +0000 (19:04 +0200)]
news
Ciro Scognamiglio [Thu, 3 Jul 2014 16:59:07 +0000 (18:59 +0200)]
style changes
Ciro Scognamiglio [Thu, 3 Jul 2014 15:58:50 +0000 (17:58 +0200)]
management
Ciro Scognamiglio [Thu, 3 Jul 2014 15:57:25 +0000 (17:57 +0200)]
moved requests to management
Ciro Scognamiglio [Thu, 3 Jul 2014 15:54:59 +0000 (17:54 +0200)]
moved requests to management
Yasin [Thu, 3 Jul 2014 12:44:31 +0000 (14:44 +0200)]
slicereq: hide authority_hrn for normal user
Yasin [Thu, 3 Jul 2014 10:10:05 +0000 (12:10 +0200)]
slicereq: update template
Yasin [Thu, 3 Jul 2014 09:42:25 +0000 (11:42 +0200)]
slicereuqest: template updated
Yasin [Wed, 2 Jul 2014 15:09:54 +0000 (17:09 +0200)]
Templates: minor updates
Yasin [Tue, 1 Jul 2014 12:43:46 +0000 (14:43 +0200)]
Fix topmenu for pis
Yasin [Tue, 1 Jul 2014 12:10:52 +0000 (14:10 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 1 Jul 2014 12:10:45 +0000 (14:10 +0200)]
Topmeny fix for pi
Ciro Scognamiglio [Tue, 1 Jul 2014 11:43:02 +0000 (13:43 +0200)]
fixed slice list menu
Yasin [Tue, 1 Jul 2014 10:21:53 +0000 (12:21 +0200)]
fix: topmenu for pi and non pi
Yasin [Tue, 1 Jul 2014 10:09:11 +0000 (12:09 +0200)]
Pi check in each view to make the topmenu show correctly
Ciro Scognamiglio [Tue, 1 Jul 2014 09:30:36 +0000 (11:30 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Tue, 1 Jul 2014 09:30:14 +0000 (11:30 +0200)]
fixed tab switch issue when leaving the resources view
Jordan Augé [Tue, 1 Jul 2014 08:12:40 +0000 (10:12 +0200)]
Revised version of the resource page + related plugins
Yasin [Mon, 30 Jun 2014 14:56:24 +0000 (16:56 +0200)]
Opening changes
Yasin [Mon, 30 Jun 2014 13:54:17 +0000 (15:54 +0200)]
Onelab opening last minute changes
Ciro Scognamiglio [Mon, 30 Jun 2014 13:16:32 +0000 (15:16 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Mon, 30 Jun 2014 13:13:52 +0000 (15:13 +0200)]
fixed slice list
Yasin [Mon, 30 Jun 2014 11:08:09 +0000 (13:08 +0200)]
Opening changes
Yasin [Thu, 26 Jun 2014 15:15:25 +0000 (17:15 +0200)]
Email to PI updated
Yasin [Thu, 26 Jun 2014 14:19:16 +0000 (16:19 +0200)]
Support: removed dummy table
Yasin [Thu, 26 Jun 2014 14:03:37 +0000 (16:03 +0200)]
update template
Yasin [Thu, 26 Jun 2014 13:55:55 +0000 (15:55 +0200)]
signup email message
Yasin [Thu, 26 Jun 2014 13:42:18 +0000 (15:42 +0200)]
user-sign up: update email template
Yasin [Thu, 26 Jun 2014 13:30:28 +0000 (15:30 +0200)]
User signup- templates updated
Yasin [Thu, 26 Jun 2014 10:45:26 +0000 (12:45 +0200)]
tooltip-registration improved
Yasin [Thu, 26 Jun 2014 10:09:16 +0000 (12:09 +0200)]
Qitp- added
Yasin [Tue, 24 Jun 2014 13:56:40 +0000 (15:56 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 24 Jun 2014 13:56:26 +0000 (15:56 +0200)]
Terms&cond: url available /portal/terms
Thierry Parmentelat [Tue, 24 Jun 2014 08:35:44 +0000 (10:35 +0200)]
an attempt to fix packaging with a fonts/ hierarchy
Jordan Augé [Thu, 19 Jun 2014 13:31:32 +0000 (15:31 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Jordan Augé [Thu, 19 Jun 2014 13:31:13 +0000 (15:31 +0200)]
renamed views.py in views/__init__.py
Jordan Augé [Thu, 19 Jun 2014 13:28:58 +0000 (15:28 +0200)]
improved the resource tab
Joaquín Iranzo [Thu, 19 Jun 2014 09:56:53 +0000 (11:56 +0200)]
New service Openstack-cloud-on-demand
Yasin [Wed, 18 Jun 2014 15:29:47 +0000 (17:29 +0200)]
f4f-css
Yasin [Wed, 18 Jun 2014 14:04:50 +0000 (16:04 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Wed, 18 Jun 2014 14:04:38 +0000 (16:04 +0200)]
f4f changes
Loic Baron [Wed, 18 Jun 2014 13:43:48 +0000 (08:43 -0500)]
Account: PKCS12 generated in the user account page
Yasin [Wed, 18 Jun 2014 13:08:53 +0000 (08:08 -0500)]
f4f changes
Loic Baron [Wed, 18 Jun 2014 13:05:07 +0000 (08:05 -0500)]
f4f css
javier [Wed, 18 Jun 2014 10:48:42 +0000 (12:48 +0200)]
Fixed SLA dialog duplicated information
javier [Wed, 18 Jun 2014 09:05:22 +0000 (11:05 +0200)]
SLA plugin updated: disable dialog for non iMinds resources
Loic Baron [Tue, 17 Jun 2014 22:29:00 +0000 (17:29 -0500)]
Account: oups, template fixed width
Loic Baron [Tue, 17 Jun 2014 22:24:31 +0000 (17:24 -0500)]
Account: Download user PEM Certificate
javier [Tue, 17 Jun 2014 16:35:13 +0000 (18:35 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
javier [Tue, 17 Jun 2014 16:33:59 +0000 (18:33 +0200)]
SLA code updated and new image for SmartSantander Application Service added
Yasin [Tue, 17 Jun 2014 13:52:40 +0000 (15:52 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 17 Jun 2014 13:51:22 +0000 (15:51 +0200)]
README: added dependency
Loic Baron [Tue, 17 Jun 2014 13:08:35 +0000 (08:08 -0500)]
Layout for Fed4Fire
Loic Baron [Tue, 17 Jun 2014 13:07:18 +0000 (08:07 -0500)]
List of testbeds based on the resources all_query
Loic Baron [Tue, 17 Jun 2014 12:09:58 +0000 (07:09 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Tue, 17 Jun 2014 12:09:54 +0000 (07:09 -0500)]
fed4fire css change
javier [Tue, 17 Jun 2014 10:36:44 +0000 (12:36 +0200)]
- Modified some SLA texts
- Added img resources for Service Directory
- Added print information to console to detect bad json parsing error
javier [Mon, 16 Jun 2014 16:47:48 +0000 (18:47 +0200)]
SLA update to see if it fixes something
javier [Mon, 16 Jun 2014 15:57:00 +0000 (17:57 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
javier [Mon, 16 Jun 2014 15:55:03 +0000 (17:55 +0200)]
SLA plugin updated
Loic Baron [Mon, 16 Jun 2014 15:47:46 +0000 (10:47 -0500)]
html fix
Loic Baron [Mon, 16 Jun 2014 15:45:18 +0000 (10:45 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Mon, 16 Jun 2014 15:45:15 +0000 (10:45 -0500)]
html fix
Yasin [Mon, 16 Jun 2014 15:42:57 +0000 (17:42 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Mon, 16 Jun 2014 15:42:18 +0000 (17:42 +0200)]
Fed4fire review changes
javier [Mon, 16 Jun 2014 10:15:04 +0000 (12:15 +0200)]
Updated service directory server url
javier [Mon, 16 Jun 2014 09:23:56 +0000 (11:23 +0200)]
Manifold folder removed from inside myslice, should not be located there
javier [Mon, 16 Jun 2014 08:17:06 +0000 (10:17 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Conflicts:
plugins/queryupdater/static/js/queryupdater.js
portal/sliceresourceview.py
portal/templates/fed4fire/fed4fire_widget-slice-sections.html
jgarcia - Commit after merging HEAD files and SLA & Service Directory code
javier [Mon, 16 Jun 2014 08:03:06 +0000 (10:03 +0200)]
SLA and Service Directory code added
Yasin [Thu, 12 Jun 2014 18:41:52 +0000 (20:41 +0200)]
fed4fire review changes
Yasin [Wed, 11 Jun 2014 17:06:18 +0000 (19:06 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Wed, 11 Jun 2014 17:06:15 +0000 (19:06 +0200)]
fed4fire: changes for the review
Yasin [Wed, 11 Jun 2014 15:18:04 +0000 (10:18 -0500)]
jfed: added the js locally
Yasin [Tue, 10 Jun 2014 16:37:03 +0000 (11:37 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 10 Jun 2014 16:36:56 +0000 (18:36 +0200)]
jfed: js added
Yasin [Tue, 10 Jun 2014 16:23:08 +0000 (11:23 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 10 Jun 2014 16:23:00 +0000 (18:23 +0200)]
jfed: help text added
Yasin [Tue, 10 Jun 2014 16:07:43 +0000 (11:07 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 10 Jun 2014 16:07:19 +0000 (18:07 +0200)]
jfed quick start added
Yasin [Fri, 6 Jun 2014 15:46:11 +0000 (10:46 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Fri, 6 Jun 2014 15:40:55 +0000 (17:40 +0200)]
F4f Review changes
git://git.onelab.eu / myslice.git / log