Commit graph

1699 commits

Author SHA1 Message Date
mlorb
c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375
add move experiment instructions [SCI-375]
2016-08-25 09:45:16 +02:00
mlorb
0a066f436f Merge pull request #96 from mlorb/ml_sci_369
buttons update on experiment overview [SCI-369]
2016-08-25 08:54:16 +02:00
zmagod
dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Mojca Lorber
408af14e41 replace description in add content to report window 2016-08-24 17:19:29 +02:00
Mojca Lorber
2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
zmagod
9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +02:00
Jure Grabnar
00da7efb44 Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
Conflicts:
	app/models/experiment.rb

SCI-328 #close
2016-08-24 13:11:10 +02:00
Mojca Lorber
f554dc6018 add move experiment instructions 2016-08-24 11:36:50 +02:00
mlorb
5c8d669cac Merge pull request #81 from mlorb/ml_sci_364
fixes edit experiment [SCI-364]
2016-08-23 16:49:20 +02:00
Jure Grabnar
0d56cea3e4 Add placeholders for empty experiments 2016-08-23 10:37:48 +02:00
zmagod
03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
Mojca Lorber
131d0d269a fixes edit experiment 2016-08-22 15:18:02 +02:00
Jure Grabnar
5bb99adb25 Add frontend logic for moving workflows from canvas 2016-08-19 17:11:17 +02:00
Mojca Lorber
fb081be682 fixes warning messages when loading a new protocol that is linked with repository 2016-08-19 16:03:10 +02:00
Matej Zrimšek
c87ba5b45c Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page. 2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring. 2016-08-17 18:08:21 +02:00
Matej Zrimšek
86880f0299 Additional changes, refactoring and improvements. 2016-08-17 17:57:54 +02:00
Matej Zrimšek
e2f94caa96 Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done. 2016-08-17 17:54:06 +02:00
Jure Grabnar
0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +02:00
Zmago Devetak
da735a51f4 Merge pull request #62 from ZmagoD/zd_SCI_318
Zd sci 318
2016-08-17 10:01:10 +02:00
zmagod
7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +02:00
Jure Grabnar
275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +02:00
zmagod
5e647f62d5 changed import label [fixes SCI-317] 2016-08-16 09:34:04 +02:00
Jure Grabnar
042a33f2c7 Add activity for moving 2016-08-16 08:49:24 +02:00
zmagod
852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Jure Grabnar
d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar
2f6ccac3bc Add unique experiment name and copy image when cloning 2016-08-11 16:58:31 +02:00
Jure Grabnar
3b259d34b0 Basic cloning of experiment works
Still missing:
- cloning of assets
- cloning of experiment image
2016-08-11 15:13:36 +02:00
Jure Grabnar
7f21ae138a Set clone actions/routes/view
DRY code for showing AJAX on project#show page
2016-08-11 09:46:15 +02:00
Jure Grabnar
1a7a7a1d1a Add info to experiment archive cards
Also add addtional check for due date on archive experiment
2016-08-09 11:04:46 +02:00
Jure Grabnar
2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
Jure Grabnar
5a023483d7 Prepare views for experiment archive 2016-08-08 14:19:35 +02:00
jbargu
3f91e7a476 Merge pull request #47 from biosistemika/jg_explvl_reports
Update reports with experiment level

[Fixes SCI-35].
2016-08-08 08:51:23 +02:00
zmagod
a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00
Jure Grabnar
acc41dae40 Add experiment content report dialog
Adding still has to be implemented
2016-08-03 12:52:51 +02:00
Jure Grabnar
d82ba163ed Add experiment to report screen
Only placeholder for now, JS still needs fixing.
2016-08-03 12:52:06 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod
25b99b6570 fixed search [fixes SCI-261] 2016-07-29 16:32:54 +02:00
Luka Murn
8a2b54819a More fixes on secondary navigation 2016-07-29 16:20:35 +02:00
Luka Murn
b64e200b91 Refactor canvas a lot.
Also refactor localization files concerning canvas.
2016-07-28 16:41:10 +02:00
zmagod
23a46d5fb3 added translations to experiment create and edit flash messages 2016-07-28 14:52:11 +02:00
zmagod
352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
zmagod
54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00
Zmago Devetak
c869db2506 Merge pull request #35 from ZmagoD/zd_SCI_40
Edit canvas controller to work with experiments
2016-07-27 12:11:19 +02:00
zmagod
5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
Jure Grabnar
80621c9b6b Add experiment text to all searches related to experiment 2016-07-26 12:26:48 +02:00
Jure Grabnar
3be562bdf6 Add experiment to search results 2016-07-26 12:26:48 +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