Oleksii Kriuchykhin
8b968f6f67
Fix selection of the default snapshot on tasks [SCI-4637]
2020-05-18 11:06:42 +02:00
aignatov-bio
f921ac75d8
Select correct button name for assign modal
2020-05-15 15:37:48 +02:00
aignatov-bio
bc81a48b00
Make snapshot creation info text switchable
2020-05-15 14:44:26 +02:00
aignatov-bio
69abccbbd6
Add title for full view assign modal
2020-05-15 14:22:20 +02:00
aignatov-bio
c9a9cd2e75
Remove search from state load in task repository
2020-05-14 21:49:01 +02:00
aignatov-bio
e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections
...
Small task inventories corrections [SCI-4605]
2020-05-14 16:45:45 +02:00
aignatov-bio
ce1540aaa9
Small task inventories corrections
2020-05-14 16:41:02 +02:00
aignatov-bio
309f8c1a3d
Small snapshots CSS corrections
2020-05-14 16:29:50 +02:00
aignatov-bio
78b4067c50
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections
...
Small snapshot css corrections [SCI-4604]
2020-05-14 15:18:13 +02:00
Miha Mencin
26caeed04f
increase pooling interval to 10s
2020-05-14 12:39:13 +02:00
Miha Mencin
0e5ce1054e
decrease pooling time for snapshots
2020-05-14 12:03:07 +02:00
Alex Kriuchykhin
a341bd533b
Merge pull request #2557 from okriuchykhin/ok_SCI_4596
...
Make snapshots selectable [SCI-4596]
2020-05-14 10:15:44 +02:00
Oleksii Kriuchykhin
ba1661b40f
Fix handling of deleted repositories for snapshots [SCI-4596]
2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin
c74fa3c244
Make snapshots selectable [SCI-4596]
2020-05-13 17:58:05 +02:00
Urban Rotnik
334da7c3ec
Fix for assign view
2020-05-12 19:38:45 +02:00
aignatov-bio
f94ea51ecb
Small snapshot css corrections
2020-05-10 13:08:19 +02:00
aignatov-bio
8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
...
Add recent protocol tab to load protocal from repository [SCI-4509]
2020-05-08 13:17:26 +02:00
aignatov-bio
d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
...
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
2020-05-08 12:39:28 +02:00
aignatov-bio
e9c54f10fb
Fix markup
2020-05-08 11:58:40 +02:00
aignatov-bio
c9545ddb19
Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab
2020-05-08 10:28:33 +02:00
aignatov-bio
dad5ac7a27
Fix snapshot button place
2020-05-07 19:36:30 +02:00
aignatov-bio
fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
...
Update CSS for full view assigned rows modal [SCI-4594]
2020-05-07 15:22:06 +02:00
aignatov-bio
8ec7a4b7b4
Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
2020-05-07 13:03:00 +02:00
aignatov-bio
8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
...
Add new protocol template dropdown [SCI-4538]
2020-05-07 08:32:54 +02:00
aignatov-bio
a29db548f8
Update CSS for full view assigned rows modal
2020-05-05 18:17:14 +02:00
Alex Kriuchykhin
7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task
...
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
2020-05-05 13:20:01 +02:00
aignatov-bio
1b57040c37
Fix deepscan issues
2020-05-05 09:44:38 +02:00
aignatov-bio
9d006aac9e
Fix handson table for colapsed protocol section
2020-05-02 22:15:38 +02:00
aignatov-bio
1ed62c4a49
Fix I18n and save to repository button
2020-05-01 20:45:09 +02:00
aignatov-bio
19d30e2019
Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task
2020-04-29 15:13:38 +02:00
aignatov-bio
b9c5089c2b
Add search to assigned tasks dropdown
2020-04-28 12:41:59 +02:00
Oleksii Kriuchykhin
e6ad5047e0
Implement background processing of repository snapshots [SCI-4552]
2020-04-28 12:09:36 +02:00
aignatov-bio
ad705a740c
Add new protocol template dropdown
2020-04-24 15:48:40 +02:00
aignatov-bio
f65b50c6ff
Fix rebase conflicts
2020-04-23 16:36:22 +02:00
aignatov-bio
d48997464d
Fix markup
2020-04-23 15:25:28 +02:00
aignatov-bio
34d6e903a4
Add assign items modal and update modal for task inventories
2020-04-23 15:24:40 +02:00
Oleksii Kriuchykhin
f811d11c59
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
2020-04-21 14:49:36 +02:00
aignatov-bio
338f3a0192
Fix css
2020-04-14 13:08:07 +02:00
aignatov-bio
c1cac01b28
Add repositories dropdown list
2020-04-14 12:10:16 +02:00
aignatov-bio
fe718349da
Add recent protocol tab to load protocal from repository
2020-04-09 17:29:39 +02:00
aignatov-bio
c9b59f96a8
Hide checkbox column for full view
2020-04-08 15:58:22 +02:00
aignatov-bio
e4b65aaf6f
Finish full view repository
2020-04-08 15:13:21 +02:00
aignatov-bio
087f71a82f
Add full view for my-module repository
2020-04-07 21:02:16 +02:00
aignatov-bio
9dfc652580
Fix markup
2020-04-07 12:50:58 +02:00
aignatov-bio
845e8c3d6d
Fix loading process
2020-04-07 12:36:01 +02:00
aignatov-bio
7fdc169ba2
Add simple view to repository table
2020-04-06 19:52:41 +02:00
aignatov-bio
b188b0511b
Refactor TinyMCE autosave check
2020-03-19 15:45:14 +01:00
Oleksii Kriuchykhin
49e1e67231
Fix JS condition [SCI-4321]
2020-02-07 15:54:57 +01:00
Oleksii Kriuchykhin
5470bb9b9b
Fix file result only name update [SCI-4321]
2020-02-07 15:21:50 +01:00
Anton Ignatov
c389972e2a
Fix JS error in recent protocol drop down
2019-09-24 09:47:04 +02:00
Anton Ignatov
146c725e89
Fix step table error
2019-09-18 11:47:33 +02:00
Oleksii Kriuchykhin
3509543e7b
Merge branch 'master' into ok_SCI_3881
2019-09-16 11:56:49 +02:00
aignatov-bio
15dc25cee9
Fix handson table initialization [SCI-3749] ( #2021 )
...
* Fix handson table initialization
* Fix markup
2019-09-05 08:35:28 +02:00
aignatov-bio
b57e79a557
Fix tables ( #1963 )
2019-08-09 09:41:32 +02:00
Oleksii Kriuchykhin
a5d47e75c5
Remove duplicated protocols.js.erb file [SCI-3678]
2019-08-08 14:33:07 +02:00
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
eaf9d59819
Merge branch 'activestorage_migration' into ok_SCI_3679
2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
423528933e
Switch to global JS constants [SCI-3679]
2019-08-06 15:06:19 +02:00
Oleksii Kriuchykhin
5e65b07bdc
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
2019-07-25 18:00:24 +02:00
Anton Ignatov
3339c1fbbf
Add MarvinJS to Result and TinyMce MarvinJS refactor
2019-07-15 17:17:14 +02:00
Anton Ignatov
57a273d5d0
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 11:34:41 +02:00
aignatov-bio
68ebf13bca
Fix tags modal issue ( #1856 )
2019-07-02 11:20:49 +02:00
Oleksii Kriuchykhin
4ea6b56582
Fix Step and Result file previews [SCI-3539]
2019-07-01 23:30:20 +02:00
aignatov-bio
81d10c8ce4
Remove recent protocol button on new step ( #1841 )
2019-06-19 12:49:22 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] ( #1800 )
...
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin
a855eade4c
Merge branch 'master' into ok_SCI_3461
2019-06-11 17:48:02 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] ( #1808 )
...
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
2019-06-04 14:40:21 +02:00
Oleksii Kriuchykhin
84a2ad4487
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-05-21 17:29:33 +02:00
Mojca Lorber
b479a6a145
Cover all use cases for updating protocol status bar
2019-05-20 16:09:43 +02:00
Luka Murn
c26489acdc
Update protocol status bar upon changing of protocol description
2019-05-17 10:22:16 +02:00
Oleksii Kriuchykhin
4b1c4bd140
Fix handling of proccessing step attachments [SCI-3381]
2019-05-13 17:12:06 +02:00
aignatov-bio
364f903b3c
Fix protocol preview name ( #1749 )
2019-05-13 10:17:47 +02:00
Oleksii Kriuchykhin
077ad52d4b
Fix TinyMCE for results [SCI-3398]
2019-04-26 17:37:01 +02:00
Urban Rotnik
11a7a975af
Merge branch 'features/scinote-improvements' into master-with-note-section
2019-04-23 14:50:03 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
Anton Ignatov
dd8b3caf65
Fix duplicate activtiy issue and fix link to inventory
2019-04-15 11:35:30 +02:00
Jure Grabnar
b12916b828
Add main functionality
2019-04-04 17:05:25 +02:00
Alex Kriuchykhin
bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281
...
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-03 11:39:59 +02:00
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
Oleksii Kriuchykhin
ffa7c5ecb2
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-02 16:38:53 +02:00
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01: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
b46f3566ef
Fix rendering of HTML in RTE fields [SCI-3111]
2019-03-19 23:32:24 +01:00
Oleksii Kriuchykhin
a822227383
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
6cd033767c
Fix comments form for new results [SCI-2877]
2018-11-21 23:48:43 +01:00
Luka Murn
84df2c81f9
Merge branch 'features/export-all'
...
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
6e6bb73d2f
Remove double initialization of comments on steps [SCI-2756]
2018-10-26 09:29:42 +02:00
mlorb
e5fca1b1cd
change the rich text max limit on frontend to 50000
2018-10-18 14:22:15 +02:00
Oleksii Kriuchykhin
b2bd1cb849
Upgrade to Turbolinks 5 [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e
Change icons throughout the rest of application [SCI-2445]
2018-07-27 15:27:08 +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
Luka Murn
cb6fe50832
Merge branch 'master' into ux-release-1
...
Conflicts:
app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
zmagod
ea4bd8831f
fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]
2018-04-10 13:19:53 +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
Mojca Lorber
a0f7030a70
fix bug with tinyMCE text validaton
2017-09-07 14:54:12 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
zmagod
d34b2520b5
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
2017-05-12 15:59:58 +02:00
zmagod
81a3cb0a41
adds results js code in modules
2017-05-11 16:54:28 +02:00
zmagod
a4032f5cc6
first run
2017-05-10 13:53:32 +02: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
Oleksii Kriuchykhin
0f860496a7
Fix image preview after saving of report [SCI-951]
2017-01-26 14:42:14 +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
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +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
ac52e643be
cleanup direct upload
2016-12-08 11:26:13 +01:00
zmagod
8ca7151df4
added constant to load_from_file_size_error local
2016-12-06 13:52:07 +01:00
zmagod
ef2471d3f7
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-05 10:44:58 +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
0e97bfc002
Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
bfe7c19f93
Refactored and added back button for tutorial for steps 14-15.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
33c96c9eee
Refactored and added back button for tutorial for steps 12-13.
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
Oleksii Kriuchykhin
d2491a18a4
Tutorial Save Protocol step added [SCI-571]
2016-11-11 10:06:18 +01:00
Matej Zrimšek
ece89da391
Removed ruby constants duplicates in JS, because of caching problems.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
05acf5a725
Replaced all Ruby constants instances in JS to be called from JS.
2016-10-17 11:57:46 +02:00
Jure Grabnar
1f67aec258
Prevent destroying protocols when file is edited
...
SCI-552 #close
2016-10-06 16:13:42 +02:00
zmagod
1eb9f772f4
refactor sciNote comments js and unified all comments behavior [fixes SCI-474]
2016-09-27 10:30:48 +02:00
zmagod
1cdfde827f
fixes protocol and results comments
2016-09-27 09:26:25 +02:00
Matej Zrimšek
234918a76d
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
2016-09-21 19:48:18 +02:00
zmagod
06b1992e94
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
2016-09-21 19:20:55 +02:00
zmagod
9f56df02d2
removes comment tab and add comment in the info tab [fixes SCI-436]
2016-09-20 18:53:51 +02:00
zmagod
42bbc47f5f
first working version
2016-09-20 17:06:07 +02:00
Matej Zrimšek
c2f0106993
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
2016-09-16 15:56:44 +02:00
zmagod
b9b466cd8e
Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas
2016-09-16 09:28:19 +02:00
Jure Grabnar
5c88bdeeae
Add formulas for readonly results tables
2016-09-13 09:44:17 +02:00
Jure Grabnar
e096f936f9
Add formulas to results
2016-09-13 09:44:17 +02:00
Matej Zrimšek
af8ab3e081
Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446].
2016-09-12 16:55:46 +02:00
Matej Zrimšek
b0ad6d0753
Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407].
2016-09-06 23:26:00 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Luka Murn
b533b0aca6
Fix another minor bug
2016-08-25 17:15:53 +02:00
Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
scibb
a76d82d188
delete and edit comments for projects, protocols, results, and workflow elements
2016-08-25 13:51:30 +02:00
Mojca Lorber
fb081be682
fixes warning messages when loading a new protocol that is linked with repository
2016-08-19 16:03:10 +02:00
Matej Zrimšek
e4a6a3944e
Added deleting of files on S3 server when editing/removing a file. Some refactoring.
2016-08-17 18:13:35 +02:00
Matej Zrimšek
ccdccc5cf1
Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.
2016-08-17 18:11:13 +02:00
Matej Zrimšek
c87ba5b45c
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +02:00
Matej Zrimšek
b70f49f4e0
Some additional refinements.
2016-08-17 18:00:04 +02:00
Matej Zrimšek
01aad1764c
Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring.
2016-08-17 17:54:45 +02:00
Matej Zrimšek
e2f94caa96
Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.
2016-08-17 17:54:06 +02:00
zmagod
76dd4bc90a
fixed protocol status bar [fixes SCI-318]
2016-08-16 10:47:23 +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