scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
15535 commits 70 branches 179 tags 165 MiB
Commit graph

5229 commits

Author SHA1 Message Date
Martin Artnik 2503266b15
Merge pull request #6304 from sboursen-scinote/sb_SCI-8126-fix2 
Fix no-result placeholder position for archived project list [SCI-8126]
 2023-09-27 12:43:58 +02:00
Martin Artnik 3d04ed603f
Merge pull request #6302 from ivanscinote/SCI-9336-no-horizontal-scrollbar-on-protocol-label-templates-when-bottom-action-toolbar-is-displayed 
Fix horizotnal scrollbar position for protocol & label templates [SCI-9336]
 2023-09-27 12:43:04 +02:00
Martin Artnik 923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes 
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
 2023-09-27 12:41:34 +02:00
sboursen-scinote e446522e81 Fix no-result placeholder position for archived project list [SCI-8126] 2023-09-27 10:14:54 +02:00
Ivan Kljun d53e2e8a5a Fix horizotnal scrollbar position for protocol & label templates [SCI-9336] 2023-09-27 08:53:02 +02:00
Anton f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00
wandji20 213c752941 Improve UI for for exports in inventory with stock enabled [SCI-9225] 2023-09-26 15:20:18 +01:00
Andrej 701de269f2 Escape inventory column names [SCI-9362] 2023-09-26 14:19:17 +02:00
Andrej 1aa9b17b1a Add relationship column to the inventory [SCI-9356] 2023-09-26 11:12:45 +02:00
Oleksii Kriuchykhin d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Martin Artnik fba87cfc40
Merge pull request #6274 from G-Chubinidze/gc_SCI_9341 
Dot divider between steps/results [SCI-9341]
 2023-09-25 16:28:41 +02:00
Anton 2b676f249b Css Fixes 2023-09-25 14:15:08 +02:00
Giga Chubinidze 3cee796ac6 added spacings between dots 2023-09-25 14:56:06 +04:00
wandji 7dac5e63be
Add navigation section to item card [SCI-9154] (#6252) 2023-09-25 10:49:09 +02:00
wandji 5314ef14c7
Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284) 
This reverts commit 7430f2240d.
 2023-09-25 10:46:19 +02:00
Martin Artnik 3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
wandji 7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Anton 6c8447beac Fix status color 2023-09-22 14:46:10 +02:00
Alex Kriuchykhin 50a87b1562
Merge pull request #6235 from wandji20/wb-SCI-8914 
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
 2023-09-22 14:14:38 +02:00
Anton ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
wandji20 3dd7d0fdb3 Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914] 2023-09-22 09:36:07 +01:00
Giga Chubinidze add1a55e0d Dot divider between steps/results 2023-09-22 05:25:33 +04:00
Gregor Lasnibat 1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153] 
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
 2023-09-21 20:18:20 +02:00
Alex Kriuchykhin 5cc41451cd
Merge pull request #6254 from sboursen-scinote/sb_SCI-9133 
Fix missing icon files in exported projects [SCI-9133]
 2023-09-21 17:12:08 +02:00
sboursen-scinote aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
aignatov-bio af7bc2f11b
Merge pull request #6265 from aignatov-bio/ai-add-addons-to-tailwind 
Add addons to tailwind and label fixes
 2023-09-21 13:30:37 +02:00
Anton 97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
Anton 3d43c791ad Fix input fields globaly 2023-09-21 11:38:58 +02:00
aignatov-bio 2ab4d2b8dc
Merge pull request #6263 from aignatov-bio/ai-sci-9319-update-protocol-template-screen 
Update protocol template screen [SCI-9319]
 2023-09-21 10:39:16 +02:00
Anton 40144ea33f Update protocol template screen [SCI-9319] 2023-09-21 10:37:58 +02:00
aignatov-bio ecd00a4f4f
Merge pull request #6262 from aignatov-bio/ai-sci-9342-fix-task-details-section-css 
Task details css fixes [SCI-9342]
 2023-09-21 10:20:00 +02:00
