Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
Luka Murn
a2935c6620
Add sample info modal popup to sample smart annotations
...
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').
Closes SCI-892.
2017-01-16 15:52:02 +01:00
Oleksii Kriuchykhin
773b00933a
Improve multiple messages handling in samples [SCI-853]
2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin
0fd7688427
Fix hiding of error messages in the samples datatable [SCI-853]
2017-01-09 13:34:23 +01:00
zmagod
8dd8a7e7cd
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
2016-12-12 15:52:25 +01:00
zmagod
5176f8b459
clean unneeded code [fixes SCI-778] refactor js
2016-12-12 15:40:13 +01:00
Luka Murn
8a55ef29e4
Remove unused code
...
Closes SCI-711.
2016-12-09 13:49:19 +01:00
zmagod
a2e13441e5
removes create_sample_type modal and related js actions
2016-11-30 09:02:34 +01:00
Oleksii Kriuchykhin
be59b85d3b
Added additional checks for tutorial steps [SCI-703]
2016-11-22 13:55:23 +01:00
Matej Zrimšek
c8eb82cc85
Fixed tutorial step numbers and changed getting next page reference on protocols page.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
92d990a715
Code for tutorial function steps parameter reformatted. Deleted Git merging line.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
00ed91e856
Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave.
2016-11-17 14:46:04 +01:00
Oleksii Kriuchykhin
d2e29935cf
Improved tutorial styling [SCI-685]
2016-11-16 15:44:06 +01:00
Oleksii Kriuchykhin
b9f982ead7
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
2016-11-11 10:07:34 +01:00
Matej Zrimšek
13e886f7a9
Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408]
2016-09-22 17:35:23 +02:00
mlorb
905acfd43d
Merge pull request #109 from mlorb/ml_sci_286
...
fixes notification when adding new sample [SCI-286]
2016-08-30 17:54:45 +02:00
Mojca Lorber
dd8e5d5e12
fixes hound
2016-08-30 17:12:26 +02:00
Mojca Lorber
1b1e6daa21
fixes notification disappearance and error notifications
2016-08-30 16:55:59 +02:00
zmagod
57c1707e81
fixes secondary navigation [fixes SCI-338]
2016-08-30 09:53:56 +02:00
zmagod
d33bb50519
disabled secondary navigation in samples tutorial
2016-08-30 08:57:05 +02:00
zmagod
dbdbff12eb
add experiment level tutorial step [fixes SCI-338]
2016-08-24 19:03:58 +02:00
Mojca Lorber
571f5b60f3
fixes notifications appearance and disappearance and content adjustment
2016-08-19 10:48:43 +02:00
Mojca Lorber
5c77167388
update buttons
2016-08-18 16:47:16 +02:00
Mojca Lorber
5695842fe3
fixes notifications when creating sample types and groups
2016-08-18 16:05:15 +02:00
mlorb
36d24523b4
Merge pull request #61 from biosistemika/ml_sci_291
...
fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]
2016-08-18 08:25:31 +02:00
Mojca Lorber
7dc0c3672a
fixes dissapearance of sample type/group when adding/editing new sample
2016-08-16 10:17:29 +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
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
