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

11646 commits

Author SHA1 Message Date
Martin Artnik b4ce0dda60
Merge pull request #6316 from artoscinote/ma_SCI_9400 
Add back version modal link [SCI-9400]
 2023-10-03 10:54:47 +02:00
wandji20 5f5a170827 Fix counter issue in repository export modal [SCI-9165] 2023-10-03 09:49:57 +01:00
Martin Artnik 03d6d99f7e
Merge pull request #6323 from G-Chubinidze/gc_SCI_9332 
Smart annotation modal: inventory name not correct [SCI-9332]
 2023-10-03 10:39:23 +02:00
Giga Chubinidze de2023c873 removed unnecessary tw classes 2023-10-03 12:38:40 +04:00
Alex Kriuchykhin 40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386 
Refactor export stock consumption modal [SCI-9386]
 2023-10-03 10:33:00 +02:00
Alex Kriuchykhin 42b145648f
Merge pull request #6276 from wandji20/wb-SCI-9359 
Update OVE package and fix bug opening github issue link [SCI-9359]
 2023-10-03 10:18:11 +02:00
Oleksii Kriuchykhin d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Andrej 835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Andrej 1aa9091e0d Fix protocol parser import button closing [SCI-9275] 2023-10-03 09:13:20 +02:00
Giga Chubinidze f99db28760 using tailwind 2023-10-03 11:04:38 +04:00
wandji20 7b9e4088de Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-02 23:33:46 +01:00
Gregor Lasnibat a5ad6d375e Fixed repositoryItemSidebar wrapper covering up content when closed [SCI-9354] 2023-10-02 17:00:47 +02:00
Martin Artnik f620a99577 Fix checking asset blob permissions [SCI-9353] 2023-10-02 16:18:29 +02:00
Martin Artnik a2870dd9d1 Add back version modal link [SCI-9400] 2023-10-02 14:31:28 +02:00
Alex Kriuchykhin 20be895938
Merge pull request #6325 from rekonder/aj_SCI_9275 
Fix closing of the dropdown menu for protocol parser import [SCI-9275]
 2023-10-02 13:58:50 +02:00
Alex Kriuchykhin c4f646ef78
Merge pull request #6324 from rekonder/aj_SCI_9409 
Fix marvinjs loading and speedup creating of the wopi files [SCI-9409]
 2023-10-02 13:58:30 +02:00
G-Chubinidze fbdd5a8165
Revert "Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]" 2023-10-02 12:28:29 +04:00
Andrej 4cf6d225ca Fix closing of the dropdown menu for protocol parser improt [SCI-9275] 2023-10-02 08:57:26 +02:00
Andrej e1ca9175b7 Fix marvinjs loading and speedup creating of the wopi files [SCI-9409] 2023-10-02 08:32:50 +02:00
Giga Chubinidze 3932b22cd4 Smart annotation modal: inventory name not correct [SCI-9332] 2023-10-02 08:14:16 +04:00
Giga Chubinidze b2bc968a4f CSS: Blank name error message on table [sci-9401] 2023-10-02 07:41:31 +04:00
Ivan Kljun b0511ecec5 Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403] 2023-09-29 14:43:12 +02:00
Martin Artnik 295de7b0bc Implement default name for results [SCI-9425] 2023-09-29 13:01:41 +02:00
Martin Artnik a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2 
DOCX not working if result name empty. [SCI-9245]
 2023-09-29 12:24:18 +02:00
Giga Chubinidze 0be8ab5839 used i18n 2023-09-29 14:18:45 +04:00
Martin Artnik 80c23bd0fc
Merge pull request #6318 from artoscinote/ma_SCI_9328 
Fix linked protocol info button position [SCI-9328]
 2023-09-29 12:11:39 +02:00
Martin Artnik 0cb3c8bc62
Merge pull request #6313 from G-Chubinidze/gc_SCI_9324 
Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]
 2023-09-29 11:49:26 +02:00
Martin Artnik 4f2f5d156b Fix linked protocol info button position [SCI-9328] 2023-09-29 11:45:04 +02:00
Giga Chubinidze 005bf93197 Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324] 2023-09-29 11:51:25 +04:00
Giga Chubinidze 07ce65f5e6 DOCX not working if result name empty. 2023-09-29 10:38:27 +04:00
Martin Artnik 7319ac5b50
Merge pull request #6310 from artoscinote/ma_SCI_9328 
Fix linked protocol dropdown [SCI-9328]
 2023-09-28 15:46:37 +02:00
