16 commits

Author	SHA1	Message	Date
zmagod	d886d05ccb	Merge branch 'zd_SCI_338'	2016-08-26 16:32:49 +02:00
Matej Zrimšek	e3a7f45fdf	Merge branch 'master' into mz_file_upload_and_client_side_upgrade ... Conflicts: app/assets/javascripts/application.js app/views/results/_result_asset.html.erb app/views/steps/_step.html.erb	2016-08-26 11:13:40 +02:00
zmagod	b0bd92e3f4	fixed edit action	2016-08-26 09:17:55 +02:00
Luka Murn	bac0455435	Add edit&delete functionality to step comments ... This commit also: * fixes a bug in permission_helper.rb, * fixes comments.js a bit, * adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.	2016-08-25 13:51:31 +02:00
Luka Murn	f0d9cb96fa	Add edit project comments functionality	2016-08-25 13:51:30 +02:00
Luka Murn	15c0baeee8	Add delete project comment functionality ... This commit also removes the old code from @bberic.	2016-08-25 13:51:30 +02:00
scibb	a76d82d188	delete and edit comments for projects, protocols, results, and workflow elements	2016-08-25 13:51:30 +02:00
zmagod	92bb3dda99	hide last next button	2016-08-25 08:46:11 +02:00
zmagod	dbdbff12eb	add experiment level tutorial step [fixes SCI-338]	2016-08-24 19:03:58 +02:00
zmagod	072f816286	refactor restore_after_tutorial function	2016-08-18 08:55:40 +02:00
zmagod	f2ee5d73a0	fixed project tutorial bug	2016-08-18 08:53:34 +02:00
Matej Zrimšek	ccdccc5cf1	Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.	2016-08-17 18:11:13 +02:00
zmagod	a128815122	fixed tutorial tasks on canvas	2016-08-11 16:06:51 +02:00
zmagod	2e1d81a985	fixed project archive in tutorial	2016-08-11 12:40:16 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00