Commit graph

13 commits

Author SHA1 Message Date
Mojca Lorber
43c3a0bb81 fixes merge again 2016-08-30 12:54:08 +02:00
Mojca Lorber
81f9e59dcd fixes merge 2016-08-30 12:14:15 +02:00
Mojca Lorber
e8d187b5f6 Merge branch 'ml_sci_395'
Conflicts:
	app/views/canvas/edit/modal/_move_module.html.erb
	app/views/canvas/edit/modal/_move_module_group.html.erb
2016-08-30 11:41:25 +02:00
Mojca Lorber
596d403d5f change position of buttons 2016-08-30 09:16:53 +02:00
Jure Grabnar
0c184dcdcf Remove Move button on empty experiments
SCI-328 #close.
2016-08-30 08:26:59 +02:00
Jure Grabnar
0d56cea3e4 Add placeholders for empty experiments 2016-08-23 10:37:48 +02:00
Jure Grabnar
5bb99adb25 Add frontend logic for moving workflows from canvas 2016-08-19 17:11:17 +02:00
Jure Grabnar
80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +02:00
Jure Grabnar
0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +02:00
zmagod
485d93f8b9 refactor canvas permissions 2016-07-27 11:35:07 +02:00
zmagod
5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
zmagod
0a84ecdfc1 edit canvas controller to work with experiment 2016-07-26 14:02:06 +02:00
Luka Murn
055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00