scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
13412 commits 69 branches 179 tags 165 MiB
Commit graph

10513 commits

Author SHA1 Message Date
ajugo 2c84b072a3
Fix long task names for view only tasks [SCI-8573] (#5522) 2023-05-31 09:38:39 +02:00
ajugo d3006c9862
Fix archive/restore of protocol templates [SCI-8579] (#5521) 2023-05-31 09:38:24 +02:00
ajugo d3e11b0dde
Hide experiment action row after archive/restore [SCI-8576] (#5519) 2023-05-31 09:38:09 +02:00
Giga Chubinidze 80b8a8803d amended focus fields 2023-05-31 11:08:16 +04:00
Giga Chubinidze 68a0be9218 changed empty screen title 2023-05-31 02:09:21 +04:00
Soufiane 46fc3d17e6
Broken modal for sharing inventories [SCI-8548] (#5506) 
* Fix share_modal js loading [SCI-8548]

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

* Fix hound [SCI-8548]

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

* Fix hound [SCI-8548]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 16:15:20 +02:00
ajugo 420b78d217
Fix size of dropdown for state view changes [SCI-8570] (#5518) 2023-05-30 16:13:59 +02:00
sboursen-scinote 4848236fd3 Merge branch 'develop' into sb_SCI-8509 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 16:07:26 +02:00
artoscinote e3e0126fc2
Merge pull request #5516 from artoscinote/ma_SCI_8398 
Save and load project filters after table load [SCI-8398]
 2023-05-30 16:01:56 +02:00
sboursen-scinote a58803a2cd Fix Reload button for new attachement (Wopi) when content changes [SCI-8316] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 15:49:38 +02:00
Martin Artnik 44ad7703b2 Save and load project filters after table load [SCI-8398] 2023-05-30 15:31:15 +02:00
artoscinote 98a27b083a
Merge pull request #5344 from sboursen-scinote/sb_SCI-8347 
FIle/step dropdown is out of task border [SCI-8347]
 2023-05-30 13:46:10 +02:00
ajugo b0a7699184
Fix action toolbar for project folders [SCI-8572] (#5514) 2023-05-30 12:50:33 +02:00
Alex Kriuchykhin a0616adf17
Improve speed of protocol templates table loading [SCI-8553] (#5509) 2023-05-30 12:41:53 +02:00
Martin Artnik 47e0e45074 Globally fix pagination dropdown z-index [SCI-8538] 2023-05-30 11:39:52 +02:00
ajugo 14b3a1318b
Fix empty page for inventory and fix task title [SCI-8556] (#5511) 
* Remove empty state for inventory [SCI-8556]

* Fix shrinking of the task title on task page [SCI-8556]
 2023-05-30 11:19:10 +02:00
ajugo d56eeeb26a
Fix top action switch padding problem [SCI-8570] (#5512) 2023-05-30 11:15:06 +02:00
Alex Kriuchykhin 9819425ba1
Fix displaying of archived folders in active view [SCI-8542] (#5513) 2023-05-30 11:14:24 +02:00
Martin Artnik bb32f3a935 Improve bottom action toolbar responsiveness [SCI-8550] 2023-05-29 16:34:07 +02:00
artoscinote 9d6ea63d6b
Merge pull request #5508 from artoscinote/ma_SCI_8538 
Fix pagination dropdown z-index [SCI-8538]
 2023-05-29 15:42:20 +02:00
Martin Artnik 2dcfd6e7b2 Fix pagination dropdown z-index [SCI-8538] 2023-05-29 15:40:38 +02:00
artoscinote d6a8f779d0
Merge pull request #5507 from artoscinote/ma_SCI_8564 
Fix edit overlays for repository table [SCI-8564]
 2023-05-29 15:27:12 +02:00
Martin Artnik e5c54a0c42 Fix edit overlays for repository table [SCI-8564] 2023-05-29 15:25:05 +02:00
Alex Kriuchykhin d4afd5be8f
Fix folders display in the navigator [SCI-8542] (#5496) 2023-05-29 11:49:39 +02:00
ajugo 2e9fe37040
Fix repository table reloading and flash messages [SCI-8554] (#5504) 
* Fix repository table reloading and flash messages [SCI-8554]

* Pass function for repository reload [SCI-8554]
 2023-05-29 11:48:13 +02:00
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
artoscinote 65d7c96467
Merge pull request #5489 from G-Chubinidze/gc_SCI_8520 
Missing tooltips on the bottom action toolbar [SCI-8520]
 2023-05-29 11:29:50 +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
Martin Artnik 701834d7b9 Add read permission checks for protocols toolbar [SCI-8521] 2023-05-29 11:23:14 +02: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 852bba642f
Merge pull request #5500 from G-Chubinidze/gc_SCI_8385 
Empty screen revamp [SCI-8385]
 2023-05-29 11:02:15 +02:00
Giga Chubinidze 534afe64cb changed current team variable 2023-05-29 13:00:54 +04: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
artoscinote 5b90a657e4
Merge pull request #5502 from artoscinote/ma_SCI_8525 
Add 'no actions' message to action toolbar [SCI-8525]
 2023-05-29 10:26:42 +02:00
artoscinote f233d4d73f
Merge pull request #5499 from G-Chubinidze/gc_SCI_8448 
breadcrumb css issue & archive projects url fix [SCI-8448]
 2023-05-29 10:22:22 +02:00
artoscinote 735811f969
Merge pull request #5498 from G-Chubinidze/gc_SCI_8523 
Broken assigned inventory item to task table [SCI-8523]
 2023-05-29 10:21:47 +02:00
ajugo 8d70fcf322
Fix default state for archived repository [SCI-8435] (#5493) 2023-05-29 10:21:34 +02:00
artoscinote 6ce9e41c2f
Merge pull request #5497 from aignatov-bio/ai-sci-8538-add-navigator-horizontal-scrollbar 
Add navigator horizontal scrollbar [SCI-8538]
 2023-05-29 10:21:26 +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
Martin Artnik a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
Giga Chubinidze 59bdd7d8d2 Empty screen revamp [SCI-8385] 2023-05-29 01:42:26 +04: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 5df26d757f Missing tooltips on the bottom action toolbar [SCI-8520] 2023-05-28 03:52:24 +04:00
Giga Chubinidze 1039d784d3 fixed archive projects breadcrumb link url 2023-05-28 03:46:04 +04:00
Giga Chubinidze fc045389b8 Broken assigned inventory item to task table [SCI-8523] 2023-05-28 02:59:34 +04:00
Soufiane 1a689c9329
Add no-options placehoder to experiments dropdown [SCI-8517] (#5495) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 21:10:53 +02:00
aignatov-bio 876987bc70
Merge pull request #5490 from aignatov-bio/ai-sci-8504-css-issues-on-task 
Fix css issues on task [SCI-8504]
 2023-05-26 17:10:09 +02:00
Anton 61a6d8326c Add navigator horizontal scrollbar [SCI-8538] 2023-05-26 16:58:11 +02:00
sboursen-scinote 2e580705ae Fix hound [SCI-8347] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 14:52:53 +02:00
Soufiane e5dc1f365b
Add a no-options placeholder for projects selector [SCI-8544] (#5492) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:47:35 +02:00
Giga Chubinidze 038226fa19 removed test code 2023-05-26 13:44:11 +04:00
Soufiane cb14333fca
Issues with the "Assign item to task" modal part 1 [SCI-8513] (#5486) 
* Fix Select bounding box calculations [SCI-8513]

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

* Abbreviate very long select text [SCI-8513]

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

* Remove gap when dropdown is open [SCI-8513]

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

* Fix hound [SCI-8513]

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

* Add small refactor [SCI-8513]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:41:47 +02:00
sboursen-scinote a77ee62f8e Fix hover effect depending on the type of the navigator link [SCI-8509] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:19:27 +02:00
aignatov-bio 603418d888
Merge pull request #5484 from aignatov-bio/ai-sci-8501-revert-images-to-inline 
Revert images to inline [SCI-8501]
 2023-05-26 11:14:50 +02: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 9018bf00df
Merge pull request #5483 from aignatov-bio/ai-sci-8529-fix-experiment-header-name-container 
Fix project/experiment name container size [SCI-8529]
 2023-05-26 11:13:28 +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
Anton 6716a5880e Fix css issues on task [SCI-8504] 2023-05-26 11:12:47 +02:00
Giga Chubinidze 5e11e3a874 fixed mymodule breadcrumb 2023-05-26 03:45:16 +04: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 6c43cb6dad
Add breadcrumbs to archived results page [SCI-8087] (#5485) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 16:49:33 +02: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
ajugo b1a891e310
Add assign item button to shared repository [SCI-8524] (#5478) 2023-05-25 15:46:58 +02:00
Giga Chubinidze acabba32e5 made it nicer 2023-05-25 15:46:33 +04:00
ajugo 1ea7f53e4b
Fix missing toolbar buttons for shared inventories [SCI-8481] (#5481) 2023-05-25 13:46:01 +02:00
Anton a0fc7aeef8 Revert images to inline [SCI-8501] 2023-05-25 13:35:04 +02:00
G-Chubinidze 2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton c005825b47 Fix project/experiment name container size [SCI-8529] 2023-05-25 13:22:30 +02:00
aignatov-bio 384434ba80
Merge pull request #5480 from aignatov-bio/ai-sci-8510-inventory-css-fixes 
Inventory css fixes [SCI-8510]
 2023-05-25 13:12:54 +02:00
Anton e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02:00
Anton ce7f50908d Inventory css fixes [SCI-8510] 2023-05-25 12:14:41 +02:00
Giga Chubinidze c68151fcdf added user dropdown class 2023-05-25 11:20:11 +04:00
Giga Chubinidze 9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
Soufiane 36d63e543a
Active state selected by default when viewing archived content [SCI-8533] (#5474) 
* Redirect to archived state when clicking on archived experiment [SCI-8533]

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

* Cover the case where Project is archived and experiment is not [SCI-8533]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 08:53:12 +02:00
Giga Chubinidze b0e93b4666 removed rounded borders * included user info flyout 2023-05-25 10:52:49 +04:00
Andrej 9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
G-Chubinidze 3ea85cb2ef
Remove old client_api code [SCI-8144] (#5223) 
Remove obsolete client_api code
 2023-05-24 12:45:31 +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 29713d01f4
Merge pull request #5468 from G-Chubinidze/gc_SCI_8448 
CSS: Breadcrumbs css issues [SCI-8448]
 2023-05-24 12:07:41 +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
Giga Chubinidze 378bf37ba4 changed with mixin 2023-05-24 13:34:59 +04:00
Anton 5a7530cdfb Fix label templates pagination [SCI-8483] 2023-05-24 11:24:02 +02:00
aignatov-bio 56a36e96da
Merge pull request #5471 from aignatov-bio/ai-sci-8508-fixed-navigator-folder-controller 
Fix navigator folder controller [SCI-8508]
 2023-05-24 11:10:44 +02:00
Anton cd8b49f220 Fix navigator folder controller [SCI-8508] 2023-05-24 11:04:12 +02:00
aignatov-bio 5c3ebc2509
Merge pull request #5459 from G-Chubinidze/gc_SCI_8404 
(A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404]
 2023-05-24 10:53:23 +02:00
aignatov-bio 3f218785e1
Merge pull request #5470 from sboursen-scinote/sb_SCI-8449 
Drop down gets out of page at scrolling page [SCI-8449]
 2023-05-24 10:51:34 +02:00
Soufiane f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441) 
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
 2023-05-24 10:47:27 +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
sboursen-scinote bb9a466d61 Fix hound [SCI-8449] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 02:34:42 +02:00
sboursen-scinote b63bf04454 Fix projects and eperiments tables headers [SCI-8449] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 02:31:02 +02:00
sboursen-scinote 34032d54a2 Fix dropdown menu z-index in experiments and projects pages [SCI-8449] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 01:37:09 +02:00
Giga Chubinidze b20912c52e removed unnecessary code 2023-05-24 02:54:05 +04:00
Giga Chubinidze e553909755 moved logic to controllers & concern 2023-05-24 02:52:26 +04:00
sboursen-scinote 118cf1fe81 Update the values of z-index after Amanda overhaul [SCI-8347] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:26:32 +02:00
sboursen-scinote 61f19df51f Merge branch 'develop' into sb_SCI-8347 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:11:57 +02:00
sboursen-scinote 1f83679e5e Merge branch 'develop' into sb_SCI-8347 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:08:20 +02:00
Giga Chubinidze f99c1db551 CSS: Breadcrumbs css issues [SCI-8448] 2023-05-24 00:52:39 +04:00
aignatov-bio 6b020f1316
Merge pull request #5467 from G-Chubinidze/gc_SCI_8473 
Position of opened drop down [SCI-8473]
 2023-05-23 21:14:44 +02:00
aignatov-bio 98fe653ec1
Merge pull request #5465 from rekonder/aj_SCI_8503 
Fix active table experiment loading [SCI-8503]
 2023-05-23 21:13:39 +02:00
aignatov-bio 1a9eab09c3
Merge pull request #5463 from aignatov-bio/ai-sci-8426-fix-tiny-mce-in-safari 
Fix tinyMCE layout in safari [SCI-8426]
 2023-05-23 21:13:21 +02:00
Giga Chubinidze f77bafad66 Position of opened drop down [SCI-8473] 2023-05-23 22:31:36 +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
Andrej fe2ae09a25 Fix active table experiment loading [SCI-8503] 2023-05-23 17:15:09 +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
Anton 043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
aignatov-bio 1b01cc5407
Merge pull request #5462 from aignatov-bio/ai-sci-8485-fix-barcode-button 
Fix barcode button [SCI-8485]
 2023-05-23 13:10:05 +02:00
Anton bbdb852377 Fix barcode button [SCI-8485] 2023-05-23 12:33:07 +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 ae6e44ee27
Merge pull request #5446 from G-Chubinidze/gc_SCI_8473 
Position of opened drop down [SCI-8473]
 2023-05-23 10:39:12 +02: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
Giga Chubinidze 7b158d7935 (A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404] 2023-05-23 11:57:50 +04:00
ajugo 3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
ajugo cf6a901b67
Fix display of table in search results [SCI-8409] (#5454) 2023-05-22 17:07:18 +02:00
Anton ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
aignatov-bio cbecd56122
Merge pull request #5452 from G-Chubinidze/gc_SCI_8488 
Archived breadcrumbs fix [SCI-8488] [SCI-8404]
 2023-05-22 12:54:17 +02:00
aignatov-bio 607386d186
Merge pull request #5450 from aignatov-bio/ai-sci-8483-fix-action-toolbar-and-pagination 
Fix action toolbar position [SCI-8483]
 2023-05-22 12:50:53 +02:00
Giga Chubinidze be7dc74105 Archived breadcrumbs fix [SCI-8488] [SCI-8404] 2023-05-22 14:09:14 +04:00
Soufiane 8593132a35
CSP FIX: MarvinJS, AWS and New Relic [SCI-8500] (#5449) 
* Use the actual value of the nonce for New relic [SCI-8500]

* Whitelist MarvinJs [SCI-8500]

* Whitelist used AWS bucket [SCI-8500]
 2023-05-22 11:43:19 +02:00
Anton 7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
aignatov-bio d28dc059df
Merge pull request #5447 from aignatov-bio/ai-sci-8497-fix-empty-spave-on-task-page 
Fix task page background size [SCI-8497]
 2023-05-22 10:48:50 +02:00
G-Chubinidze 165aa38247
'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] (#5445) 2023-05-22 10:37:08 +02:00
Anton d0c031e072 Fix task page background size [SCI-8497] 2023-05-22 10:35:29 +02:00
Giga Chubinidze 2acbae71c4 Position of opened drop down [SCI-8473] 2023-05-22 11:07:56 +04:00
Giga Chubinidze bfc4ebe237 'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] 2023-05-22 10:55:10 +04:00
aignatov-bio c86ba663e1
Merge pull request #5442 from aignatov-bio/ai-sci-8491-fix-scrolling-position-in-navigator 
Fix scrolling position in navigator [SCI-8491]
 2023-05-19 11:49:08 +02:00
Anton db06ff5946 Fix scrolling position in navigator [SCI-8491] 2023-05-19 11:46:36 +02:00
aignatov-bio 2f372fd871
Merge pull request #5440 from aignatov-bio/ai-sci-8427-fix-mobile-view 
Fix mobile view [SCI-8427]
 2023-05-19 11:41:58 +02:00
Alex Kriuchykhin 1a430a77fd
Add filtering option for active/archived PET listing API endpoints, add linked tasks to protocol serializer [SCI-7091] (#4381) 2023-05-19 11:34:31 +02:00
Anton 45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02:00
artoscinote 112bb8bec6
Merge pull request #5439 from G-Chubinidze/gc_SCI_8332 
File drop area font size is incorrect [SCI-8332]
 2023-05-19 09:59:21 +02:00
Giga Chubinidze 9ee1dd695f changed font weight to normal 2023-05-19 01:00:38 +04:00
artoscinote 47d2b4ab6a
Merge pull request #5431 from aignatov-bio/ai-sci-8456-fix-users-css-in-invite-modal 
Fix elements alignment in dropdown tags [SCI-8456]
 2023-05-18 16:47:14 +02:00
artoscinote b10e5a4ab8
Merge pull request #5432 from aignatov-bio/ai-sci-8423-fix-navigator-hover-color 
Fix navigator archive color [SCI-8423]
 2023-05-18 16:46:55 +02:00
artoscinote 2a2b0f9a47
Merge pull request #5433 from aignatov-bio/ai-sci-8477-fix-navigator-button 
Fix navigator button style [SCI-8477]
 2023-05-18 16:46:33 +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
artoscinote 4a399f5085
Merge pull request #5437 from artoscinote/ma_SCI_8413 
Make action toolbar initialization more robust [SCI-8413]
 2023-05-18 15:55:28 +02:00
Martin Artnik a937198178 Make action toolbar initialization more robust [SCI-8413] 2023-05-18 15:52:18 +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
Anton 753372f9e4 Fix navigator button style [SCI-8477] 2023-05-18 13:43:26 +02:00
Anton 6918bbd84a Fix navigator hover color [SCI-8423] 2023-05-18 13:33:08 +02:00
Anton 201117298b Fix elements alignment in dropdown tags [SCI-8456] 2023-05-18 13:29:13 +02:00
Martin Artnik f6d782392c Fix margin between toolbar buttons [SCI-8479] 2023-05-18 11:58:45 +02:00
Martin Artnik 3499d6c6c5 Fix available actions for archived items [SCI-8489] 2023-05-18 11:46:44 +02:00
Martin Artnik b18e0c8c53 Add missing icon [SCI-8489] 2023-05-18 11:38:16 +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
Alex Kriuchykhin c2fb957699
Merge pull request #5425 from rekonder/aj_SCI_8418 
Fix rendering of simple repository view on task [SCI-8418]
 2023-05-18 09:35:06 +02:00
Alex Kriuchykhin 0cc253172f
Merge pull request #5326 from rekonder/aj_SCI_8082 
Reverse table header/row numbering for plate templates [SCI-8082]
 2023-05-18 09:34:19 +02:00
Andrej 20052e966a Fix rendering of simple repository view on task [SCI-8418] 2023-05-18 09:08:12 +02:00
aignatov-bio 31bb1210af
Merge pull request #5422 from aignatov-bio/ai-sci-8438-navigation-css-fixes 
Update navigation css [SCI-8438]
 2023-05-18 08:58:48 +02:00
Giga Chubinidze f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
sboursen-scinote 316952034e Fix hound [SCI-8252] 2023-05-17 19:07:47 +02:00
sboursen-scinote 9662eb7264 Improve the logic of the select and select_search components 
> There is no need for the two components to hold their `value` state.
It can be propagated from the component that uses them.
This will help 'clear' the search when modification is finished.
 2023-05-17 19:01:16 +02:00
sboursen-scinote 478b731830 Fix the search_select outline [SCI-8252] 2023-05-17 18:19:31 +02:00
sboursen-scinote 16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +02:00
Soufiane adaa2b6a48
Extend flash messages for direct task items assignment [SCI-8443] (#5414) 
Update item assigment modal flash messages [SCI-8443]
 2023-05-17 16:17:19 +02:00
artoscinote 20593f087e
Merge pull request #5421 from artoscinote/ma_SCI_8399 
Implement new toolbar for protocols [SCI-8399]
 2023-05-17 15:00:38 +02:00
Anton 3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +02:00
Martin Artnik eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
Alex Kriuchykhin b1df62df5d
Merge pull request #5420 from okriuchykhin/ok_SCI_8367 
Remove Tika server mode, update version [SCI-8367]
 2023-05-17 13:56:47 +02:00
Oleksii Kriuchykhin f8f3fd8c5e Remove Tika server mode, update version [SCI-8367] 2023-05-17 13:44:40 +02:00
aignatov-bio 23f4b01c8e
Merge pull request #5418 from aignatov-bio/ai-sci-update-scinote-icon-font 
Update SciNote icon font
 2023-05-17 12:30:13 +02:00
Anton a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +02:00
artoscinote a52ee99781
Add debounce file [SCI-8300] (#5419) 2023-05-17 12:00:37 +02:00
Alex Kriuchykhin 5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning 
Features/sa item assigning
 2023-05-17 11:45:13 +02:00
Andrej 6ed55be62c Fix merge conflicts 2023-05-17 11:40:14 +02:00
artoscinote aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300] 
Implement bottom action toolbar for repository items [SCI-8300]
 2023-05-17 11:27:55 +02:00
Andrej 32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
G-Chubinidze 49454fd8c8
Merge branch 'develop' into gc_SCI_8305 2023-05-16 16:19:46 +04:00
artoscinote f9a41a9203
Merge pull request #5413 from aignatov-bio/ai-sci-8430-navigator-css-fix 
Navigator CSS fixes [SCI-8430][SCI-8439]
 2023-05-16 14:16:49 +02:00
Anton 15a6f72894 Navigator CSS fixes [SCI-8430][SCI-8439] 2023-05-16 14:05:56 +02:00
ajugo 43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +02:00
Martin Artnik c8521cd9c4 Make search icon right-alinged [SCI-8301] 2023-05-16 12:30:32 +02:00
Martin Artnik 503099e331 Added edit buttons, updates to wording [SCI-8301] 2023-05-16 12:27:28 +02:00
Martin Artnik c8994573fd Add bottom action toolbar to label templates [SCI-8301] 2023-05-16 11:40:07 +02:00
ajugo f7087a7c24
Switch team for label template opening [SCI-8377] (#5402) 2023-05-16 11:23:32 +02:00
Soufiane 19cad569b3
Cache the values of formulas of HOT tables in meta data [SCI-8173] (#5406) 2023-05-16 11:19:56 +02:00
Soufiane dda3d1bc6b
Fix typo [SCI-8250] (#5393) 2023-05-16 11:19:19 +02:00
ajugo 2b848733b4
Fix assigning repository items through smart annotation pop-up to task [SCI-8417] (#5401) 2023-05-16 11:08:13 +02:00
artoscinote fc6f443b1e
Merge pull request #5410 from rekonder/fix_conflicts 
Resolve conflicts after navigator merge
 2023-05-16 10:59:44 +02:00
Andrej e1a90348d5 Resolve conflicts after navigator merge 2023-05-16 10:49:40 +02:00
artoscinote a856759c08
Merge pull request #5379 from sboursen-scinote/sb_SCI-8378 
Select/Unselect all does not update visibility of buttons [SCI-8378]
 2023-05-16 10:40:06 +02:00
artoscinote cf13160c4f
Merge pull request #5398 from aignatov-bio/ai-sci-8405-improve-navigation-in-archive-state 
Improve navigation in archive state [SCI-8405]
 2023-05-16 10:38:37 +02:00
artoscinote 1d30389298
Merge pull request #5407 from G-Chubinidze/gc_SCI_8441 
CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441]
 2023-05-16 10:38:04 +02:00
ajugo c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
ajugo 31b42dc875
Add metadata to table API endpoints [SCI-8376] (#5388) 2023-05-16 10:26:09 +02:00
ajugo d8945cc627
Fix large asset preview [SCI-8433] (#5408) 2023-05-16 10:24:08 +02:00
Anton 9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Soufiane c28f86d46d
Refactor inline events [SCI-8434] (#5403) 
Refactor inline events in task results [SCI-8434]
 2023-05-16 09:34:36 +02:00
Giga Chubinidze dee32d8986 CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441] 2023-05-16 11:22:46 +04:00
Anton 8be2a02d9b Fix my module layout 2023-05-15 15:38:44 +02:00
aignatov-bio e16ffc08d5
Merge pull request #5404 from aignatov-bio/ai-sci-8421-refactor-my-module-page-layout 
Refactor Module page layout [SCI-8421]
 2023-05-15 14:22:16 +02:00
Anton e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +02:00
artoscinote df8a380a87
Merge pull request #5386 from sboursen-scinote/sb_SCI-8371 
CSS: label printer part 1 [SCI-8371]
 2023-05-15 13:17:17 +02:00
Giga Chubinidze 8830729db8 removed unnecessary css 2023-05-15 11:16:23 +04:00
Giga Chubinidze 405897c564 updated code to fit new state dropdown logic + updated card view 2023-05-15 11:12:07 +04:00
Soufiane 9c3f6812bd
CSS: label printer part 2 [SCI-8374] (#5381) 
* Fix pin and checkbox alignment in the header [SCI-8374]

* Fix hound [SCI-8374]
 2023-05-15 09:00:37 +02:00
Soufiane 935a63fc26
Fix smart annotation user avatar style [SCI-7798] (#5352) 2023-05-15 08:49:12 +02:00
ajugo e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] (#5397) 2023-05-11 13:18:19 +02:00
Anton 08652e9dde Improve navigation in archive state [SCI-8405] 2023-05-11 13:14:56 +02:00
aignatov-bio 7682054481
Merge pull request #5395 from aignatov-bio/ai-sci-8400-fix-navigator-sorting 
Fix navigator sorting [SCI-8400]
 2023-05-11 13:03:07 +02:00
G-Chubinidze 7173ee3ee6
Merge pull request #5392 from G-Chubinidze/gc_SCI_8402 
CSS - top action bar missing border on dropdown fields [SCI-8402]
 2023-05-11 14:42:31 +04:00
Giga Chubinidze 3d968073ae changed color hash to color constant 2023-05-11 14:40:56 +04:00
Anton 8b901cb485 Fix navigator sorting [SCI-8400] 2023-05-11 12:38:54 +02:00
aignatov-bio cc181f1da7
Merge pull request #5369 from aignatov-bio/ai-sci-8394-fix-inivte-user-modal 
Fix css for invite user modal [SCI-8394]
 2023-05-11 11:35:53 +02:00
aignatov-bio 8c0eb993d5
Merge pull request #5384 from G-Chubinidze/gc_SCI_8395 
Error with 500 status code for several pages in Settings [SCI-8395]
 2023-05-11 11:35:00 +02:00
aignatov-bio 3b7c3a6f5b
Merge pull request #5390 from artoscinote/ma_SCI_8369 
Label templates to toolbar copy [SCI-8369]
 2023-05-11 11:30:31 +02:00
artoscinote dae4697585
Merge pull request #5383 from artoscinote/ma_SCI_8315 
Track user full name update in navigation [SCI-8315]
 2023-05-11 11:27:12 +02:00
aignatov-bio 168fa0a4bc
Merge pull request #5394 from aignatov-bio/ai-sci-8283-add-barcode-search-field 
Add barcode search field [SCI-8283]
 2023-05-11 11:26:48 +02:00
artoscinote 566b302ce1
Merge pull request #5378 from artoscinote/ma_SCI_8324 
Fix main navigation issues [SCI-8324]
 2023-05-11 11:26:30 +02:00
Anton 8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +02:00
Soufiane 57466a06eb
Merge pull request #5377 from sboursen-scinote/sb_SCI-8250 
Create a modal for item assignment from inventory page [SCI-8250]
 2023-05-11 09:19:02 +02:00
Giga Chubinidze b48cde19b9 CSS - top action bar missing border on dropdown fields [SCI-8402] 2023-05-11 10:32:52 +04:00
ajugo 74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373) 
Update reports for plate templates and add headers to docx tables [SCI-8375]
 2023-05-10 16:15:14 +02:00
Soufiane b1ccd5839b
Implement backend for inventory item assignment to tasks [SCI-8248] (#5367) 
Implement backend for inventory item assignment to tasks [SCI-8248]
 2023-05-10 16:12:20 +02:00
Martin Artnik 33e9057fef Label templates to toolbar copy [SCI-8369] 2023-05-10 15:18:51 +02:00
aignatov-bio 4737a2d4bc
Merge pull request #5382 from aignatov-bio/ai-sci-8386-refactor-protocol-toolbar 
Update protocol top toolbar [SCI-8386]
 2023-05-10 11:39:38 +02:00
Oleksii Kriuchykhin f903ec80e5 Merge branch 'hotfix/1.27.1.2' into develop 2023-05-10 10:35:45 +02:00
Giga Chubinidze 57c0e299e8 Revamp of (top) toolbar - Reports [SCI-8370] 2023-05-10 01:09:05 +04:00
G-Chubinidze fa84365404
Merge pull request #5380 from G-Chubinidze/gc_SCI_8332 
File drop area font size is incorrect [SCI-8332]
 2023-05-10 00:54:57 +04:00
Alex Kriuchykhin ab318df1af
Update permissions for team owner to see all protocols and can manage users [SCI-8380] (#5371) 2023-05-09 16:23:29 +02:00
Giga Chubinidze 05b16c17d7 Error with 500 status code for several pages in Settings [SCI-8395] 2023-05-09 17:37:02 +04:00
Martin Artnik 27e34ab407 Track user full name update in navigation [SCI-8315] 2023-05-09 15:21:07 +02:00
Anton 5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
sboursen-scinote 1624941c03 Fix CSS issues label printer and label templates and setting pages [SCI-8371] 2023-05-09 14:07:53 +02:00
artoscinote 09c4100115
Merge pull request #5374 from artoscinote/ma_SCI_8393 
Project dropdown menu fixes [SCI-8393]
 2023-05-09 12:43:29 +02:00
G-Chubinidze 82d0657593
Merge branch 'features/navigation-refactor-v2' into gc_SCI_8389 2023-05-09 13:41:51 +04:00
aignatov-bio a19def15f3
Merge pull request #5357 from G-Chubinidze/gc_SCI_8306 
Revamp of (top) toolbar + search field - inventories and items [SCI-8306] [SCI-8307]
 2023-05-09 11:18:05 +02:00
Giga Chubinidze 2ad5a5ed7e File drop area font size is incorrect [SCI-8332] 2023-05-09 01:39:12 +04:00
Giga Chubinidze a462765cdb code cleanup 2023-05-09 00:06:37 +04:00