Commit graph

13987 commits

Author SHA1 Message Date
Anton 3057ddd4cb Fix file name for result orderable 2023-08-23 11:36:53 +02:00
aignatov-bio 73aa04d336
Merge pull request #6042 from aignatov-bio/ai-sci-9090-update-top-navigation-breadcrumbs
Make top navigation and breadcrumbs collapsable [SCI-9090]
2023-08-23 10:48:48 +02:00
Anton beed1cdb9d Make top navigation and breadcrumbs collapsable [SCI-9090] 2023-08-22 16:24:34 +02:00
aignatov-bio c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements
Add element movements between step and results [SCI-9024]
2023-08-22 12:26:57 +02:00
Anton e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Alex Kriuchykhin dbbc5775d4
Add unit column to ledger records, fix stock update records and their creation logic [SCI-9021] (#6034) 2023-08-22 10:47:58 +02:00
G-Chubinidze 1253511020
Merge pull request #6035 from G-Chubinidze/gc_SCI_9014
Add thumbnail asset preview to list view assets [SCI-9014]
2023-08-22 12:22:06 +04:00
Giga Chubinidze 76479f6bf7 hound fix 2023-08-22 06:02:30 +04:00
Giga Chubinidze c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04:00
Anton 0780ed17b0 Fix conflicts 2023-08-21 11:34:34 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
aignatov-bio 58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names
Fix long task names [SCI-8536]
2023-08-21 11:18:53 +02:00
Anton d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559
Fix CSS Issues[SCI-8559]
2023-08-21 11:05:38 +02:00
artoscinote 22bf9eaced
Merge pull request #5979 from wandji20/wb-SCI-9018
Fix CSS issues in protocols, and quick start(new task) [SCI-9018]
2023-08-21 10:28:53 +02:00
wandji20 5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
artoscinote 25f5afdcef
Merge pull request #6023 from G-Chubinidze/gc_SCI_8864
UI changes of "Create new inventory" modal [SCI-8864]
2023-08-21 10:25:29 +02:00
aignatov-bio 33476403a5
Merge pull request #6025 from aignatov-bio/ai-sci-9085-fix-report-css
Fix report css [SCI-9085]
2023-08-21 10:12:31 +02:00
Anton ded0ac1b9f Fix report css [SCI-9085] 2023-08-21 09:54:35 +02:00
artoscinote 2dc76f3a2f
Merge pull request #6024 from sboursen-scinote/sb_SCI-9076
Fix shared task view issues [SCI-9076]
2023-08-21 09:35:37 +02:00
artoscinote 7b3d1b92c5
Merge pull request #5907 from ivanscinote/SCI-8893-navigator-freezes
Create vue method for toggling navigator state [SCI-8893]
2023-08-21 09:20:29 +02:00
artoscinote 28fe2b8a60
Merge pull request #5893 from ivanscinote/SCI-8925-show-paragraphs-checklist
Show paragraphs for checklist items in print protocol and pdf/docx [SCI-8925]
2023-08-21 09:19:10 +02:00
Ivan Kljun b357e3117c Merge remote-tracking branch 'upstream/features/september-release' into SCI-8893-navigator-freezes 2023-08-21 09:16:32 +02:00
sboursen-scinote ca35ad0122 Fix shared task view issues [SCI-9076]
- Fix task header effects when selected
2023-08-21 09:15:46 +02:00
Alex Kriuchykhin 7e0f6ec0ac
Merge pull request #6022 from scinote-eln/dependabot/bundler/puma-6.3.1
Bump puma from 6.3.0 to 6.3.1
2023-08-21 09:12:00 +02:00
Ivan Kljun 0c1f47eada Add hound linter suggestion 2023-08-21 09:09:40 +02:00
Giga Chubinidze 620c76a975 UI changes of "Create new inventory" modal 2023-08-21 06:56:14 +04:00
dependabot[bot] 0208cecb81
Bump puma from 6.3.0 to 6.3.1
Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-18 22:16:08 +00:00
artoscinote 3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors
Add .btn-not-started to task status flow modal [SCI-9007]
2023-08-18 17:37:48 +02:00
Ivan Kljun f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
ajugo 6de239547e
Merge pull request #6020 from sboursen-scinote/sb_SCI-9019
Table header not visible after creating a project/folder [SCI-9019]
2023-08-18 16:34:15 +02:00
sboursen-scinote 2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +02:00
Alex Kriuchykhin e3c23bd474
Merge pull request #6016 from sboursen-scinote/sb_SCI-9059
Fix PDF report generation error [SCI-9059]
2023-08-18 11:37:30 +02:00
sboursen-scinote 4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +02:00
ajugo dcdbfefa91
Merge pull request #6011 from sboursen-scinote/sb_SCI-9066
Fix small css issues [SCI-9066]
2023-08-18 11:17:34 +02:00
Alex Kriuchykhin e9e15f015b
Merge pull request #6015 from okriuchykhin/ok_SCI_9079
Fix move experiment modal form submission [SCI-9079]
2023-08-18 11:13:10 +02:00
Ivan Kljun ca35e13893 Merge remote-tracking branch 'upstream/features/september-release' into SCI-8925-show-paragraphs-checklist 2023-08-18 11:12:49 +02:00
artoscinote 71d30ea5c4
Merge pull request #5875 from ivanscinote/SCI-8928-role-selection-at-proj
Fix modal id collision at projects [SCI-8928]
2023-08-18 10:56:04 +02:00
Oleksii Kriuchykhin c76fca0ab3 Fix move experiment modal form submission [SCI-9079] 2023-08-18 10:55:21 +02:00
Ivan Kljun 6918b3c568 Merge with develop and fix conflict [SCI-8928] 2023-08-18 10:54:07 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications
Remove system notifications [SCI-8807]
2023-08-18 10:28:05 +02:00
Alex Kriuchykhin 512753f164
Merge pull request #6010 from okriuchykhin/ok_SCI_9041
Implement fetching of endpoint URLs from OpenID config URL in Azure AD strategy [SCI-9041]
2023-08-18 10:16:20 +02:00
artoscinote 45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057
Fix bug in new result table event delegation [SCI-9057]
2023-08-18 10:13:36 +02:00
artoscinote 664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors
Update status and shared buttons design to Amanda [SCI-9007]
2023-08-18 10:12:26 +02:00
artoscinote 35c0de4cef
Merge pull request #5882 from G-Chubinidze/gc_SCI_8933
Fixed Inventory Calendar Header [SCI-8933]
2023-08-18 10:07:32 +02:00
artoscinote c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-08-18 10:04:06 +02:00
wandji20 cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
sboursen-scinote a38158c788 Fix small css issues [SCI-9066] 2023-08-17 22:23:46 +02:00