Martin Artnik 82b9b676b6 Fix linked protocol dropdown [SCI-9328] 2023-09-28 15:40:48 +02:00
Martin Artnik 6e405d40a6 Refactor datepicker limits [SCI-9338] 2023-09-28 13:33:17 +02:00
Gregor Lasnibat f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354] 
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
 2023-09-28 13:21:20 +02:00
Alex Kriuchykhin ba5ef94764
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp 
Add assigned tasks block to the item card [SCI-9155]
 2023-09-27 15:03:20 +02:00
Martin Artnik a499a0f0ea
Merge pull request #6307 from artoscinote/ma_SCI_9338 
Fix datepicker min/max limits [SCI-9338]
 2023-09-27 14:53:55 +02:00
Alex Kriuchykhin 8c1b09791d
Merge pull request #6306 from artoscinote/ma_SCI_9353 
Fix for downloading assets not in current user team [SCI-9353]
 2023-09-27 14:53:20 +02:00
Martin Artnik 99dd94e21f Fix datepicker min/max limits [SCI-9338] 2023-09-27 14:46:48 +02:00
Martin Artnik d86da2d145
Merge pull request #6207 from ivanscinote/SCI-9217-eye-icons-out-of-placeholder-placeholder-height 
Fix eye icon placement in password fields [SCI-9217]
 2023-09-27 14:19:41 +02:00
Martin Artnik 2edba4e188 Fix for downloading assets not in current user team [SCI-9353] 2023-09-27 14:13:34 +02:00
Martin Artnik 3ce0779663
Merge pull request #6290 from ivanscinote/SCI-9344-sticky-toolbar-issues 
Fix results sticky toolbar [SCI-9344]
 2023-09-27 14:03:12 +02:00
Martin Artnik 5da684e959
Merge pull request #6178 from artoscinote/ma_SCI_9277 
Keep asset image tooltip aspect ratio [SCI-9277]
 2023-09-27 13:40:45 +02:00
Martin Artnik d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299 
OVE - Activities related to Task result [SCI-9299]
 2023-09-27 12:49:58 +02:00
Giga Chubinidze b53ac04577 styling fix 2023-09-27 14:47:35 +04:00
Martin Artnik c6272afe27
Merge pull request #6264 from ivanscinote/SCI-9247-ensure-team-export-works-with-new-results 
Ensure team export works with new results [SCI-9247]
 2023-09-27 12:46:52 +02:00
Martin Artnik a8bdbc5faa
Merge pull request #6305 from ivanscinote/SCI-9349-a-new-office-file-added-to-existing-result-will-be-created-in-a-new-result 
Fix bug for  adding Office files to a result [SCI-9349]
 2023-09-27 12:45:36 +02:00
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
Martin Artnik 9b2e5b6455
Merge pull request #6289 from G-Chubinidze/gc_SCI_9289 
Removed delete/edit comment access on archived results [SCI-9289]
 2023-09-27 12:41:03 +02:00
Andrej 5e5010632d Fix naming in assigned my module helper [SCI-9155] 2023-09-27 11:44:08 +02:00
Ivan Kljun 0b069430db Fix bug for adding Office files to a result [SCI-9349] 2023-09-27 10:55:03 +02:00
Martin Artnik 187c8b12f9
Merge pull request #6296 from ivanscinote/SCI-9346-cannot-insert-a-chemical-drawing-into-results 
Add hidden element to support legacy code for MarvinJS at results [SCI-9346]
 2023-09-27 10:43:25 +02:00
sboursen-scinote e446522e81 Fix no-result placeholder position for archived project list [SCI-8126] 2023-09-27 10:14:54 +02:00
Alex Kriuchykhin 9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225 
Improve UI for stock consumption export [SCI-9225]
 2023-09-27 09:21:22 +02:00
Alex Kriuchykhin dc40b4354d
Merge pull request #6298 from okriuchykhin/ok_SCI_9282 
Fix column placement in stock consumption export, add missing localization [SCI-9282]
 2023-09-27 09:20:00 +02:00
Ivan Kljun d53e2e8a5a Fix horizotnal scrollbar position for protocol & label templates [SCI-9336] 2023-09-27 08:53:02 +02:00
Giga Chubinidze da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04: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
Alex Kriuchykhin 8cf26d7a90
Merge pull request #6283 from rekonder/aj_SCI_9162 
Fix css for importing inventory [SCI-9162]
 2023-09-26 15:07:15 +02:00
