Commit graph

14862 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
e4c0ce58b8 Merge branch 'develop' 2023-10-25 11:34:47 +02:00
Oleksii Kriuchykhin
ac56cb429c Bump version to 1.29.1 2023-10-25 11:33:51 +02:00
Martin Artnik
5972140fd0
Merge pull request #6524 from aignatov-bio/ai-sci-9594-fix-marvinjs-in-edit-mode
Fix marvinJS in tinymce [SCI-9594]
2023-10-24 16:33:16 +02:00
Anton
e0f2677d1c Fix marvinJS in tinymce [SCI-9594] 2023-10-24 16:31:20 +02:00
Alex Kriuchykhin
1eece29f84
Fix error at filtering by date on project page [SCI-9590] (#6523) 2023-10-24 16:00:41 +02:00
aignatov-bio
060300c785
Merge pull request #6522 from aignatov-bio/ai-sci-9592-fix-protocol-header
Fix protocol header [SCI-9592]
2023-10-24 13:43:53 +02:00
Anton
d0703f04dc Fix protocol header [SCI-9592] 2023-10-24 13:41:13 +02:00
ajugo
f278f490d9
Fix api tests [SCI-9569] (#6519)
* Fix api tests [SCI-9569]

* Fix inventory status api index [SCI-9569]
2023-10-24 13:36:03 +02:00
Martin Artnik
7f7ed1ea8a
Merge pull request #6521 from artoscinote/ma_SCI_9583
Smart annotation and text value fixes [SCI-9583]
2023-10-24 13:25:58 +02:00
Martin Artnik
0e3c7eaf26 Fix issue with text value rendering [SCI-9583] 2023-10-24 13:15:17 +02:00
Martin Artnik
2850135e96 Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
2023-10-24 13:14:23 +02:00
Martin Artnik
1d3c17206c
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
2023-10-23 13:59:37 +02:00
Martin Artnik
ebb2c7537b
Merge pull request #6517 from artoscinote/ma_SCI_9574
Fix user smart annotations [SCI-9574]
2023-10-23 13:37:49 +02:00
Martin Artnik
4d9a3c65f3
Merge pull request #6518 from artoscinote/ma_SCI_9585
Fix members filter [SCI-9585]
2023-10-23 13:34:06 +02:00
Martin Artnik
4f014394e2 Fix members filter [SCI-9585] 2023-10-23 13:31:27 +02:00
Martin Artnik
ee076c7f3b Fix user smart annotations [SCI-9574] 2023-10-23 11:50:24 +02:00
Gregor Lasnibat
0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
Martin Artnik
040379039f
Merge pull request #6510 from G-Chubinidze/gc_SCI_9552
Report - Well plates columns fix [SCI-9552]
2023-10-20 10:16:11 +02:00
aignatov-bio
453bdf0082
Merge pull request #6508 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Fix drag n drop on results
2023-10-20 09:43:49 +02:00
Gregor Lasnibat
6812bd135b
Fixed double PATCH request sent [SCI-9568] (#6512) 2023-10-20 09:37:09 +02:00
Giga Chubinidze
186eb1cc7e Report - Well plates columns fix [SCI-9552] 2023-10-20 02:27:06 +04:00
Anton
635a4b7fb3 Fix drag n drop on results 2023-10-19 17:41:13 +02:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Alex Kriuchykhin
18c03eb836
Fix smart annotation links on the item card [SCI-9571] (#6501) 2023-10-19 16:35:15 +02:00
aignatov-bio
efaef6f182
Merge pull request #6507 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Add drag n drop to results [SCI-9576]
2023-10-19 16:03:02 +02:00
Gregor Lasnibat
8e7f216fb0
Fixed Item card file link [SCI-9479] (#6504) 2023-10-19 15:58:28 +02:00
Anton
3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
wandji
db48eadd6a
Add reminder to stock column when value is negative [SCI-9564] (#6503) 2023-10-19 15:57:53 +02:00
wandji
f71cc4755c
Add title custom column names [SCI-9546] (#6502) 2023-10-19 15:56:11 +02:00
ajugo
b6a363cbb5
Add loader on tooltip preview on item cards [SCI-9554] (#6499) 2023-10-19 15:54:57 +02:00
Martin Artnik
d6f03c6bcc
Merge pull request #6500 from lasniscinote/gl_SCI_9479
Fixed Item card file link [SCI-9479]
2023-10-19 14:02:36 +02:00
Gregor Lasnibat
2a8c25b2a9 Fixed Item card file link [SCI-9479] 2023-10-19 13:35:37 +02:00
Gregor Lasnibat
6e6afaf223
Implemented custom scrollspy logic [SCI-9528] (#6495) 2023-10-19 11:36:12 +02:00
aignatov-bio
29ce96b67d
Merge pull request #6496 from aignatov-bio/ai-sci-9518-fix-bottom-toolbar-for-reports
Fix bottom toolbar for reports [SCI-9518]
2023-10-19 11:31:39 +02:00
Martin Artnik
6bd33307c7
Merge pull request #6446 from sboursen-scinote/sb_SCI-9529
Create Vue tooltip and minor fixes [SCI-9529]
2023-10-19 11:26:02 +02:00
wandji
72d1abf0be
Fix issues displaying checklist items on item card [SCI-9538] (#6493) 2023-10-19 11:24:03 +02:00
wandji
18f9d43a80
Fix issue with long column names in item card [SCI-9546] (#6488) 2023-10-19 11:23:36 +02:00
Gregor Lasnibat
1709abaa9e
Fixed Buttons on the right side of top toolbar are not responding [SCI-9550] (#6491) 2023-10-19 11:03:09 +02:00
wandji
782d10443d
Use default browser tooltip for shoing tooltips in items card [SCI-9537] (#6490) 2023-10-19 11:02:13 +02:00
Soufiane
e0a1a62bd5
Fix zebra print progress modal close button and padding [SCI-9536] (#6487) 2023-10-19 10:59:56 +02:00
sboursen-scinote
885b66504b FIX no custom columns placeholder [SCI-9529] 2023-10-19 10:53:18 +02:00
Anton
4122876a90 Fix bottom toolbar for reports [SCI-9518] 2023-10-19 10:16:09 +02:00
Martin Artnik
1cf2e31e1f
Merge pull request #6489 from sboursen-scinote/sb_SCI-9549
Fix background blurring of stacked modals [SCI-9549]
2023-10-19 10:02:08 +02:00
ajugo
aed5418366
Fix closing item sidebar for printing label modal [SCI-9541] (#6486) 2023-10-19 09:48:20 +02:00
ivanscinote
8b5f610c07
Fix grid rows layout for experiment table view when no results found [SCI-9482] (#6434) 2023-10-19 09:47:44 +02:00
Soufiane
9de448141e
Fix text and number columns expend/collapse scroller issues [SCI-9545] (#6468) 2023-10-19 09:47:04 +02:00
Alex Kriuchykhin
54daf91701
Fix displaying of assign button on inventory item card [SCI-9559] (#6483) 2023-10-19 09:38:28 +02:00
dependabot[bot]
54fd174a24
Bump @babel/traverse from 7.21.4 to 7.23.2 (#6492)
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.4 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-19 09:37:28 +02:00
sboursen-scinote
e0d1841b7b Fix blurring of stacked modals [SCI-9549] 2023-10-18 17:15:17 +02:00
aignatov-bio
cc4ae4bb57
Merge pull request #6484 from aignatov-bio/ai-sci-9558-fix-item-card-status-spacing
Fix item card status spacing [SCI-9558]
2023-10-18 15:11:41 +02:00