Ciro Scognamiglio [Wed, 26 Feb 2014 18:30:43 +0000 (19:30 +0100)]
rest parameters can be sent also with a get
Ciro Scognamiglio [Wed, 26 Feb 2014 17:35:56 +0000 (18:35 +0100)]
resolved rest conflicts
Ciro Scognamiglio [Wed, 26 Feb 2014 17:34:28 +0000 (18:34 +0100)]
filters and columns can be passed to the rest api
Jordan Augé [Wed, 26 Feb 2014 17:29:18 +0000 (18:29 +0100)]
Fixed case if a user has an account with an empty config field
Jordan Augé [Wed, 26 Feb 2014 16:51:48 +0000 (17:51 +0100)]
forgot filter in slice method during merge
Jordan Augé [Wed, 26 Feb 2014 16:28:39 +0000 (17:28 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Conflicts:
rest/__init__.py
Jordan Augé [Wed, 26 Feb 2014 16:27:20 +0000 (17:27 +0100)]
Instituiton - list of slices - ple.upmc hardcoded
Ciro Scognamiglio [Wed, 26 Feb 2014 16:24:11 +0000 (17:24 +0100)]
fixed rest datetime encoding
Loic Baron [Wed, 26 Feb 2014 15:04:51 +0000 (16:04 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Wed, 26 Feb 2014 15:04:26 +0000 (16:04 +0100)]
import datetime
Ciro Scognamiglio [Wed, 26 Feb 2014 15:03:28 +0000 (16:03 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Wed, 26 Feb 2014 15:03:21 +0000 (16:03 +0100)]
fixed datetime json encoding
Loic Baron [Wed, 26 Feb 2014 14:33:46 +0000 (15:33 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Wed, 26 Feb 2014 14:33:15 +0000 (15:33 +0100)]
REST filter slices on parent_authority for testing
Yasin [Wed, 26 Feb 2014 14:05:59 +0000 (15:05 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Wed, 26 Feb 2014 14:05:48 +0000 (15:05 +0100)]
Fix: typo
Ciro Scognamiglio [Wed, 26 Feb 2014 14:00:41 +0000 (15:00 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Wed, 26 Feb 2014 14:00:31 +0000 (15:00 +0100)]
testbed icon small
Ciro Scognamiglio [Wed, 26 Feb 2014 14:00:14 +0000 (15:00 +0100)]
json serialization handles datetime and decimal numbers
Ciro Scognamiglio [Wed, 26 Feb 2014 13:52:15 +0000 (14:52 +0100)]
added themeview
Yasin [Wed, 26 Feb 2014 13:47:55 +0000 (14:47 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Wed, 26 Feb 2014 13:47:52 +0000 (14:47 +0100)]
MyACC: limited functionalities for disabled/validate pending users
Loic Baron [Wed, 26 Feb 2014 10:14:08 +0000 (11:14 +0100)]
Clean by Remove /usr/share/unfold/ each time you run python setup.py install
Loic Baron [Tue, 25 Feb 2014 21:16:33 +0000 (22:16 +0100)]
Migrate from manifold to manifoldapi
Ciro Scognamiglio [Tue, 25 Feb 2014 18:24:12 +0000 (19:24 +0100)]
testbed list view updated style
Ciro Scognamiglio [Tue, 25 Feb 2014 18:11:32 +0000 (19:11 +0100)]
testbed list view
Ciro Scognamiglio [Tue, 25 Feb 2014 18:11:05 +0000 (19:11 +0100)]
datatables and myslice ajax js
Ciro Scognamiglio [Tue, 25 Feb 2014 18:10:31 +0000 (19:10 +0100)]
css changes
Ciro Scognamiglio [Tue, 25 Feb 2014 18:10:07 +0000 (19:10 +0100)]
moved old sliceview
Ciro Scognamiglio [Tue, 25 Feb 2014 18:09:46 +0000 (19:09 +0100)]
added rest and new views urls
Ciro Scognamiglio [Tue, 25 Feb 2014 18:09:04 +0000 (19:09 +0100)]
rest interface: table format
Ciro Scognamiglio [Tue, 25 Feb 2014 18:08:22 +0000 (19:08 +0100)]
rest testbeds, slices, users
Ciro Scognamiglio [Tue, 25 Feb 2014 18:06:48 +0000 (19:06 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Tue, 25 Feb 2014 18:06:46 +0000 (19:06 +0100)]
added rest application
Ciro Scognamiglio [Tue, 25 Feb 2014 18:05:50 +0000 (19:05 +0100)]
moved old sliceview, new sliceview in place
Loic Baron [Tue, 25 Feb 2014 18:00:35 +0000 (19:00 +0100)]
updated import for manifoldapi instead of manifold
Yasin [Tue, 25 Feb 2014 17:49:07 +0000 (18:49 +0100)]
Issue- 11 Fixed
Yasin [Tue, 25 Feb 2014 16:14:43 +0000 (17:14 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Tue, 25 Feb 2014 16:14:09 +0000 (17:14 +0100)]
Fix: if authrity_get_email is None, it returns support@myslice.info
Yasin [Tue, 25 Feb 2014 16:09:46 +0000 (17:09 +0100)]
get_pi_email: if none it returns support@myslice.info
Ciro Scognamiglio [Tue, 25 Feb 2014 16:05:19 +0000 (17:05 +0100)]
merged changes
Ciro Scognamiglio [Tue, 25 Feb 2014 16:01:25 +0000 (17:01 +0100)]
new slice view
Ciro Scognamiglio [Tue, 25 Feb 2014 16:00:09 +0000 (17:00 +0100)]
modified rest function: platform, user, slice
Ciro Scognamiglio [Tue, 25 Feb 2014 15:58:37 +0000 (16:58 +0100)]
modified returned object from rest/user
Jordan Augé [Tue, 25 Feb 2014 15:43:33 +0000 (16:43 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Jordan Augé [Tue, 25 Feb 2014 15:40:54 +0000 (16:40 +0100)]
IMPORTANT: myslice/manifold folder REMOVED due to conflicts with Manifold Server package ! CREATED myslice/manifoldapi folder, MySlice requires now that Manifold is installed to benefit from libraries like core, query and util
Ciro Scognamiglio [Tue, 25 Feb 2014 15:21:41 +0000 (16:21 +0100)]
added themed templete
Ciro Scognamiglio [Tue, 25 Feb 2014 14:47:38 +0000 (15:47 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Tue, 25 Feb 2014 14:47:33 +0000 (15:47 +0100)]
small change
Yasin [Tue, 25 Feb 2014 14:34:16 +0000 (15:34 +0100)]
Fix: topmenu url About
Yasin [Tue, 25 Feb 2014 13:50:53 +0000 (14:50 +0100)]
MyAcc: cosmetic
Yasin [Tue, 25 Feb 2014 13:42:23 +0000 (14:42 +0100)]
Fix: url link in topmenu
Yasin [Tue, 25 Feb 2014 13:34:34 +0000 (14:34 +0100)]
MyAcc: tabbed
Yasin [Tue, 25 Feb 2014 11:33:32 +0000 (12:33 +0100)]
FIX: url in topmenu
Ciro Scognamiglio [Mon, 24 Feb 2014 17:51:33 +0000 (18:51 +0100)]
rest module, home view shows the list of slices
Ciro Scognamiglio [Mon, 24 Feb 2014 11:33:40 +0000 (12:33 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Ciro Scognamiglio [Mon, 24 Feb 2014 11:33:36 +0000 (12:33 +0100)]
styled
Loic Baron [Mon, 24 Feb 2014 11:32:30 +0000 (12:32 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Mon, 24 Feb 2014 11:32:10 +0000 (12:32 +0100)]
template list of users
Yasin [Fri, 21 Feb 2014 16:23:54 +0000 (17:23 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Fri, 21 Feb 2014 16:23:51 +0000 (17:23 +0100)]
Support: urls fixed
Loic Baron [Fri, 21 Feb 2014 16:22:21 +0000 (17:22 +0100)]
create slice link
Loic Baron [Fri, 21 Feb 2014 16:16:45 +0000 (17:16 +0100)]
Links in top menu and on dashboard icons
Loic Baron [Fri, 21 Feb 2014 16:04:08 +0000 (17:04 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Fri, 21 Feb 2014 16:03:26 +0000 (17:03 +0100)]
HTML template for institution
Yasin [Fri, 21 Feb 2014 15:56:03 +0000 (16:56 +0100)]
Added documentation intro
Yasin [Fri, 21 Feb 2014 15:36:22 +0000 (16:36 +0100)]
Support: Create Ticket Button Added
Yasin [Fri, 21 Feb 2014 15:34:26 +0000 (16:34 +0100)]
Support: OneLab Support Page Added + Fixed other static pages
Loic Baron [Fri, 21 Feb 2014 14:54:05 +0000 (15:54 +0100)]
Added views for about, institution and corresponding templates
Loic Baron [Fri, 21 Feb 2014 14:00:35 +0000 (15:00 +0100)]
default theme defined in configengine, it can be changed using myslice.ini, templates of each theme must be prefixed by "themename_" because all the templates are put together by django into /usr/share/templates/ note that for the moment OneLab is the default, later we will have a default theme...
Loic Baron [Fri, 21 Feb 2014 13:39:32 +0000 (14:39 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Jordan Augé [Fri, 21 Feb 2014 13:40:47 +0000 (14:40 +0100)]
updated Makefile
Jordan Augé [Fri, 21 Feb 2014 13:34:02 +0000 (14:34 +0100)]
updated Makefile
Loic Baron [Fri, 21 Feb 2014 13:32:20 +0000 (14:32 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Fri, 21 Feb 2014 13:30:30 +0000 (14:30 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Loic Baron [Fri, 21 Feb 2014 13:30:14 +0000 (14:30 +0100)]
added about url
Jordan Augé [Fri, 21 Feb 2014 13:15:03 +0000 (14:15 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Jordan Augé [Fri, 21 Feb 2014 13:14:48 +0000 (14:14 +0100)]
fixed Makefile
Yasin [Fri, 21 Feb 2014 11:46:01 +0000 (12:46 +0100)]
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
Yasin [Fri, 21 Feb 2014 11:45:56 +0000 (12:45 +0100)]
Static pages added
Jordan Augé [Fri, 21 Feb 2014 11:41:58 +0000 (12:41 +0100)]
fixed makefile for template collection
Ciro Scognamiglio [Thu, 20 Feb 2014 18:03:10 +0000 (19:03 +0100)]
home and ticket style
Ciro Scognamiglio [Thu, 20 Feb 2014 16:47:48 +0000 (17:47 +0100)]
styled slice request
Ciro Scognamiglio [Thu, 20 Feb 2014 16:09:48 +0000 (17:09 +0100)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Conflicts:
portal/slicerequestview.py
portal/usersview.py
Ciro Scognamiglio [Thu, 20 Feb 2014 16:06:44 +0000 (17:06 +0100)]
added theme
Ciro Scognamiglio [Thu, 20 Feb 2014 16:05:40 +0000 (17:05 +0100)]
added theme
Yasin [Wed, 19 Feb 2014 15:04:20 +0000 (16:04 +0100)]
Slice_Req: user_hrn retrieved from local:acc instead from registry
Ciro Scognamiglio [Tue, 18 Feb 2014 10:30:56 +0000 (11:30 +0100)]
onelab css changes
Yasin [Mon, 17 Feb 2014 17:53:15 +0000 (18:53 +0100)]
MyAcc: adapted new function parameter (manifold_delete_account)
Yasin [Mon, 17 Feb 2014 17:51:39 +0000 (18:51 +0100)]
Fix: update only selected user not all
Yasin [Mon, 17 Feb 2014 17:39:00 +0000 (18:39 +0100)]
MyACC: Update
Yasin [Mon, 17 Feb 2014 16:50:06 +0000 (17:50 +0100)]
ManageUsers: Functions updated [manifold_update_user]
Yasin [Mon, 17 Feb 2014 16:05:43 +0000 (17:05 +0100)]
Fix: minor
Yasin [Mon, 17 Feb 2014 16:00:25 +0000 (17:00 +0100)]
ManageUser: GenKey, Add, Remove platforms enabled
Yasin [Mon, 17 Feb 2014 15:42:50 +0000 (16:42 +0100)]
ManageUser: Edit Pkey disabled
Yasin [Mon, 17 Feb 2014 15:38:39 +0000 (16:38 +0100)]
ManageUser: email edit disabled [will be too complicated(user_hrn??).]. Authority edit enabled
Yasin [Mon, 17 Feb 2014 15:13:21 +0000 (16:13 +0100)]
urls.py: updated
Yasin [Mon, 17 Feb 2014 15:12:50 +0000 (16:12 +0100)]
Admin view renamed to Users view
Yasin [Mon, 17 Feb 2014 15:00:22 +0000 (16:00 +0100)]
ManageUser: Admin edit's user details
Ciro Scognamiglio [Fri, 14 Feb 2014 18:11:35 +0000 (19:11 +0100)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
git://git.onelab.eu / unfold.git / log