Commit graph

13338 commits

Author SHA1 Message Date
Jure Grabnar
0c51f7bc8b Saving/editing of reports now works 2016-08-03 13:15:40 +02:00
zmagod
9d4a67a5b6 Feed the Hound 2 2016-08-03 13:11:46 +02:00
zmagod
57ac34e9f4 add samples to experiment page [fixes SCI-43] 2016-08-03 12:57:51 +02:00
Jure Grabnar
964b51f84a Add experiment reports element 2016-08-03 12:52:52 +02:00
Jure Grabnar
aedaf2f30a Adding of experiment content now works in reports 2016-08-03 12:52:52 +02:00
Jure Grabnar
5854e72878 Add experiments_contents action 2016-08-03 12:52:52 +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
b402d67f24 Add rubocop gem to development env 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
1e334d9075 Remove unneeded "Add new report element" 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
d11b0b11e9 Feed the Hound 2016-08-03 09:44:05 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
mlorb
ae7eb18af8 Merge pull request #44 from biosistemika/ml_sci_223
fixes issue SCI-223
2016-08-02 16:47:36 +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
18d73467c8 fixed hound warning 2016-08-02 11:16:07 +02:00
zmagod
166f907780 fixed search error 2016-08-02 11:10:30 +02:00
Zmago Devetak
692cb59219 Merge pull request #42 from ZmagoD/zd_SCI_247
Deleting items for report
2016-08-02 10:18:12 +02:00
zmagod
f184ee3f2d fixing hound warnings 2016-08-02 09:13:30 +02:00
zmagod
9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00
Zmago Devetak
c7e1dea1bc Merge pull request #41 from biosistemika/lm-explvl-breadcrumbs
Sidebar, breadcrumbs & 2ndary navbar fixes
2016-08-01 11:59:31 +02:00
zmagod
6e3ce92348 add checking for step content 2016-08-01 11:23:22 +02:00
Luka Murn
40fe4e54a9 Feed the Hound #2 2016-07-29 16:48:56 +02:00
Luka Murn
ecf5b5a2c1 Feed the Hound 2016-07-29 16:46:25 +02:00
Luka Murn
4d57479cf9 Remove comment
Closes SCI-38.
2016-07-29 16:40:42 +02:00
zmagod
95da62adde fixed hound 2016-07-29 16:38: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
zmagod
e5d488c2cc Merge branch 'ZmagoD-zd_SCI_277' into experiment-level 2016-07-29 14:54:05 +02:00
zmagod
ec54b4e9ba Merge branch 'zd_SCI_277' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_277 2016-07-29 14:53:20 +02:00
Luka Murn
0f0689eddc Fix permission helper 2016-07-29 11:43:15 +02:00
Luka Murn
02b7c952e6 Merge pull request #39 from biosistemika/lm-explvl-routes
Additional fixes related to experiment level routes
2016-07-29 10:51:14 +02:00
Luka Murn
4ea86d6aa1 Code style fixes 2016-07-29 10:41:08 +02:00
Luka Murn
affc429496 Remove experiments index 2016-07-29 10:25:02 +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
ebda92ef05 Add experiments_controller 2016-07-29 10:21:21 +02:00
Luka Murn
1ad265835b Move route canvas_project -> canvas_experiment 2016-07-29 10:08:28 +02:00