Martin Artnik 2ad0d3a65f
Merge pull request #6260 from G-Chubinidze/gc_SCI_9289 
Result comments issues [SCI-9289]
 2023-09-21 10:01:30 +02:00
Martin Artnik 810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269 
CSS: Results revamp issues [SCI-9269]
 2023-09-21 10:00:14 +02:00
Anton ce2d91025c Task details css fixes [SCI-9342] 2023-09-21 09:48:46 +02:00
Giga Chubinidze eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Giga Chubinidze f0fdfe2ea3 Result comments issues 2023-09-21 06:21:50 +04:00
Anton 4cc968bcb2 Filters modal fixes [SCI-9276] 2023-09-20 11:07:48 +02:00
Alex Kriuchykhin 825f0e839f
Merge pull request #6250 from lasniscinote/gl_SCI_9226 
Fixed breaking table in shared view [SCI-9226]
 2023-09-19 14:33:26 +02:00
Anton ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Gregor Lasnibat ddc17c912f Fixed breaking table in shared view [SCI-9226] 2023-09-19 12:49:02 +02:00
Alex Kriuchykhin 2303b72f78
Merge pull request #6246 from lasniscinote/gl_SCI_9306 
Fix ESLint config/install v.01 [SCI-9306]
 2023-09-19 10:40:08 +02:00
Gregor Lasnibat 7a6b4ed359 Fix ESLint config/install v.01 [SCI-9306] 
Added yarn.lock [SCI-9306]
 2023-09-19 09:27:29 +02:00
Oleksii Kriuchykhin 3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
aignatov-bio e34de5511a
Merge pull request #6241 from aignatov-bio/ai-sci-more-css-fixes 
Fix css for protocol/results
 2023-09-18 15:39:06 +02:00
Anton 6228a3bc00 Fix css for protocol/results 2023-09-18 15:35:27 +02:00
Martin Artnik 9aa4274702
Merge pull request #6237 from lasniscinote/gl_SCI_9188 
Fixed misplaced checkbox for archived task [SCI-9188]
 2023-09-18 14:42:00 +02:00
ajugo 8c1292c8ab
Merge pull request #6239 from rekonder/aj_SCI_9288 
Change dropdown options for importing protocols [SCI-9288]
 2023-09-18 14:24:10 +02:00
Gregor Lasnibat 6efdc75f45 Fixed misplaced checkbox for archived task [SCI-9188] 
Fixed linter issues [SCI-9188]
 2023-09-18 13:41:58 +02:00
Andrej aebea07be4 Change dropdown options for importing protocols [SCI-9288] 2023-09-18 13:15:55 +02:00
Gregor Lasnibat 90c85290d6 Fixed styles for the clear button on activities [SCI-9192] 
PR fix 01 [SCI-9192]
 2023-09-18 13:05:43 +02:00
wandji20 996e3b1d9a Fix issue loading iframe modal in session_layouts [SCI-9310] 2023-09-18 10:28:19 +01:00
Martin Artnik 1068f9b979
Merge pull request #6232 from ivanscinote/SCI-9235-table-horizontal-scroller-when-bottom-action-toolbar-is-opened 
Make bottom scrollbar visible with action toolbar at inventories [SCI-9235]
 2023-09-18 09:32:05 +02:00
Ivan Kljun 13715fa472 Make bottom scrollbar visible with action toolbar at inventories [SCI-9235] 2023-09-15 15:08:09 +02:00
aignatov-bio 5258e55d00
Merge pull request #6230 from aignatov-bio/ai-sci-9265-update-flyouts-menu-task-results 
Replace flyouts menu in protocol in results [SCI-9265]
 2023-09-15 14:40:55 +02:00
Oleksii Kriuchykhin 36f4e22fa3 Merge branch 'develop' into features/october-release 2023-09-15 14:08:45 +02:00
Anton b0dc63ebb5 Replace flyouts menu in protocol in results [SCI-9265] 2023-09-15 12:39:56 +02:00
wandji20 0b0eddd62b Add default columns to inventory item card [SCI-9151] 2023-09-15 11:39:42 +01:00
Alex Kriuchykhin 7f4b147a1f
Merge pull request #6204 from sboursen-scinote/sb_SCI-8126-fix 
Fix issues with the you've reached the end of the list banner [SCI-8126]
 2023-09-15 12:38:15 +02:00
