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

2165 commits

Author SHA1 Message Date
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
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