Commit graph

15632 commits

Author SHA1 Message Date
jbargu 20a8fd551f Merge pull request #60 from jbargu/jg_clone_move_experiment
Clone/move experiment functionality

[fixes SCI-308]
2016-08-16 10:24:52 +02:00
Jure Grabnar 275106c27c Add check for empty projects on move experiments 2016-08-16 10:20:36 +02:00
Mojca Lorber 7dc0c3672a fixes dissapearance of sample type/group when adding/editing new sample 2016-08-16 10:17:29 +02:00
Jure Grabnar c16eed5e63 Add missing dropdown_actions.js 2016-08-16 09:48:19 +02:00
zmagod 5e647f62d5 changed import label [fixes SCI-317] 2016-08-16 09:34:04 +02:00
Jure Grabnar a29b56b0bd Even more candy for our dog 2016-08-16 09:15:29 +02:00
Jure Grabnar b25a7758db Give a candy to our special dog 2016-08-16 09:10:45 +02:00
Jure Grabnar 042a33f2c7 Add activity for moving 2016-08-16 08:49:24 +02:00
Jure Grabnar e55c66b3d0 Add query for moveable projects 2016-08-16 08:47:04 +02:00
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Jure Grabnar c387439fb2 Fix projects query for experiments
Remove unneeded word in view
2016-08-12 11:36:52 +02:00
Mojca Lorber e6f205368b fixes tutorial bug of inappropriate window 2016-08-12 11:33:27 +02:00
Jure Grabnar d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
zmagod c9ff249067 fixed hound alert 2016-08-12 11:11:52 +02:00
zmagod 6c7cfb4467 filter search query for special chars [fixes SCI_74] 2016-08-12 11:08:51 +02:00
Jure Grabnar 555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
mlorb 6b17385f3a Merge pull request #56 from biosistemika/ml_sci_302
fixes problem with split table when generating pdf report [SCI-302]
2016-08-12 08:55:10 +02:00
mlorb f3163ea7ce visual corrections 2016-08-12 08:54:14 +02:00
Jure Grabnar 9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar 3c36293770 Add activity for cloning experiment 2016-08-11 17:00:33 +02:00
Jure Grabnar 5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +02:00
Jure Grabnar 2f6ccac3bc Add unique experiment name and copy image when cloning 2016-08-11 16:58:31 +02:00
Jure Grabnar 6e8e9ecf21 Fix activities and the dreaded no project for modules error 2016-08-11 16:57:29 +02:00
zmagod d1f6a0f58d fixed hound 2016-08-11 16:24:44 +02:00
zmagod 701c26a2dd fixed canvas edit and samples tutorial [fixes: SCI-271] 2016-08-11 16:21:55 +02:00
zmagod a128815122 fixed tutorial tasks on canvas 2016-08-11 16:06:51 +02:00
Mojca Lorber 94915a9ba7 fixes problem with splitted table when generating pdf report [SCI-302] 2016-08-11 15:24:18 +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
zmagod 2e1d81a985 fixed project archive in tutorial 2016-08-11 12:40:16 +02:00
Mojca Lorber b350dff826 fixes problem with splitted table when generating pdf report [SCI-302] 2016-08-11 10:42: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
scibb 32699578ed Merge pull request #52 from biosistemika/bb_canvas_fixes
Bb canvas fixes
2016-08-11 09:29:21 +02:00
zmagod 060da59bbb fixes migration error 2016-08-11 09:19:12 +02:00
Jure Grabnar 1ca34a7986 Fix result texts/tables 2016-08-10 15:44:33 +02:00
Jure Grabnar 52e6d7d300 Fix step comments 2016-08-10 15:44:33 +02:00
Jure Grabnar 3e72f29bfd Fix uploading of step assets 2016-08-10 15:44:33 +02:00
Jure Grabnar d69195a4f6 Fix uploading of result assets 2016-08-10 15:44:33 +02:00
Jure Grabnar c801e7b7e3 Add old Gemfile.lock with graphviz 2016-08-10 15:43:15 +02:00
zmagod f9cb44c6a5 Merge branch 'ZmagoD-zd_add_image_to_project_preview' into experiment-level 2016-08-10 11:34:04 +02:00
zmagod c866e90b33 Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview 2016-08-10 11:33:37 +02:00
zmagod 7653f2b9ec fixed hound 2016-08-10 11:26:27 +02:00
Jure Grabnar b2855d69f6 Fix hound warning 2016-08-10 09:24:06 +02:00
Jure Grabnar 274f0cc6b8 Update README.md with instruction for graphviz deploy 2016-08-10 09:22:18 +02:00
mlorb e83566799c Merge pull request #49 from biosistemika/ml_sci_293
fixes keywords overlapping when editing keywords of protocol [SCI-293]
2016-08-10 09:16:08 +02:00
zmagod deb739efa6 fixes loading samples error in blank project 2016-08-10 09:13:12 +02:00
Jure Grabnar 15d66c7884 Change validation for experiment workimg 2016-08-10 08:58:29 +02:00
Jure Grabnar 9865ad80f9 Fix migration for adding attachment to experiment 2016-08-10 08:53:59 +02:00
scibb 5dd5f1cc28 another tab replaced with 2-spaces... 2016-08-10 08:49:18 +02:00
jbargu 890b0ba860 Merge pull request #53 from jbargu/jg_explvl_archive
Project archive page, with experiment
2016-08-10 08:46:17 +02:00
scibb 6b0b2b0df7 tabs replaced with 2-spaces 2016-08-10 08:36:58 +02:00