Oleksii Kriuchykhin 4e16d702bd Fix next page loading for global and task activities [SCI-9175] 2023-09-15 12:34:27 +02:00
Martin Artnik 58d5192d1d
Merge pull request #6220 from ivanscinote/SCI-9190-new-already-read-comment-indicator 
Fix comment-counter 'seen' badge color [SCI-9190]
 2023-09-15 09:17:56 +02:00
Ivan Kljun af18a42129 Add constants for status state polling [SCI-9304] 2023-09-14 16:21:17 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Ivan Kljun 9e3b6328a4 Fix comment-counter 'seen' badge color [SCI-9190] 2023-09-14 13:03:43 +02:00
Anton 4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
wandji e0ed027211
Fix css issues in manage tags modal [SCI-9168] (#6208) 2023-09-13 15:00:04 +02:00
aignatov-bio 4aaf3818d5
Merge pull request #6210 from aignatov-bio/ai-sci-9261-fix-activties-header-background 
Fix layout on task activities page [SCI-9261]
 2023-09-13 14:35:44 +02:00
Ivan Kljun 01a909c9e7 Fix eye icon placement in password fields [SCI-9217] 2023-09-13 14:16:52 +02:00
Anton d34608d22c Fix layout on task activties page [SCI-9261] 2023-09-13 14:08:39 +02:00
Anton 3268a95ecf Fix text field width and table header [SCI-9149] 2023-09-13 14:03:49 +02:00
Martin Artnik cb28c4d566
Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results 
Fixed shared task to work with new results [SCI-9250]
 2023-09-13 13:43:30 +02:00
Martin Artnik 631d987b92
Merge pull request #5909 from G-Chubinidze/gc_SCI_8796 
Date range in filters allows start date to be after end date [SCI-8796]
 2023-09-13 13:37:03 +02:00
sboursen-scinote f436f7912c Fix issues with the you've reached the end of the list banner [SCI-8126] 2023-09-13 12:11:43 +02:00
aignatov-bio 637093f69e
Merge pull request #6188 from aignatov-bio/ai-sci-9254-fix-inline-edit 
Fix inline edit [SCI-9254]
 2023-09-13 09:59:50 +02:00
wandji 58bce55f91
Fix css issues in manage tags modal [SCI-9168] (#6189) 2023-09-12 13:46:22 +02:00
G-Chubinidze 067d0ca51e
Merge branch 'features/september-release' into gc_SCI_9105 2023-09-12 02:19:02 +04:00
Giga Chubinidze 4dc8273a4e hound fix 2023-09-12 02:17:12 +04:00
Giga Chubinidze 46af9af0a9 Implement results expand/collapse, and expand/collapse all [SCI-9105] 2023-09-12 02:11:58 +04:00
Anton 982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +02:00
sboursen-scinote bebae64944 Update OVE promo [SCI-8968] 
- Move OVE promo to addons
- Update text and style of the promo
- Fix the iFrame closing logic
 2023-09-11 16:42:50 +02:00
Anton 67c6d66ff1 Fixing inline edit [SCI-9254] 2023-09-11 15:58:53 +02:00
aignatov-bio daa708a840
Merge pull request #6183 from aignatov-bio/ai-sci-fix-css-task-results 
CSS fixed for task protocol
 2023-09-11 15:57:36 +02:00
wandji 1631de67ea
Fix issue opening dropdown when typing [SCI-9172] (#6171) 2023-09-11 15:29:27 +02:00
Ivan Kljun dfaa91c682 Fixed shared task to work with new results [SCI-9250] 2023-09-11 15:19:22 +02:00
Anton 3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Martin Artnik e74597d112 Keep asset image tooltip aspect ratio [SCI-9277] 2023-09-08 16:17:02 +02:00
Gregor Lasnibat d029b54291 Fix shared task issues [SCI-9226] 2023-09-08 00:03:01 +02:00
Gregor Lasnibat c82a1b1108 Fix shared task issues [SCI-9226] 2023-09-07 21:04:01 +02:00
Gregor Lasnibat 93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42:37 +02:00
wandji a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092) 
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
 2023-09-07 13:12:27 +02:00
aignatov-bio d2c0e3dca2
Merge pull request #6160 from aignatov-bio/ai-sci-9230-fix-navigator-css 
Fix navigator CSS [SCI-9230][SCI-9233]
 2023-09-07 12:03:07 +02:00
Martin Artnik 722ef7cc0f
Merge pull request #6158 from ivanscinote/SCI-8592-long-name-experiment-modal 
Fix long name experiment modal [SCI-8592]
 2023-09-07 10:49:53 +02:00
Anton 8f9072f46e Fix navigator CSS [SCI-9230][SCI-9233] 2023-09-07 10:45:50 +02:00
Martin Artnik d9e8be91d9
Merge pull request #6153 from artoscinote/ma_SCI_9212 
Fix status flow loading when modal opens [SCI-9212]
 2023-09-07 10:37:25 +02:00
Ivan Kljun 368a6f62ea Fix long names also for canvas view modal [SCI-8592] 2023-09-07 10:09:18 +02:00
Giga Chubinidze 13fc4cceb1 hound fix 2023-09-07 03:59:11 +04:00
Giga Chubinidze c071eb4c16 Implement inline edit design changes for legacy inline edit (PET titles, etc.) 2023-09-07 03:56:42 +04:00
Martin Artnik f22d777c2c Fix status flow loading when modal opens [SCI-9212] 2023-09-06 15:33:58 +02:00
Anton 1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
wandji dfce1e1382
Fix issue previewing large image after edit [SCI-8914] (#6143) 2023-09-06 11:43:51 +02:00
Martin Artnik 3b3e3cdc46
Merge pull request #6138 from ivanscinote/SCI-8592-long-name-experiment-modal 
Fix long names being cut off at move task modal [SCI-8592]
 2023-09-06 11:39:26 +02:00
Martin Artnik 33cd529967
Merge pull request #6144 from G-Chubinidze/gc_SCI_8798_v2 
Remove text when option is chosen in dropdown selector in add member to team [SCI-8798]
 2023-09-06 11:38:56 +02:00
aignatov-bio b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework 
Rework inline edit vue component UI [SCI-9016]
 2023-09-06 10:49:18 +02:00
Giga Chubinidze 6ade210728 Remove text when option is chosen in dropdown selector in add member to team [SCI-8798] 2023-09-05 19:07:18 +04:00
Anton 48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Ivan Kljun c2b686324f Fix long names being cut off at move task modal [SCI-8592] 2023-09-05 15:58:50 +02:00
Ivan Kljun a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Alex Kriuchykhin f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
Ivan Kljun 86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
artoscinote cdfe9aaa0c
Revert "Don't display icons in fields with errors (alignment issues) [SCI-9217]" 2023-09-05 09:21:40 +02:00
Martin Artnik cc29ca4cce Don't display icons in fields with errors (alignment issues) [SCI-9217] 2023-09-04 15:17:22 +02:00
Anton 86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Ivan Kljun 40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
Martin Artnik cb023cd9c8 Add back status_flow.scss, deleted by accident 2023-09-01 13:59:58 +02:00
artoscinote 7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185 
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
 2023-09-01 11:40:34 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Giga Chubinidze 100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
G-Chubinidze 7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104) 
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
 2023-08-30 15:42:55 +02:00
Anton e9cd01467d Add custom colors to tailwind config [SCI-9124] 2023-08-30 13:21:51 +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
Anton 171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +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
ajugo db4aa53f72
Merge pull request #5993 from sboursen-scinote/sb_SCI-9038 
Set sequence attachments file icon [SCI-9038]
 2023-08-25 21:53:22 +02:00
Ivan Kljun 90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
Anton 6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
wandji f4c48fe907
Fix label templates datatables height overflow [SCI-8559] (#6083) 2023-08-25 14:23:05 +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
sboursen-scinote 0d7c9862ee Set sequence attachment icons [SCI-9038] 
- Fix edit action
- Add OVE icon to step attachment
- Add OVE icon to global search results
 2023-08-25 13:53:57 +02:00
Soufiane bed603c5d5
Fix design of sign in and signature modal [SCI-9109] (#6074) 2023-08-24 15:50:05 +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
ajugo 9d051556ec
CSS fixes for assigned items to task and task comment number [SCI-9104] (#6068) 2023-08-24 15:21:54 +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
artoscinote 97f406d0a8
Merge pull request #6063 from G-Chubinidze/gc_SCI_7976 
Fix gray background on tox button [SCI-7976]
 2023-08-24 11:08:13 +02:00
Giga Chubinidze 584a746018 Fix gray background on tox button [SCI-7976] 2023-08-24 09:47:24 +04:00
sboursen-scinote 51d491dc0a Fix multiple issues for August release [SCI-9093] 
- Restore draft background color is missing in RTE
- Shorten the Import item modal dropdown field
 2023-08-23 18:33:10 +02:00
wandji 207b302a03
Set margin for module protocol task content [SCI-9018] (#6044) 2023-08-23 15:59:11 +02:00
Anton d99ba04e39 Move status flow css to independent scope [SCI-9027] 2023-08-23 15:37:18 +02:00
Anton f964a7461d Move status block to secondary navigation [SCI-9027] 2023-08-23 14:03:41 +02:00
wandji 71bcc78243
Verify sequence asset preview for non-editable role and add css class [SCI-8967] (#6012) 
* Verify sequence asset preview for non-editable user role and add css class [SCI-8967]

* Add safe navigation operator when checking gene sequence blob meta asset_type [SCI-9867]
 2023-08-23 13:12:46 +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 e4ad77f00f
Merge pull request #6043 from G-Chubinidze/gc_SCI_7976 
Fixed gray background on tinymce crop button [SCI-7976]
 2023-08-22 16:35:59 +02:00
Giga Chubinidze 74c1691ae6 Fixed gray background on tinymce crop button 2023-08-22 18:33:09 +04:00
Anton beed1cdb9d Make top navigation and breadcrumbs collapsable [SCI-9090] 2023-08-22 16:24:34 +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
G-Chubinidze 1253511020
Merge pull request #6035 from G-Chubinidze/gc_SCI_9014 
Add thumbnail asset preview to list view assets [SCI-9014]
 2023-08-22 12:22:06 +04:00
Giga Chubinidze 76479f6bf7 hound fix 2023-08-22 06:02:30 +04:00
Giga Chubinidze c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04: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
wandji20 b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01: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
aignatov-bio 58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names 
Fix long task names [SCI-8536]
 2023-08-21 11:18:53 +02:00
Anton d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559 
Fix CSS Issues[SCI-8559]
 2023-08-21 11:05:38 +02:00
wandji20 7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
aignatov-bio 33476403a5
Merge pull request #6025 from aignatov-bio/ai-sci-9085-fix-report-css 
Fix report css [SCI-9085]
 2023-08-21 10:12:31 +02:00
Anton ded0ac1b9f Fix report css [SCI-9085] 2023-08-21 09:54:35 +02:00
artoscinote 3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors 
Add .btn-not-started to task status flow modal [SCI-9007]
 2023-08-18 17:37:48 +02:00
Ivan Kljun f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +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
ajugo dcdbfefa91
Merge pull request #6011 from sboursen-scinote/sb_SCI-9066 
Fix small css issues [SCI-9066]
 2023-08-18 11:17:34 +02:00
Ivan Kljun ca35e13893 Merge remote-tracking branch 'upstream/features/september-release' into SCI-8925-show-paragraphs-checklist 2023-08-18 11:12:49 +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 664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors 
Update status and shared buttons design to Amanda [SCI-9007]
 2023-08-18 10:12:26 +02:00
artoscinote 35c0de4cef
Merge pull request #5882 from G-Chubinidze/gc_SCI_8933 
Fixed Inventory Calendar Header [SCI-8933]
 2023-08-18 10:07:32 +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
sboursen-scinote a38158c788 Fix small css issues [SCI-9066] 2023-08-17 22:23:46 +02:00
artoscinote 2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003 
Fix CSS style issues [SCI-9003]
 2023-08-17 15:48:07 +02:00
Soufiane 4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Ivan Kljun e3f111debc Remove whitespace 2023-08-17 15:31:04 +02:00
Ivan Kljun b96dc345dd Apply hound linter suggestions 2023-08-17 15:29:22 +02:00
ajugo dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987 
Fix micro-interactions for shareable links modals [SCI-8987]
 2023-08-17 15:28:43 +02:00
sboursen-scinote ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
Ivan Kljun 400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
Andrej b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
wandji20 4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01: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
Anton 1d21b40479 Fix long project and task names in report [SCI-9061] 2023-08-16 14:16:54 +02:00
Anton 005779b3d3 Fix long project and task names in report [SCI-9061] 2023-08-16 14:12:47 +02: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
artoscinote 92d2850800
Merge pull request #5985 from G-Chubinidze/gc_SCI_8725 
Reports table: changed minimum width to accommodate shrunk screen [SCI-8725]
 2023-08-16 11:17:15 +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
artoscinote b2b4c30ee2
Merge pull request #5978 from artoscinote/ma_SCI_8846 
Repository table fixes [SCI-8846]
 2023-08-16 10:17:45 +02:00
Giga Chubinidze 55235969a7 changed minimum width to accomodate screen shrink 2023-08-16 10:22:20 +04: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
Martin Artnik 0471859545 Repository table fixes [SCI-8846] 2023-08-11 15:47:18 +02:00
Anton 6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
artoscinote a5f14a8333
Merge pull request #5970 from wandji20/wb-SCI-9003 
Fix Css issues [SCI-9003]
 2023-08-11 13:13:51 +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
sboursen-scinote 55e73dbfe9 Fix multiple CSS issues [SCI-9020] 2023-08-11 11:28:55 +02: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
artoscinote d1ea9f30cf
Merge pull request #5953 from artoscinote/ma_SCI_9005 
Add missing datatables css [SCI-9005]
 2023-08-10 10:53:53 +02:00
ajugo 2ddb43c2ea
Merge pull request #5850 from sboursen-scinote/sb_SCI-8842 
Update illustrations [SCI-8842]
 2023-08-10 10:53:41 +02:00
Martin Artnik f53696977c Add missing datatables css [SCI-9005] 2023-08-10 10:48:56 +02:00
sboursen-scinote d97035988a Move images to public folder [SCI-8842] 2023-08-10 10:33:35 +02:00
Soufiane aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936) 
- Centre vertically all related modals
- Convert task header tabs to sentence case
 2023-08-10 09:43:31 +02:00
wandji20 b4657e534a Fix CSS Issues[SCI-8559] 2023-08-10 08:11:07 +01:00
ajugo 0224f420b1
Merge pull request #5946 from sboursen-scinote/sb_SCI-9002 
Fix Shared task CSS [SCI-9002]
 2023-08-09 17:02:59 +02:00
Martin Artnik a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
sboursen-scinote d5240f4620 Fix Shared task CSS [SCI-9002] 
- Remove hover effect from step RTF elements
- Fix the styling of the assigned items datatable.
 2023-08-09 16:09:45 +02:00
artoscinote c4afa7064b
Merge pull request #5938 from G-Chubinidze/gc_SCI_8725 
Sorting icons are visible in table header row [SCI-8725]
 2023-08-09 15:59:34 +02:00
Anton 2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
aignatov-bio 04aa835251
Merge pull request #5941 from aignatov-bio/ai-sci-8951-reafctor-task-layout 
Refactor task page UX [SCI-8951]
 2023-08-09 11:13:26 +02:00
Anton f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +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 780da16dde Sorting icons are visible in table header row [SCI-8725] 2023-08-09 04:57:01 +04: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
Martin Artnik 4f85a6b723 Remove deleted file from import list 2023-08-08 10:50:36 +02:00
Anton 758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
Martin Artnik fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00