Commit graph

88 commits

Author SHA1 Message Date
Zmago Devetak 7e2db66f42 Merge pull request #79 from ZmagoD/zd_SCI_345
Adds font-awesome to pdf [fixes SCI-345]
2016-08-23 16:22:30 +02:00
zmagod 0429816154 deleted commented code 2016-08-23 16:21:11 +02:00
zmagod eab05eb9db adds font-awesome to pdf [fixes SCI-345] 2016-08-22 14:40:09 +02:00
zmagod d38f29d207 set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00
zmagod cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
zmagod 6bb8d075e0 truncate asset name in task step and result [fixes SCI-294] 2016-08-18 09:22:12 +02:00
Zmago Devetak 4897e2da0c Merge pull request #68 from ZmagoD/zd_SCI_330
Zd sci 330
2016-08-18 08:10:20 +02:00
Zmago Devetak f2e08db106 Merge pull request #67 from ZmagoD/zd_SCI_337
Zd sci 337
2016-08-18 08:06:38 +02:00
zmagod 9fd68c7bd5 fixes 'new experiment' button bug on smaller screens 2016-08-17 14:27:59 +02:00
zmagod ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +02:00
zmagod cc2ed32ccb fixes canvas bug when no actions are available for the viewer 2016-08-17 13:29:22 +02:00
zmagod 8d69ca0b88 adds active class to experiment name in sidebar [fixes SCI-331] 2016-08-17 11:21:48 +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
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
Jure Grabnar d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar 555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
Jure Grabnar 9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar 5c40d04eb2 Add missing clone modal 2016-08-11 16:59:56 +02:00
Jure Grabnar 6e8e9ecf21 Fix activities and the dreaded no project for modules error 2016-08-11 16:57:29 +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
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
Jure Grabnar 7b0f323576 Add expiring URL to experiment img 2016-08-09 16:37:44 +02:00
zmagod 5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar 9f7df0af76 Fix checkbox in experiment reports 2016-08-09 13:13:50 +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
Jure Grabnar a0fe31479f Fix permissions for archived experiments 2016-08-09 10:00:44 +02:00
zmagod 1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +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
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 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 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
Jure Grabnar 8b2b134614 Migrate old reports to new experiment level reports 2016-08-04 13:19:46 +02:00
zmagod a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00
zmagod 45dac782ca update sidebar [fixes SCI-303] 2016-08-03 16:09:45 +02:00
Jure Grabnar 9092dd6914 Replace all occurences of module_elements 2016-08-03 12:52:52 +02:00
Jure Grabnar ff081cd844 Simplify project contents dialog 2016-08-03 12:52:51 +02:00
Jure Grabnar dc82830a8f Add checkbox behaviour to experiment contents 2016-08-03 12:52:51 +02:00
Jure Grabnar 3f33ebe59a Fix wrong closure in experiment contents 2016-08-03 12:52:51 +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 41e8c54aa5 Rename _module_element_controls to element_controls 2016-08-03 12:52:06 +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
Jure Grabnar ac708e7497 Remove no module group from reports 2016-08-03 12:52:06 +02:00