Commit graph

3099 commits

Author SHA1 Message Date
artoscinote 01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464
CSS: inventory items top toolbar issues [SCI-8464]
2023-05-29 11:32:16 +02:00
G-Chubinidze 43218900e4
Merge branch 'develop' into gc_SCI_8496 2023-05-29 13:27:18 +04:00
Giga Chubinidze 017781d0dc cleanup 2023-05-29 13:25:54 +04:00
artoscinote 1b1ecbfbaf
Merge pull request #5488 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-05-29 11:08:41 +02:00
artoscinote 5612303f79
Merge pull request #5487 from G-Chubinidze/gc_SCI_8098
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-05-29 11:07:53 +02:00
artoscinote b1fe71719a
Merge pull request #5503 from sboursen-scinote/sb_SCI-8546
Duplicated item created in the inventory [SCI-8546]
2023-05-29 10:38:42 +02:00
ajugo e2624987bd
Save repository table page to local storage [SCI-8512] (#5501) 2023-05-29 10:27:00 +02:00
sboursen-scinote 6240dd0a5f Fix hound [SCI-8546]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-29 09:55:31 +02:00
sboursen-scinote 65cad3fedd Fix duplicated items created in inventories [SCI-8546]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-28 22:36:52 +02:00
Giga Chubinidze 038226fa19 removed test code 2023-05-26 13:44:11 +04:00
aignatov-bio 642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490
Add empty states for PET [SCI-8490]
2023-05-26 11:14:38 +02:00
aignatov-bio e25f91daf7
Merge pull request #5482 from aignatov-bio/ai-sci-8483-fix-toolbar-and-pagination
Unify datatables layout [SCI-8583]
2023-05-26 11:13:18 +02:00
Giga Chubinidze 81db122a08 Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147] 2023-05-26 03:14:27 +04:00
Giga Chubinidze d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Soufiane fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] (#5479)
* Fix issues in smart annotation pop-up

- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8420]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Close smart annotation pop-up after tinyMCE save [SCI-8420]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-25 16:01:36 +02:00
G-Chubinidze 2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02:00
Giga Chubinidze 9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
Andrej 9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
aignatov-bio 9470313899
Merge pull request #5473 from aignatov-bio/ai-sci-8518-multiple-css-fixes
Multiple small css fixes [SCI-8518]]SCI-8529]
2023-05-24 12:11:11 +02:00
aignatov-bio 1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-24 12:07:17 +02:00
aignatov-bio 4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299
Implement the bottom action toolbar - inventories [SCI-8299]
2023-05-24 12:06:47 +02:00
Anton 007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
Giga Chubinidze 5cd32d5cfa hound fix 2023-05-24 13:48:32 +04:00
Giga Chubinidze 34d64f6f44 hound fix 2023-05-24 13:39:38 +04:00
Anton 5a7530cdfb Fix label templates pagination [SCI-8483] 2023-05-24 11:24:02 +02:00
Soufiane c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-24 10:35:58 +02:00
Giga Chubinidze 379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
Giga Chubinidze d43f10bc6a 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-23 22:21:34 +04:00
Soufiane 136fff1f09
Using more than one way of adding file results file title is lost [SCI-8346] (#5354)
Persist uploaded items names when adding new ones [SCI-8346]
2023-05-23 17:30:37 +02:00
Giga Chubinidze 1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
ajugo 040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
aignatov-bio cdec8023ba
Merge pull request #5448 from aignatov-bio/ai-sci-8413-fix-action-toolbar-init
Fix action toolbar init [SCI-8413]
2023-05-23 12:20:16 +02:00
Anton c107a48d61 Fix action toolbar init [SCI-8413] 2023-05-23 12:08:04 +02:00
aignatov-bio 2bbeef0775
Merge pull request #5457 from G-Chubinidze/gc_SCI_8302
Reports bottom action toolbar position update [SCI-8302]
2023-05-23 12:02:55 +02:00
Giga Chubinidze 31807eb4ab updated padding of table & toolbar 2023-05-23 13:15:19 +04:00
aignatov-bio 9c20916d8a
Merge pull request #5453 from aignatov-bio/ai-sci-8515-refactor-inventories-scrolling
Fix inventory page layout [SCI-8515]
2023-05-23 10:34:47 +02:00
ajugo 3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
Anton ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
Anton 7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
artoscinote ad64628c8c
Merge pull request #5435 from aignatov-bio/ai-sci-8480-fix-protocols-icons-position
Fix protocol icons position [SCI-8480]
2023-05-18 16:46:02 +02:00
Martin Artnik e0fb01f164 Remove unecessary view mode button text update [SCI-8436] 2023-05-18 16:43:11 +02:00
ajugo 7e771d457e
Fix assigning items from smart annotation with one team inventory [SCI-8484] (#5434) 2023-05-18 16:23:00 +02:00
Soufiane 351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] (#5430)
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
2023-05-18 14:20:20 +02:00
Anton c57188853e Fix protocol icons position
[SCI-8480]
2023-05-18 14:00:05 +02:00
Andrej 100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
2023-05-18 09:59:49 +02:00
artoscinote 557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote 8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-18 09:46:03 +02:00
artoscinote ef0bf65c19
Merge pull request #5424 from G-Chubinidze/gc_SCI_8302
Implement the bottom action toolbar - reports [SI-8302]
2023-05-18 09:44:53 +02:00