Commit graph

3370 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Martin Artnik
9c1948998d Revert "Fix Protocols.io modal not loading any protocols [SCI-9167]"
This reverts commit 983daa0e67.
2023-08-30 13:09:20 +02:00
aignatov-bio
f5235a9b9d
Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page
Add sticky scrolling to task page [SCI-8980]
2023-08-30 11:54:28 +02:00
Anton
6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
wandji
645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] (#6103) 2023-08-30 09:51:41 +02:00
sboursen-scinote
983daa0e67 Fix Protocols.io modal not loading any protocols [SCI-9167]
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
2023-08-29 14:26:07 +02:00
artoscinote
bb3a2f1c24
Fix applying resizable class [SCI-9137] (#6093) 2023-08-29 10:20:46 +02:00
aignatov-bio
0cbcfadec9
Merge pull request #6090 from aignatov-bio/ai-sci-9149-fix-tinymce-in-safari
Fix tinymce in safari [SCI-9149]
2023-08-28 15:20:24 +02:00
Anton
8d7aa2aba5 Fix tinymce in safari [SCI-9149] 2023-08-28 15:17:15 +02:00
Alex Kriuchykhin
165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00
artoscinote
953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors
Update 'Not started' status color at reports [SCI-9007]
2023-08-28 09:56:25 +02:00
Alex Kriuchykhin
a7aa06d18a
Fix error handling on new folder and project edit modals [SCI-9135] (#6082) 2023-08-28 09:37:11 +02:00
Ivan Kljun
90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
Soufiane
a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081)
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
2023-08-25 14:22:37 +02:00
wandji
962de09599
Add bootstrap-select to experiment clone modal and fix overflowing text [SCI-8559] (#6060)
* Add bootstrap-select to experiment clone modal and fix overflowing text [SCI-8559]
2023-08-24 15:49:22 +02:00
Alex Kriuchykhin
56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] (#6040) 2023-08-24 15:28:28 +02:00
Alex Kriuchykhin
2a228d3350
Remove obsolete JS code inclusion from protocol_status_bar [SCI-9134] (#6072) 2023-08-24 15:13:52 +02:00
Martin Artnik
0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
ivanscinote
059530620b
Implement delegated event handling for rel='external' [SCI-8737] (#6050)
* Replace tinymce target='_blank' with rel='external' [SCI-8737]

* Add noopener to rel='external' links
2023-08-24 11:12:11 +02:00
Anton
f964a7461d Move status block to secondary navigation [SCI-9027] 2023-08-23 14:03:41 +02:00
Alex Kriuchykhin
b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
artoscinote
f60243e424
Merge pull request #6041 from ivanscinote/SCI-9007-update-colors
Fix 'Not started' status button at missing locations [SCI-9007]
2023-08-22 15:19:05 +02:00
Ivan Kljun
28adb4956d Add 'Not started' btn to other views 2023-08-22 14:30:49 +02:00
wandji20
87f7a74e02 Use shareable link uuid for setting session storage value [SCI-9078] 2023-08-22 11:21:05 +01:00
wandji20
d46e80ba9b Hide welcome modal using sessionStorage after first page load of shared link [SCI-9078] 2023-08-22 10:59:02 +01:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
wandji
1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031)
* Fix css UI issues for shareable links task sharing [SCI-9080]
2023-08-21 16:07:38 +02:00
Anton
0780ed17b0 Fix conflicts 2023-08-21 11:34:34 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
ajugo
6de239547e
Merge pull request #6020 from sboursen-scinote/sb_SCI-9019
Table header not visible after creating a project/folder [SCI-9019]
2023-08-18 16:34:15 +02:00
sboursen-scinote
2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +02:00
artoscinote
20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications
Remove system notifications [SCI-8807]
2023-08-18 10:28:05 +02:00
artoscinote
45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057
Fix bug in new result table event delegation [SCI-9057]
2023-08-18 10:13:36 +02:00
artoscinote
c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-08-18 10:04:06 +02:00
wandji20
cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
Soufiane
4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Andrej
b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
wandji20
25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01:00
sboursen-scinote
d631098d9a Fix multiple issues with edit sequence on task protocol [SCI-8966]
- Fix edit button label and icon
- Fix preview modal for gene-sequence
2023-08-16 17:01:43 +02:00
Alex Kriuchykhin
975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
2023-08-16 15:34:57 +02:00
Alex Kriuchykhin
5eea990881
Merge pull request #5980 from wandji20/wb-SCI-9058
Move new and edit result asset inline Javascript to result_asset.js  [SCI-9058]
2023-08-16 15:34:21 +02:00
Ivan Kljun
1ea77b4ac8 Apply hound linter suggestions 2023-08-16 15:28:28 +02:00
Ivan Kljun
843cbb06da Fix trigger load and error event in active_storage_previews 2023-08-16 15:27:09 +02:00
wandji20
ebcb784149 Move result asset new and edit event handler to result asset and delete files [SCI-9058] 2023-08-16 13:50:40 +01:00
artoscinote
0062108996
Merge pull request #5984 from wandji20/wb-SCI-9043
Fix inventory item CSS and set nonce shared file preview inline JavaScript [SCI-9043]
2023-08-16 11:17:47 +02:00
Ivan Kljun
860a8efda7 Add moment.js to application.js.erb 2023-08-16 10:52:36 +02:00
Ivan Kljun
1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
wandji20
b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01:00
sboursen-scinote
dcaf55eeb2 Fix icon position for form password fields [SCI-9020] 2023-08-15 09:54:00 +02:00
wandji20
3fc5ac36b0 Set nonce for new and edit result asset inline javascript and fix image preview after editing [SCI-9058] 2023-08-14 16:48:00 +01:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
wandji20
e27c6174b4 Move unnecessary jquery style update to teams.scss stylesheet [SCI-9003] 2023-08-11 12:11:22 +01:00
wandji20
52fc7eb0e8 Fix Css issues [SCI-9003] 2023-08-11 10:45:51 +01:00
Alex Kriuchykhin
a4ea995027
Revert to using intermediate jquery_bundle file [SCI-9031] (#5962) 2023-08-10 17:19:28 +02:00
Alex Kriuchykhin
c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
Martin Artnik
16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
Martin Artnik
52eca4eba1 Require jQuery from node_modules 2023-08-10 12:11:22 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
Anton
2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
wandji
6c18a5a622
Fix issue previewing image after edit [SCI-8914] (#5908)
* Fix issue previewing image after edit [SCI-8914]
2023-08-09 10:38:01 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933)
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
Giga Chubinidze
73e35994d5 new icon changes 2023-08-09 04:19:57 +04:00
Martin Artnik
e0ceaa44cd Fix column resizing for existing inventories with no colSize data [SCI-8984] 2023-08-08 14:01:32 +02:00
Alex Kriuchykhin
ab758c747f
Merge pull request #5920 from sboursen-scinote/sb_SCI-8983
Shared task - Details - multiple issues [SCI-8983]
2023-08-08 11:42:14 +02:00
sboursen-scinote
7b2a752d60 Fix multiple issues with shared task [SCI-8983]
- Circumvent authentication by using direct URL Users' avatars
- Change wrong completed-on icon
- Parse dates in browser's format
2023-08-08 11:11:46 +02:00
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Alex Kriuchykhin
dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing
Merge features/protocol-parsing to develop
2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
aignatov-bio
be4bd7f038
Merge pull request #5922 from scinote-eln/features/remove-front-end-gems
Features/remove front end gems
2023-08-07 11:31:12 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
ajugo
6f76e86171
Implement results tab for shareable task link [SCI-8753] (#5910)
* Implement results tab for shareable task link [SCI-8753]
2023-08-07 10:45:52 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
Giga Chubinidze
a98137bb57 Date range in filters allows start date to be after end date [SCI-8796] 2023-08-03 11:58:34 +04:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
ivanscinote
5a531c98ae
Add callback to clear form errors at create wopi files [SCI-8927] (#5877)
* Add callback to clear form errors at create wopi files [SCI-8927]
2023-08-02 15:34:36 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
Soufiane
8d6c417936
Extract date formatting from user browser in shareable links views [SCI-8778] (#5889) 2023-08-01 10:38:00 +02:00
artoscinote
1c9bd53ff9
Merge pull request #5894 from G-Chubinidze/gc_SCI_8798
Remove text when option is chosen in dropdown selector in add member to team [SCI-8798]
2023-08-01 10:38:00 +02:00
Giga Chubinidze
413e806499 Remove text when option is chosen in dropdown selector in add member to team [SCI-8798] 2023-07-31 19:58:34 +04:00
wandji20
c5d6239e88 Fix issue with repository header changing when fetching data [SCI-8793] 2023-07-27 20:55:11 +01:00
Martin Artnik
ca503401fe Fix loading of column order if no sizes are present [SCI-8934] 2023-07-26 16:05:03 +02:00
Ivan Kljun
9278e887d6 Fix checkbox project select [SCI-8584] 2023-07-26 15:48:24 +02:00
ajugo
44c919d3dc
Implement shareable link task view [SCI-8752] (#5843)
* Implement shareable link task view [SCI-8752]
2023-07-26 15:19:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Martin Artnik
fa5cad935f Highlight code after saving result [SCI-8926] 2023-07-25 14:36:57 +02:00
Alex Kriuchykhin
026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00
Martin Artnik
7dd7566080 Fix updating repository checklist to a blank one [SCI-8921] 2023-07-25 12:21:35 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
sboursen-scinote
634d4b6066 Prefill the protocol name in modal when saving from template [SCI-8239] 2023-07-25 09:23:32 +02:00
ajugo
abda07bf4e
Merge pull request #5832 from sboursen-scinote/sb_SCI-8909
Fix manage modal issues [SCI-8909]
2023-07-21 12:13:36 +02:00
artoscinote
a88e66e12b
Merge pull request #5823 from artoscinote/ma_SCI_8733
Preserve column widths when showing/hiding columns [SCI-8733]
2023-07-21 10:33:58 +02:00
sboursen-scinote
e58a12da52 Fix manage modal issues [SCI-8909] 2023-07-21 09:36:10 +02:00
Alex Kriuchykhin
31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] (#5818) 2023-07-20 12:59:45 +02:00
Martin Artnik
c38d58336a Preserve column widths when showing/hiding columns [SCI-8733] 2023-07-20 09:49:29 +02:00
G-Chubinidze
b0c36452b7
Fix export action on project card dropdown [SCI-8833] (#5772)
* Fix export action on project card dropdown [SCI-8833]
2023-07-19 16:05:17 +02:00