aignatov-bio
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] ( #1631 )
...
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +02:00
aignatov-bio
5d9e4f30d4
Duplicates name protocol bug and rake task to rename duplicates [SCI-3047] ( #1541 )
...
* Fix double protocols bug and rake task to rename duplicates
2019-03-20 12:41:14 +01:00
Oleksii Kriuchykhin
6cd033767c
Fix comments form for new results [SCI-2877]
2018-11-21 23:48:43 +01:00
Oleksii Kriuchykhin
6e6bb73d2f
Remove double initialization of comments on steps [SCI-2756]
2018-10-26 09:29:42 +02:00
Oleksii Kriuchykhin
b2bd1cb849
Upgrade to Turbolinks 5 [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
a169639b3c
Fix uploaded file max size validation in JS [SCI-2590]
2018-07-05 15:23:26 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
mlorb
06ce285ae2
add locales
2018-05-16 14:32:15 +02:00
mlorb
7df40e56c7
UI/UX restyle - fixes throughout application part one
2018-05-08 16:33:42 +02:00
Oleksii Kriuchykhin
a105e61d48
Remove tutorial [SCI-1860]
2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin
deabd39a98
Fix protocol import button [SCI-1931]
2018-01-15 13:43:09 +01:00
Matej Zrimšek
a5cffd06f3
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
2017-04-25 16:03:50 +02:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
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
Oleksii Kriuchykhin
14a6705b55
Implemented protocol export through Zip::OutputStream [SCI-742]
2017-01-23 17:43:48 +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
zmagod
a434649f42
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-01-03 16:35:25 +01:00
zmagod
de3099e4d1
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
2016-12-09 13:59:49 +01:00
zmagod
8ca7151df4
added constant to load_from_file_size_error local
2016-12-06 13:52:07 +01:00