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

2263 commits

Author SHA1 Message Date
artoscinote 6699533301
Merge pull request #5520 from G-Chubinidze/gc_SCI_8385 
Empty screen revamp [sci-8385]
 2023-05-31 16:35:11 +02:00
artoscinote caa160e7c6
Merge pull request #5528 from artoscinote/ma_SCI_8398 
Fix project sorting dropdown [SCI-8398]
 2023-05-31 13:56:58 +02:00
Martin Artnik 7f7fc42ec8 Fix project sorting dropdown [SCI-8398] 2023-05-31 13:44:48 +02:00
Soufiane 411330bca9
Fix dropdown z-index in protocol templates [SCI-8347] (#5527) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-31 13:37:03 +02:00
ajugo b9b84ef79d
Fix perfect scrollbar effects and size of the buttons on navigation [SCI-8567] (#5525) 2023-05-31 12:39:20 +02:00
ajugo 2c84b072a3
Fix long task names for view only tasks [SCI-8573] (#5522) 2023-05-31 09:38:39 +02:00
Giga Chubinidze 68a0be9218 changed empty screen title 2023-05-31 02:09:21 +04: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 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
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
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
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 852bba642f
Merge pull request #5500 from G-Chubinidze/gc_SCI_8385 
Empty screen revamp [SCI-8385]
 2023-05-29 11:02:15 +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
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
Giga Chubinidze fc045389b8 Broken assigned inventory item to task table [SCI-8523] 2023-05-28 02:59:34 +04: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
sboursen-scinote 2e580705ae Fix hound [SCI-8347] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 14:52:53 +02: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 acabba32e5 made it nicer 2023-05-25 15:46:33 +04: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
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 9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04: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
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 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
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
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
Giga Chubinidze f77bafad66 Position of opened drop down [SCI-8473] 2023-05-23 22:31:36 +04:00
Giga Chubinidze 1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
Anton 043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02: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
Anton ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +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
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
Anton 45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02: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
Anton 201117298b Fix elements alignment in dropdown tags [SCI-8456] 2023-05-18 13:29:13 +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
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
sboursen-scinote 316952034e Fix hound [SCI-8252] 2023-05-17 19:07:47 +02:00
sboursen-scinote 478b731830 Fix the search_select outline [SCI-8252] 2023-05-17 18:19:31 +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
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
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
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
Anton 15a6f72894 Navigator CSS fixes [SCI-8430][SCI-8439] 2023-05-16 14:05:56 +02:00
Andrej e1a90348d5 Resolve conflicts after navigator merge 2023-05-16 10:49:40 +02:00
ajugo c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
Anton 9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02: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