Commit graph

3887 commits

Author SHA1 Message Date
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
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
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
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 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
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
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 e553909755 moved logic to controllers & concern 2023-05-24 02:52:26 +04: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 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 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 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 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 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
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
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 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 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
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
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