Andrej 701de269f2 Escape inventory column names [SCI-9362] 2023-09-26 14:19:17 +02:00
Oleksii Kriuchykhin efae35816f Fix column placement in stock consumption export, add missing localization [SCI-9282] 2023-09-26 13:35:02 +02:00
Ivan Kljun 1373994559 Fix results sticky toolbar [SCI-9344] 2023-09-26 12:20:49 +02:00
Andrej 9641c75a4a Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275 2023-09-26 11:23:25 +02:00
Oleksii Kriuchykhin d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Ivan Kljun f16354e498 Add hidden element to support legacy code for MarvinJS at results [SCI-9346] 2023-09-26 10:09:45 +02:00
Martin Artnik a1cbfa9736
Merge pull request #6295 from ivanscinote/SCI-9333-import-dropdown-always-open-on-protocol-templates 
Fix dropdown always open on protocol templates [SCI-9333]
 2023-09-26 10:06:55 +02:00
Ivan Kljun 0794b4bdc7 Fix dropdown always open on protocol templates [SCI-9333] 2023-09-26 09:11:54 +02:00
Alex Kriuchykhin 2771c04257
Merge pull request #6288 from rekonder/aj_SCI_9367 
Fix comment permission check [SCI-9367]
 2023-09-25 17:14:29 +02:00
Martin Artnik 80afa31632
Merge pull request #6293 from aignatov-bio/ai-sci-9375-add-selected-state-for-dropdown 
Add assets_view_mode for result [SCI-9375]
 2023-09-25 16:44:18 +02:00
Anton 254b55772d Add assets_view_mode for result [SCI-9375] 2023-09-25 16:43:14 +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 2b9ae65a51 Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379] 2023-09-25 15:04:41 +02:00
Anton 2b676f249b Css Fixes 2023-09-25 14:15:08 +02:00
Gregor Lasnibat 4e6646e3f9 Added a missing RepositoryTimeValue component [SCI-9153-v2] 
PR fix [SCI-9153-v2]

PR fix 02 [SCI-9153-v2]
 2023-09-25 14:02:05 +02:00
Giga Chubinidze 4d3c0dd919 Removed delete/edit comment access on archived results [SCI-9289] 2023-09-25 15:33:36 +04:00
Giga Chubinidze 3cee796ac6 added spacings between dots 2023-09-25 14:56:06 +04:00
Andrej 4e6ccce9dd Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 11:49:51 +02:00
Andrej e0355bd75a Fix generation of labels [SCI-9155] 2023-09-25 11:47:30 +02:00
Andrej ce1fe53ceb Fix comment permission check [SCI-9367] 2023-09-25 11:14:22 +02: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
aignatov-bio 647d94bebc
Merge pull request #6279 from aignatov-bio/ai-sci-9343-improve-flyouts 
Fixes for new flyout [SCI-9343]
 2023-09-25 10:15:11 +02:00
wandji 7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Andrej 65affdf639 Fix css for importing inventory [SCI-9162] 2023-09-25 09:06:13 +02:00
Martin Artnik 3f23d10462
Merge pull request #6281 from G-Chubinidze/gc_SCI_9326 
Thumbnail previews on attachments that cannot generate a preview. [SCI-9326]
 2023-09-25 09:05:38 +02:00
