myslice.git
9 years agomgt/slice tab: show only the first user (TO BE MODIFIED)
Rezende & Pedro & Carlos & Raphael [Fri, 3 Oct 2014 20:49:22 +0000 (17:49 -0300)]
mgt/slice tab: show only the first user (TO BE MODIFIED)

9 years agoMerge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
Rezende & Pedro & Carlos & Raphael [Fri, 3 Oct 2014 20:19:32 +0000 (17:19 -0300)]
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

9 years agoPI only sees slices/users of your own institution
Rezende & Pedro & Carlos & Raphael [Fri, 3 Oct 2014 20:10:32 +0000 (17:10 -0300)]
PI only sees slices/users of your own institution
columns inverted in the Mgt/User tab
adding username in the resource tab

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
Pedro, Carlos and Rezende [Fri, 3 Oct 2014 19:51:36 +0000 (16:51 -0300)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
manifoldapi/manifoldproxy.py
manifoldapi/static/js/manifold.js
myslice/urls.py
portal/actions.py
portal/emailactivationview.py
portal/homeview.py
portal/managementtabrequests.py
portal/registrationview.py
portal/sliceresourceview.py
portal/templates/email_activation.html
portal/templates/management-tab-requests.html
portal/templates/registration_view.html
portal/templates/slice-resource-view.html

9 years agoFibre portal modifications by José
Loic Baron [Wed, 1 Oct 2014 11:29:37 +0000 (08:29 -0300)]
Fibre portal modifications by José

9 years agoindentation small fix
Loic Baron [Wed, 1 Oct 2014 11:25:37 +0000 (13:25 +0200)]
indentation small fix

9 years agoIntegration of Ofelia OCF Plugin
Loic Baron [Wed, 1 Oct 2014 10:01:00 +0000 (12:01 +0200)]
Integration of Ofelia OCF Plugin

9 years agoPlugin UnivBristol by Frederic Francois
Loic Baron [Wed, 1 Oct 2014 09:59:21 +0000 (11:59 +0200)]
Plugin UnivBristol by Frederic Francois

9 years agofantaastic template
Ciro Scognamiglio [Mon, 29 Sep 2014 19:14:45 +0000 (21:14 +0200)]
fantaastic template

9 years agot
Ciro Scognamiglio [Mon, 29 Sep 2014 12:53:03 +0000 (14:53 +0200)]
t

9 years agoslice request template
Ciro Scognamiglio [Mon, 29 Sep 2014 12:36:50 +0000 (14:36 +0200)]
slice request template

9 years agofmall fix on bg
Ciro Scognamiglio [Mon, 29 Sep 2014 09:54:35 +0000 (11:54 +0200)]
fmall fix on bg

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Mon, 29 Sep 2014 09:53:31 +0000 (11:53 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agoactivity on slice
Ciro Scognamiglio [Mon, 29 Sep 2014 09:51:15 +0000 (11:51 +0200)]
activity on slice

9 years agothe fantaastic theme
Ciro Scognamiglio [Mon, 29 Sep 2014 09:48:26 +0000 (11:48 +0200)]
the fantaastic theme

9 years agoiotlab create user works only for onelab theme
Yasin [Thu, 25 Sep 2014 15:31:25 +0000 (17:31 +0200)]
iotlab create user works only for onelab theme

9 years agocreate iotlab user on validation
Yasin [Thu, 25 Sep 2014 15:20:05 +0000 (17:20 +0200)]
create iotlab user on validation

9 years agohomeview: pi check- initialised variables
Yasin [Wed, 24 Sep 2014 15:10:49 +0000 (17:10 +0200)]
homeview: pi check- initialised variables

9 years agojoin_view: terms and condition line added
Yasin [Wed, 24 Sep 2014 09:48:06 +0000 (11:48 +0200)]
join_view: terms and condition line added

9 years agoupdating pkey in the case of logging thru LDAP
Rezende & Pedro & Carlos & Raphael [Thu, 18 Sep 2014 23:08:02 +0000 (20:08 -0300)]
updating pkey in the case of logging thru LDAP

9 years agoMerge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
Rezende & Pedro & Carlos & Raphael [Thu, 18 Sep 2014 21:19:26 +0000 (18:19 -0300)]
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

9 years ago- reasons for applying
Rezende & Pedro & Carlos & Raphael [Thu, 18 Sep 2014 21:17:34 +0000 (18:17 -0300)]
- reasons for applying
- authorities in validation request

9 years agoNoCreds: Warning Msg visible in Dashboard
Yasin [Thu, 18 Sep 2014 14:30:44 +0000 (16:30 +0200)]
NoCreds: Warning Msg visible in Dashboard

9 years agomanual delegation link updated
Yasin [Wed, 17 Sep 2014 14:30:08 +0000 (16:30 +0200)]
manual delegation link updated

9 years agoreplaced support@myslice.info with support@onelab.eu
Yasin [Wed, 17 Sep 2014 14:26:08 +0000 (16:26 +0200)]
replaced support@myslice.info with support@onelab.eu

9 years agoMerge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
Bruno Soares da Silva [Tue, 16 Sep 2014 21:47:39 +0000 (18:47 -0300)]
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/actions.py
portal/lsapiclient.py

9 years ago- Added support to send the user public key to the LaboraScheduler API on user regist...
Bruno Soares da Silva [Tue, 16 Sep 2014 21:39:52 +0000 (18:39 -0300)]
- Added support to send the user public key to the LaboraScheduler API on user registration.
- Added parameter "created_by" with default value "myslice" from user registration in Labora Scheduler API.

9 years agoLDAP integration
Loic Baron [Tue, 16 Sep 2014 21:06:55 +0000 (18:06 -0300)]
LDAP integration
adding authorities

9 years agomanual_delegation: commands updated
Yasin [Tue, 16 Sep 2014 14:08:58 +0000 (16:08 +0200)]
manual_delegation: commands updated

9 years agomanual delegation doc added to the portal
Yasin [Tue, 16 Sep 2014 13:46:27 +0000 (15:46 +0200)]
manual delegation doc added to the portal

9 years agostyle fix
Ciro Scognamiglio [Mon, 15 Sep 2014 16:31:55 +0000 (18:31 +0200)]
style fix

9 years agostyle fix
Ciro Scognamiglio [Mon, 15 Sep 2014 16:31:07 +0000 (18:31 +0200)]
style fix

9 years agostyle fix
Ciro Scognamiglio [Mon, 15 Sep 2014 16:27:46 +0000 (18:27 +0200)]
style fix

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 16:24:14 +0000 (18:24 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 16:22:12 +0000 (18:22 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 16:19:48 +0000 (18:19 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 16:15:10 +0000 (18:15 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 16:09:16 +0000 (18:09 +0200)]
management requests table reorganization

9 years agobugfix
Ciro Scognamiglio [Mon, 15 Sep 2014 16:06:55 +0000 (18:06 +0200)]
bugfix

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 16:04:27 +0000 (18:04 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:59:10 +0000 (17:59 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:58:03 +0000 (17:58 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:54:41 +0000 (17:54 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:53:20 +0000 (17:53 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:51:22 +0000 (17:51 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:43:06 +0000 (17:43 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:33:05 +0000 (17:33 +0200)]
management requests table reorganization

9 years agomanagement requests table reorganization
Ciro Scognamiglio [Mon, 15 Sep 2014 15:22:47 +0000 (17:22 +0200)]
management requests table reorganization

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Mon, 15 Sep 2014 14:43:12 +0000 (16:43 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agomerge
Ciro Scognamiglio [Mon, 15 Sep 2014 14:43:00 +0000 (16:43 +0200)]
merge

9 years agofix: onelab logo in html templates
Yasin [Fri, 12 Sep 2014 15:49:21 +0000 (17:49 +0200)]
fix: onelab logo in html templates

9 years agoOnelab logo fixed in all email templates
Yasin [Fri, 12 Sep 2014 15:35:56 +0000 (17:35 +0200)]
Onelab logo fixed in all email templates

9 years ago- adding and authenticating users to/through LDAP
Rezende & Pedro & Carlos & Raphael [Thu, 11 Sep 2014 20:05:20 +0000 (17:05 -0300)]
- adding and authenticating users to/through LDAP
- reasons for applying
- emails to PIs and user signed-up
- PIs only validates users from the authority

9 years agoNo creds: updated text
Yasin [Thu, 4 Sep 2014 13:32:18 +0000 (15:32 +0200)]
No creds: updated text

9 years agoCreate slice: clears local storage now
Yasin [Thu, 4 Sep 2014 09:43:27 +0000 (11:43 +0200)]
Create slice: clears local storage now

9 years agoNo Credentials: warning message added for all cases (manual+auto delegation)
Yasin [Wed, 3 Sep 2014 15:18:31 +0000 (17:18 +0200)]
No Credentials: warning message added for all cases (manual+auto delegation)

9 years agosmall fixes
Ciro Scognamiglio [Tue, 2 Sep 2014 10:12:18 +0000 (12:12 +0200)]
small fixes

9 years agoMerge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
Rezende & Pedro & Carlos & Raphael [Mon, 1 Sep 2014 20:08:40 +0000 (17:08 -0300)]
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/registrationview.py

9 years ago- reasons for asking an account; rnp as a catch-all island; changing email messages...
Rezende & Pedro & Carlos & Raphael [Mon, 1 Sep 2014 20:01:00 +0000 (17:01 -0300)]
- reasons for asking an account; rnp as a catch-all island; changing email messages. etc.

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Mon, 1 Sep 2014 16:59:31 +0000 (18:59 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agoManage Institution page: improved display and quick loading using explicit fields...
Loic Baron [Mon, 1 Sep 2014 16:58:12 +0000 (18:58 +0200)]
Manage Institution page: improved display and quick loading using explicit fields in the Queries, fields myplc VS fields Registry Only

9 years agoauthority req rejected email added
Yasin [Mon, 1 Sep 2014 13:53:58 +0000 (15:53 +0200)]
authority req rejected email added

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Mon, 1 Sep 2014 12:32:30 +0000 (14:32 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years ago-> Sending missing files from last commit.
Bruno Soares da Silva [Fri, 29 Aug 2014 20:23:00 +0000 (17:23 -0300)]
-> Sending missing files from last commit.

9 years ago-> Removed registration based on LDAP.
Bruno Soares da Silva [Fri, 29 Aug 2014 20:19:49 +0000 (17:19 -0300)]
-> Removed registration based on LDAP.
-> Added registration based on Labora Scheduler API.

9 years agoadd authority email: bug fix. email working now
Yasin [Fri, 29 Aug 2014 15:44:06 +0000 (17:44 +0200)]
add authority email: bug fix. email working now

9 years agoslice-req-denied email added
Yasin [Fri, 29 Aug 2014 14:57:22 +0000 (16:57 +0200)]
slice-req-denied email added

9 years agoslice req validate email: updated template and text
Yasin [Fri, 29 Aug 2014 13:23:16 +0000 (15:23 +0200)]
slice req validate email: updated template and text

9 years agofix:OneLab Logo url
Yasin [Fri, 29 Aug 2014 10:39:47 +0000 (12:39 +0200)]
fix:OneLab Logo url

9 years agoreject user req email: added dynamic template based on themes
Yasin [Fri, 29 Aug 2014 10:25:27 +0000 (12:25 +0200)]
reject user req email: added dynamic template based on themes

9 years agoUser validated email: updated as timur suggested
Yasin [Fri, 29 Aug 2014 09:52:08 +0000 (11:52 +0200)]
User validated email: updated as timur suggested

9 years agoslicereq pi: confirmation page updated as timur suggested
Yasin [Thu, 28 Aug 2014 15:14:52 +0000 (17:14 +0200)]
slicereq pi: confirmation page updated as timur suggested

9 years agoSlicereq email: text updated as timur suggested
Yasin [Thu, 28 Aug 2014 14:40:03 +0000 (16:40 +0200)]
Slicereq email: text updated as timur suggested

9 years agoHomeview Session expired
Loic Baron [Thu, 28 Aug 2014 14:24:34 +0000 (16:24 +0200)]
Homeview Session expired

9 years agoreject req email: text updated
Yasin [Thu, 28 Aug 2014 13:40:13 +0000 (15:40 +0200)]
reject req email: text updated

9 years agoreject user req: email portal url added
Yasin [Thu, 28 Aug 2014 13:19:00 +0000 (15:19 +0200)]
reject user req: email portal url added

9 years agofix: registration:getting jquery validate js to work again
Yasin [Thu, 28 Aug 2014 09:38:52 +0000 (11:38 +0200)]
fix: registration:getting  jquery validate js to work again

9 years agorequests: reject user- delete from django pendinguser, auth_user + delete manifold...
Yasin [Wed, 27 Aug 2014 14:33:12 +0000 (16:33 +0200)]
requests: reject user- delete from django pendinguser, auth_user + delete manifold user&account + send reject email

9 years agorequests: reject success msg updated
Yasin [Wed, 27 Aug 2014 10:18:59 +0000 (12:18 +0200)]
requests: reject success msg updated

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 26 Aug 2014 14:18:48 +0000 (16:18 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agorequests: reject button added & functional (todo: send email)
Yasin [Tue, 26 Aug 2014 14:18:19 +0000 (16:18 +0200)]
requests: reject button added & functional (todo: send email)

9 years agochanged font spacing
Ciro Scognamiglio [Tue, 26 Aug 2014 09:39:16 +0000 (11:39 +0200)]
changed font spacing

9 years agouser activity on slice creation
Ciro Scognamiglio [Thu, 21 Aug 2014 16:40:10 +0000 (18:40 +0200)]
user activity on slice creation

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Thu, 21 Aug 2014 16:32:40 +0000 (18:32 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agouser activity on slice creation
Ciro Scognamiglio [Thu, 21 Aug 2014 16:32:36 +0000 (18:32 +0200)]
user activity on slice creation

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Thierry Parmentelat [Thu, 21 Aug 2014 16:31:36 +0000 (18:31 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agoI had no idea I had git added this file, but well
Thierry Parmentelat [Thu, 21 Aug 2014 16:30:13 +0000 (18:30 +0200)]
I had no idea I had git added this file, but well

9 years agoFix: delete pending after automatic validation for PLE enabled user myslice-1.0
Loic Baron [Tue, 19 Aug 2014 12:53:02 +0000 (14:53 +0200)]
Fix: delete pending after automatic validation for PLE enabled user

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Tue, 19 Aug 2014 09:55:48 +0000 (11:55 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agoRT 81 - If the user has registered a new authority, we don't validate automatically...
Loic Baron [Tue, 19 Aug 2014 09:53:12 +0000 (11:53 +0200)]
RT 81 - If the user has registered a new authority, we don't validate automatically because the authority doesn't exist yet. This has to be a manual approval, for example checking in PLE website if the person is a PI from PLC

9 years agodisabled monitoring and stats
Loic Baron [Tue, 19 Aug 2014 09:31:52 +0000 (11:31 +0200)]
disabled monitoring and stats

9 years agoRT 82: fixed contact form allows punctuation and special caracters
Loic Baron [Tue, 19 Aug 2014 08:43:02 +0000 (10:43 +0200)]
RT 82: fixed contact form allows punctuation and special caracters

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Tue, 19 Aug 2014 08:20:12 +0000 (10:20 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agoFix: Activation email if user is in PLE - RT 81
Loic Baron [Tue, 19 Aug 2014 08:17:08 +0000 (10:17 +0200)]
Fix: Activation email if user is in PLE - RT 81

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Mon, 18 Aug 2014 20:56:01 +0000 (22:56 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agomoved public website link to the production url
Ciro Scognamiglio [Mon, 18 Aug 2014 20:55:03 +0000 (22:55 +0200)]
moved public website link to the production url

9 years agofixed small bug when handling exception
Ciro Scognamiglio [Mon, 18 Aug 2014 20:54:26 +0000 (22:54 +0200)]
fixed small bug when handling exception

9 years agoQuick fix to create slices with empty extra fields
Loic Baron [Mon, 18 Aug 2014 20:01:09 +0000 (22:01 +0200)]
Quick fix to create slices with empty extra fields

9 years agoMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Mon, 18 Aug 2014 19:29:54 +0000 (21:29 +0200)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

9 years agoAllow to display authority_hrn if we don't have the name
Loic Baron [Mon, 18 Aug 2014 19:29:06 +0000 (21:29 +0200)]
Allow to display authority_hrn if we don't have the name