Commit graph

11759 commits

Author SHA1 Message Date
Martin Artnik
f015c8c56e Create a copy of the synced file in case of conflict [SCI-9640] 2023-11-03 09:46:05 +01:00
Martin Artnik
3a3d62a1be Merge branch 'develop' into features/asset-sync 2023-11-02 11:28:17 +01:00
Alex Kriuchykhin
d3ba70c2bf
Fix file previews in project exports [SCI-9619] (#6548) 2023-10-30 17:28:53 +01:00
ajugo
e73543dd90
Fix team permission scope for service API [SCI-9611] (#6554) 2023-10-30 12:54:55 +01:00
Martin Artnik
9fbbb185e0
Merge pull request #6550 from sboursen-scinote/sb_SCI-9557
Replace Scinote Icons [SCI-9557]
2023-10-30 08:57:44 +01:00
Giga Chubinidze
9cb1e45302 Filter by archived result does not find anything 2023-10-30 04:53:55 +04:00
sboursen-scinote
b93baeb730 Replace Scinote Icons [SCI-9557] 2023-10-28 12:51:11 +02:00
Martin Artnik
5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Martin Artnik
5fb1a00a21
Revert "Break after first image [SCI-9588]" 2023-10-26 14:58:27 +02:00
Anton
c90aa8ee62 Break after first image [SCI-9588] 2023-10-26 14:33:44 +02:00
Anton
a4e48c798d Fix web insert image [SCI-9127] 2023-10-26 14:24:45 +02:00
Anton
fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
Anton
261f853b03 Fix image ratio 2023-10-26 13:24:29 +02:00
Anton
0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Martin Artnik
e8299c2851 Remove max with from result and step text fields [SCI-9587] 2023-10-26 10:23:14 +02:00
Martin Artnik
2a5b596e2b
Merge pull request #6515 from G-Chubinidze/gc_SCI_9533
Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533]
2023-10-26 10:11:02 +02:00
Anton
7515c979dd Fix dropdown click aways [SCI-9599] 2023-10-25 14:29:08 +02:00
aignatov-bio
ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize
Features/navigator resize
2023-10-25 14:05:14 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Martin Artnik
22a130e502 Fix download endpoint to allow redirects to other hosts [SCI-9465] 2023-10-25 09:30:42 +02:00
Martin Artnik
d181465e12 Fix initialization and add download endpoint [SCI-9465] 2023-10-25 09:30:42 +02:00
Ivan Kljun
2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Martin Artnik
7376b363a8 Asset sync model and endpoints [SCI-9465] (#6399) 2023-10-25 09:30:42 +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
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
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
Giga Chubinidze
0d998b3947 Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533] 2023-10-23 08:26:38 +04: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
Ivan Kljun
dcd1681fce Set navigator max-width to 400px and fix class for removing transitions [SCI-9318] 2023-10-19 15:39:56 +02:00
aignatov-bio
1155e208a3
Merge pull request #6497 from aignatov-bio/ai-sci-9535-fix-three-dots-alignment
Fix thee dots alignment [SCI-9535]
2023-10-19 14:31:57 +02:00