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
Yasin [Fri, 6 Jun 2014 10:16:51 +0000 (12:16 +0200)]
account: template specific for fed4fire
Yasin [Thu, 5 Jun 2014 13:52:54 +0000 (08:52 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Thu, 5 Jun 2014 13:52:48 +0000 (15:52 +0200)]
typo
Yasin [Thu, 5 Jun 2014 13:46:31 +0000 (08:46 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Thu, 5 Jun 2014 13:46:25 +0000 (15:46 +0200)]
typo
Yasin [Thu, 5 Jun 2014 13:43:24 +0000 (08:43 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Thu, 5 Jun 2014 13:42:49 +0000 (15:42 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Thu, 5 Jun 2014 13:42:38 +0000 (15:42 +0200)]
F4f: jfed identity dl button added
Loic Baron [Thu, 5 Jun 2014 13:09:54 +0000 (15:09 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Thu, 5 Jun 2014 12:54:28 +0000 (14:54 +0200)]
Templates: small cosmetic changes, wip for filter on authorities for users in a slice
Loic Baron [Thu, 5 Jun 2014 12:52:59 +0000 (14:52 +0200)]
Rest: query get with platform prefix in the Query, Example ple:resource
Loic Baron [Thu, 5 Jun 2014 12:51:56 +0000 (14:51 +0200)]
slice resource view: Reserved resources and Leases in SimpleList plugins
Loic Baron [Thu, 5 Jun 2014 12:50:33 +0000 (14:50 +0200)]
queryupdater: pending resources and leases, make it work with the scheduler and leases
Loic Baron [Thu, 5 Jun 2014 12:49:16 +0000 (14:49 +0200)]
manifoldapi: handle multiple keys
Ciro Scognamiglio [Thu, 5 Jun 2014 12:37:56 +0000 (14:37 +0200)]
fixed menu order
Ciro Scognamiglio [Thu, 5 Jun 2014 10:46:53 +0000 (12:46 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Thu, 5 Jun 2014 10:46:46 +0000 (12:46 +0200)]
new style
Yasin [Thu, 5 Jun 2014 10:24:10 +0000 (12:24 +0200)]
forms.py modified for contact form
Yasin [Thu, 5 Jun 2014 10:22:38 +0000 (12:22 +0200)]
contact: updated
Yasin [Thu, 5 Jun 2014 09:40:08 +0000 (11:40 +0200)]
reg: css temp fix
Yasin [Thu, 5 Jun 2014 09:32:41 +0000 (11:32 +0200)]
Reg_complete template update
Yasin [Wed, 4 Jun 2014 22:03:58 +0000 (17:03 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Wed, 4 Jun 2014 18:08:39 +0000 (20:08 +0200)]
new landing page
Yasin [Wed, 4 Jun 2014 16:20:14 +0000 (11:20 -0500)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Wed, 4 Jun 2014 16:20:07 +0000 (11:20 -0500)]
disregard
Yasin [Wed, 4 Jun 2014 15:58:11 +0000 (17:58 +0200)]
joinview: design issues
Yasin [Wed, 4 Jun 2014 15:56:45 +0000 (17:56 +0200)]
Regform: design issues
Yasin [Wed, 4 Jun 2014 15:22:43 +0000 (17:22 +0200)]
email_activation: fix hash
Yasin [Tue, 3 Jun 2014 16:50:42 +0000 (18:50 +0200)]
joinview: partially fixed
Yasin [Tue, 3 Jun 2014 15:20:00 +0000 (17:20 +0200)]
fix: css
Yasin [Tue, 3 Jun 2014 14:25:38 +0000 (16:25 +0200)]
Regform+joinform: redesigned css
Yasin [Mon, 2 Jun 2014 13:40:29 +0000 (15:40 +0200)]
Join: template redesigned
Yasin [Wed, 28 May 2014 16:31:27 +0000 (18:31 +0200)]
regform: terms&con added
Yasin [Wed, 28 May 2014 15:31:50 +0000 (17:31 +0200)]
regform: fix- checkbox required
Yasin [Wed, 28 May 2014 15:23:12 +0000 (17:23 +0200)]
Registration Form: redesigned!
Yasin [Tue, 27 May 2014 14:23:30 +0000 (09:23 -0500)]
f4f template
Yasin [Tue, 27 May 2014 14:21:10 +0000 (09:21 -0500)]
Email activation: template for fed4fire added
Yasin [Tue, 27 May 2014 13:57:02 +0000 (08:57 -0500)]
js files: renamed to https://
Jordan Augé [Tue, 27 May 2014 13:51:07 +0000 (08:51 -0500)]
apache: apache config file fixed to run on apache server
Chrysostomos Kolovos [Tue, 20 May 2014 10:25:06 +0000 (13:25 +0300)]
Chrysostomos for scheduler
Chrysostomos Kolovos [Tue, 20 May 2014 10:03:11 +0000 (13:03 +0300)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Chrysostomos Kolovos [Tue, 20 May 2014 10:02:31 +0000 (13:02 +0300)]
Chrysostomos for scheduler
Loic Baron [Tue, 20 May 2014 08:51:38 +0000 (10:51 +0200)]
Bug fix: if no local storage, this.user = false
Loic Baron [Mon, 19 May 2014 09:48:57 +0000 (11:48 +0200)]
Institution: message when update succeed or fails using rest
Loic Baron [Mon, 19 May 2014 09:48:07 +0000 (11:48 +0200)]
slice resource view: pending changes, queryupdater plugin, not toggable
Loic Baron [Mon, 19 May 2014 09:47:07 +0000 (11:47 +0200)]
slice info tab: removed number of nodes, as it makes sens only for PLE
Loic Baron [Fri, 16 May 2014 09:13:23 +0000 (11:13 +0200)]
Pending changes: number of pendings calculated in the queryupdater plugin, not anymore in datatables in order to take into account the leases published by the scheduler, or any other plugin
Loic Baron [Thu, 15 May 2014 16:27:28 +0000 (18:27 +0200)]
Scheduler2 plugin: Queries handled by the plugin = query (resource in slice), query_lease (lease in slice), query_all_resources, query_all_leases
Loic Baron [Wed, 14 May 2014 13:54:28 +0000 (15:54 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Wed, 14 May 2014 13:49:25 +0000 (15:49 +0200)]
Scheduler plugin: changing date add filters x>date x<date+1day - ToDo: on_lease_filter_added adapt the display of leases based on the filters
Yasin [Tue, 13 May 2014 15:18:57 +0000 (17:18 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 13 May 2014 15:18:54 +0000 (17:18 +0200)]
About: updated description
Frederic Francois [Tue, 13 May 2014 14:54:24 +0000 (16:54 +0200)]
OpenFlow plugin - Univ Bristol - f.francois
Loic Baron [Tue, 6 May 2014 16:42:31 +0000 (18:42 +0200)]
institution: create/request slice is loaded after the rest query
Loic Baron [Tue, 6 May 2014 16:27:31 +0000 (18:27 +0200)]
Add/remove users from slice - message with timer
Loic Baron [Tue, 6 May 2014 16:20:16 +0000 (18:20 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Tue, 6 May 2014 16:20:05 +0000 (18:20 +0200)]
mysliceMessage() js function can be used to display a message
Loic Baron [Tue, 6 May 2014 16:19:55 +0000 (18:19 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Tue, 6 May 2014 16:19:52 +0000 (18:19 +0200)]
mysliceMessage() js function can be used to display a message
Loic Baron [Tue, 6 May 2014 16:18:14 +0000 (18:18 +0200)]
rest typo in error message for delete
Loic Baron [Tue, 6 May 2014 16:17:15 +0000 (18:17 +0200)]
Message if success or failure on rest/update slice with list of users
Ciro Scognamiglio [Tue, 6 May 2014 16:12:54 +0000 (18:12 +0200)]
mysliceMessage() js function can be used to display a message
Ciro Scognamiglio [Tue, 6 May 2014 15:53:56 +0000 (17:53 +0200)]
mysliceMessage() js function can be used to display a message
Ciro Scognamiglio [Tue, 6 May 2014 15:52:27 +0000 (17:52 +0200)]
mysliceMessage() js function can be used to display a message
Ciro Scognamiglio [Tue, 6 May 2014 15:40:52 +0000 (17:40 +0200)]
mysliceMessage() js function can be used to display a message
git://git.onelab.eu / unfold.git / log