Andrej 9ca96145d5 Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 08:05:28 +02:00
Andrej 2478918aa6 Fix protocol parser flyout and notifications [SCI-9275] 2023-09-25 07:55:43 +02:00
Giga Chubinidze 5bae359b91 Thumbnail previews on attachments that cannot generate a preview. 2023-09-25 06:30:34 +04:00
Anton 5b434c4e4c Fixes for new flyout [SCI-9343] 2023-09-23 19:15:35 +02:00
wandji 767c98c101
Add barcode and print label to item card [SCI-9156] (#6269) 
* Add barcode and print label to item card [SCI-9156]

* Rename wrong label [SCI-9156]
 2023-09-22 16:17:42 +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
Alex Kriuchykhin c817c269cb
Merge pull request #6270 from lasniscinote/gl_SCI_9153 
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
 2023-09-22 14:13:54 +02:00
aignatov-bio a19a2d16e9
Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions 
Refactor checklist [SCI-9340]
 2023-09-22 12:09:41 +02:00
Anton 01e4ab3cd5 Removed variable 2023-09-22 12:07:56 +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
sboursen-scinote adc0a460bd Improve logic for custom logos on error pages [SCI-9147] 
- Switch to dynamic ERB templates.
- Move text to I18n
 2023-09-22 10:26:32 +02:00
Anton 566705cb67 Small fixes [SCI-9340] 2023-09-22 10:07:29 +02:00
Anton 77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02: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
Ivan Kljun 84d3c8a279 Fix team import/export to work with new result [SCI-9247] 2023-09-21 14:23:33 +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
sboursen-scinote 90b9813083 Remove the Experiment ID displayed in the three dots menu dropdown [SCI-9215] 2023-09-21 11:38:09 +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
Alex Kriuchykhin 04e191e377
Merge pull request #6259 from wandji20/wb-SCI-9191 
Fix issue displaying long tables protocol description in import modal [SCI-9191]
 2023-09-21 09:26:25 +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
Alex Kriuchykhin 8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272 
Fix message for successful import protocol from protocol parser [SCI-9272]
 2023-09-20 19:36:12 +02:00
wandji20 ca8e6d88dc Fix issue displaying long tables protocol description in impor modal [SCI-9191] 2023-09-20 15:04:10 +01:00
Martin Artnik 5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348 
Clean up legacy comment logic [SCI-9348]
 2023-09-20 13:10:28 +02:00
aignatov-bio 1233c34fb2
Merge pull request #6257 from aignatov-bio/ai-sci-9305-fix-task-secondary-navigation-on-small-screens 
Fix task secondary navigation on small screens [SCI-9305]
 2023-09-20 13:10:22 +02:00
Martin Artnik 44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton d46ee2adf6 Fix task secondary navigation on small screens [SCI-9305] 2023-09-20 12:30:15 +02:00
Anton 4cc968bcb2 Filters modal fixes [SCI-9276] 2023-09-20 11:07:48 +02:00
aignatov-bio b84ff233f2
Merge pull request #6249 from aignatov-bio/ai-sci-9283-inline-editing-issues 
Fix inline editing [SCI-9283]
 2023-09-20 10:08:16 +02:00
Andrej b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
Andrej 56a57233df Add assigned tasks block to the item card [SCI-9155] 2023-09-19 15:40:32 +02:00
Alex Kriuchykhin 378c4c3cab
Merge pull request #6251 from okriuchykhin/ok_SCI_9327 
Fix rendering of tables with broken metadata in docx reports [SCI-9327]
 2023-09-19 14:35:34 +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
Oleksii Kriuchykhin b32f163cdc Fix rendering of tables with broken metadata in docx reports [SCI-9327] 2023-09-19 14:25:40 +02:00
Anton dd17b46667 Fix inline editing 2023-09-19 13:56:07 +02:00
aignatov-bio dcce202f78
Merge pull request #6248 from aignatov-bio/ai-sci-9274-fix-legacy-inline-editing 
Fix legacy inline editing [SCI-9274]
 2023-09-19 13:49:13 +02:00
aignatov-bio 5626bdef4b
Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi 
Fix wopi and pdf preview [SCI-9260]
 2023-09-19 13:17:42 +02:00
Anton ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Martin Artnik bde1434923
Merge pull request #6245 from G-Chubinidze/gc_SCI_9300 
Add activities for moving content between steps and results [SCI-9300]
 2023-09-19 13:06:08 +02:00
Gregor Lasnibat ddc17c912f Fixed breaking table in shared view [SCI-9226] 2023-09-19 12:49:02 +02:00
Anton 370508304b Fix wopi and pdf preview [SCI-9260] 2023-09-19 12:44:28 +02:00
Giga Chubinidze b414cc4295 fixed hound and changed logic for ove to marvin 2023-09-19 12:50:45 +04: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
Alex Kriuchykhin 7825433ac2
Merge pull request #6242 from rekonder/aj_SCI_9273 
Insert the correct link for protocol parser import in the email notification [SCI-9273]
 2023-09-19 09:54:05 +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
Giga Chubinidze 01e57e0395 Add activities for moving content between steps and results [SCI-9300] 2023-09-19 03:17:30 +04: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
Andrej 5e4f156ae5 Insert correct link for protocol parser import in email notification [SCI-9273] 2023-09-18 15:30:11 +02:00
Martin Artnik 8784add939
Merge pull request #6240 from artoscinote/ma_SCI_9211 
Fix report generation with text results [SCI-9211]
 2023-09-18 15:07:05 +02:00
Martin Artnik 2f4b1ef7b0 Fix report generation with text results [SCI-9211] 2023-09-18 15:01:13 +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
Alex Kriuchykhin ad4a4412f7
Merge pull request #6233 from rekonder/aj_SCI_9301 
Move OVE trial period handling [SCI-9301]
 2023-09-18 09:41:24 +02:00
Andrej 4c7cd5dd10 Change check if open vector editor is enabled [SCI-9301] 2023-09-18 09:40:16 +02:00
Martin Artnik fa53a0a049 Fix handson table rendering [SCI-9295] 2023-09-18 09:37:18 +02: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
Giga Chubinidze 73c1f67510 Missing modal when deleting an archived result [SCI-9291] 2023-09-18 01:28:22 +04:00
Andrej 9f672ecfe2 Move OVE trial period handling [SCI-9301] 2023-09-15 16:07:10 +02:00
Ivan Kljun 13715fa472 Make bottom scrollbar visible with action toolbar at inventories [SCI-9235] 2023-09-15 15:08:09 +02:00
Soufiane 0191b9e9ab
Fix wellplates reversed columns and rows headers [SCI-9071] (#6196) 
- Fix well plates reversed columns and rows headers.
- Fix jumping when in edit mode.
- Fix disappearing columns after edit.
 2023-09-15 14:52:36 +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
wandji20 de4cb662a6 Update translation name for item_card [SCI-9151] 2023-09-15 12:30:02 +01: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 94db5c1155
Merge pull request #6227 from lasniscinote/gl_SCI_9294 
Fix wrong OVE view file size after editing [SCI_9294]
 2023-09-15 12:32:16 +02:00
Gregor Lasnibat 415e7338f7 Fix wrong OVE view file size after editing [SCI_9294] 2023-09-15 11:50:13 +02:00
Martin Artnik 18072bbde7 Fix update of database settings values [SCI-9240] 2023-09-15 11:04:13 +02:00
Martin Artnik 160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +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
Martin Artnik cc1d179366
Merge pull request #6225 from rekonder/aj_SCI_9032 
Fix gene sequence html compiling with deface [SCI-9302]
 2023-09-15 09:15:25 +02:00
Andrej b9fe7c3d3e Fix gene sequence html compiling with deface [SCI-9032] 2023-09-14 17:10:52 +02:00
Ivan Kljun af18a42129 Add constants for status state polling [SCI-9304] 2023-09-14 16:21:17 +02:00
Oleksii Kriuchykhin 45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +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
Martin Artnik 31c0ddba7e
Merge pull request #6214 from artoscinote/ma_SCI_9286 
Add new step buttons for protocol template, remove bottom new result button [SCI-9286]
 2023-09-14 12:26:16 +02:00
Martin Artnik fd6ae82874
Merge pull request #6218 from artoscinote/ma_SCI_9295 
Fix handson table rendering [SCI-9295]
 2023-09-14 12:26:05 +02:00
aignatov-bio cd6bf3fad4
Merge pull request #6219 from aignatov-bio/ai-sci-task-result-css-fixes 
Update protocol css
 2023-09-14 12:25:00 +02:00
Anton 4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Alex Kriuchykhin d08c2d8bb0
Merge pull request #6101 from okriuchykhin/ok_SCI_9148 
Hide from annotations projects where user is not assigned [SCI-9148]
 2023-09-14 10:57:34 +02:00
Oleksii Kriuchykhin c649ad26f3 Hide from annotations projects where user is not assigned [SCI-9148] 2023-09-14 10:54:56 +02:00
Martin Artnik c3aab9c3a9 Fix handson table rendering [SCI-9295] 2023-09-14 10:52:08 +02:00
Martin Artnik 1421de018a
Merge pull request #6182 from G-Chubinidze/gc_SCI_9245 
Ensure reports work with new results [SCI-9245]
 2023-09-14 10:37:15 +02:00
Giga Chubinidze bf1a543e94 refactored to result orderable element assoc 2023-09-14 06:25:38 +04:00
Alex Kriuchykhin 40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration 
Features/ove integration
 2023-09-13 17:05:48 +02:00
wandji c2d6b4d960
Add option to disable save button when OVE editor is in readonly mode [SCI-9110] (#6111) 
* Add option to disable save button when OVE editor is in readonly mode [SCI-9110]
 2023-09-13 16:53:16 +02:00
Gregor Lasnibat cf641201ac New item card custom columns [SCI-9153] 2023-09-13 16:13:22 +02:00
ajugo efed11be3c
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] (#6203) 2023-09-13 15:02:30 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
ajugo 700df3525e
Fix special characters rendering for asset filenames [SCI-9242] (#6197) 2023-09-13 15:00:28 +02:00
wandji e0ed027211
Fix css issues in manage tags modal [SCI-9168] (#6208) 2023-09-13 15:00:04 +02:00