Commit graph

3065 commits

Author SHA1 Message Date
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
Jure Grabnar 797685fbf0 Remove workflows from project content dialog (report) 2016-08-03 12:52:06 +02:00
Jure Grabnar daca739262 Add new line to selector for readability 2016-08-03 12:52:06 +02:00
Jure Grabnar 598c5a63fd Add experiment level to project report contents modal 2016-08-03 12:52:05 +02:00
zmagod caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
Mojca Lorber ffa64445df fixes issue SCI-223 2016-08-02 16:30:07 +02:00
Zmago Devetak 43230384b5 Merge pull request #40 from ZmagoD/zd_SCI_261
Fixed search query [fixes SCI-261]
2016-08-02 11:44:00 +02:00
zmagod 9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00
zmagod 6e3ce92348 add checking for step content 2016-08-01 11:23:22 +02:00
Luka Murn 4d57479cf9 Remove comment
Closes SCI-38.
2016-07-29 16:40:42 +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 bed8687dbd Remove some unused commented code 2016-07-29 16:08:30 +02:00
Luka Murn b085aa1db3 Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +02:00
Luka Murn ed2226c14b Refactor sidebar 2016-07-29 15:58:47 +02:00
Luka Murn 34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
Luka Murn edafcaeed6 Move route module_archive_project -> module_archive_experiment
Also add some new routes, move some templates.
2016-07-29 10:25:02 +02:00
Luka Murn 1ad265835b Move route canvas_project -> canvas_experiment 2016-07-29 10:08:28 +02:00
Luka Murn 0c75423cc0 Add TODO to project overview page 2016-07-29 09:46:26 +02:00
Luka Murn b64e200b91 Refactor canvas a lot.
Also refactor localization files concerning canvas.
2016-07-28 16:41:10 +02:00
zmagod e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod 352944fc33 added new/edit experiment modals 2016-07-28 14:44:44 +02:00
Luka Murn 1953e295b6 Hotfix for search results bug 2016-07-28 13:29:26 +02:00
zmagod 9d23cfd940 fixed experiment routes 2016-07-28 11:30:34 +02:00
zmagod c11932b45b fixed layout 2016-07-28 11:00:56 +02:00
zmagod d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
zmagod 54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00
zmagod a17106b883 added experiments controller and fixed sidebar 2016-07-27 16:18:26 +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 485d93f8b9 refactor canvas permissions 2016-07-27 11:35:07 +02:00
zmagod 5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
zmagod 0a84ecdfc1 edit canvas controller to work with experiment 2016-07-26 14:02:06 +02:00
Jure Grabnar 77ed1c5fd3 Change invalid references to project in search and shorten lines. 2016-07-26 12:59:37 +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
Jure Grabnar 6d26203796 Add missing target var to result searches 2016-07-26 12:26:48 +02:00
Jure Grabnar 5283027da1 Add missing target var to searches. 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