Commit graph

249 commits

Author SHA1 Message Date
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
Jure Grabnar ef608d18e7 Add missing Gemfile.lock 2016-08-10 08:30:58 +02:00
Jure Grabnar 7b0f323576 Add expiring URL to experiment img 2016-08-09 16:37:44 +02:00
zmagod f77e0d4a6e changed workflow image name 2016-08-09 16:27:28 +02:00
zmagod 5583105d8a fixed hound alert 2016-08-09 14:28:55 +02:00
zmagod 5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar e995165876 Double quotes -> single quotes (#hound) 2016-08-09 13:19:32 +02:00
Jure Grabnar 9f7df0af76 Fix checkbox in experiment reports 2016-08-09 13:13:50 +02:00
zmagod 176aad4c6d fixes multiple graphs rendering 2016-08-09 11:19:07 +02:00
Jure Grabnar 208e85e7e0 Remove archived experiments from reports 2016-08-09 11:17:25 +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
scibb a6d39762db the migration to update canvas coordinates 2016-08-09 10:04:10 +02:00
Jure Grabnar a0fe31479f Fix permissions for archived experiments 2016-08-09 10:00:44 +02:00
Jure Grabnar 0ca5725f9b Archive/restore of experiments now work 2016-08-08 16:35:45 +02:00
zmagod 1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
scibb 696075bf0f smaller grid steps set. In addition enddpoint bug was fixed
SCI 170, SCI 292'
2016-08-08 15:18:38 +02:00
Jure Grabnar 462530da3d Add rubocop_cache to .gitignore 2016-08-08 15:04:52 +02:00
Jure Grabnar 5c858ee577 Add missing experiment archive page 2016-08-08 15:04:38 +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
Jure Grabnar 775a39344c Fix experiment archive permissions 2016-08-08 13:40:08 +02:00
Jure Grabnar deecbf082c Remove badly merged code 2016-08-08 13:06:20 +02:00
Zmago Devetak 4bd489d29c Merge pull request #46 from ZmagoD/zd_SCI_303
update sidebar v2 [fixes SCI-303]
2016-08-08 08:56:01 +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 520cf2e0cf hound.... 2016-08-08 08:40:24 +02:00
zmagod e16abe486c fix hound alert 2016-08-08 08:37:22 +02:00
zmagod 756c3c777e styled workflow dots 2016-08-08 08:33:18 +02:00
zmagod 12e82556c4 Merge branch 'ZmagoD-zd_SCI_41' into experiment-level 2016-08-05 15:56:54 +02:00
zmagod 04d171997e Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41 2016-08-05 15:56:21 +02:00
zmagod b74f770747 Merge branch 'ZmagoD-zd_SCI_44' into experiment-level 2016-08-05 15:23:31 +02:00
zmagod 9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +02:00
Mojca Lorber c691ca63e2 fixing houndci-bot comment 2016-08-05 09:47:06 +02:00
Mojca Lorber 5d137324bc moving and targeting .label class 2016-08-05 09:12:17 +02:00
Jure Grabnar d9702b6964 Remove unneeded new element 2016-08-05 08:36:06 +02:00