Commit graph

14005 commits

Author SHA1 Message Date
G-Chubinidze
bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087)
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
2023-08-28 10:36:40 +02:00
aignatov-bio
589a01ce81
Merge pull request #6084 from aignatov-bio/ai-sci-9102-add-input-field-with-search-history
Add input field with search history [SCI-9102]
2023-08-25 15:07:00 +02:00
Anton
6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
ajugo
103b62798b
Return error if label template preview image is nil [SCI-9070] (#6077) 2023-08-24 16:45:34 +02:00
ajugo
5ea31337b7
Remove SSO buttons on forgotten password screen [SCI-9049] (#6076) 2023-08-24 16:44:04 +02:00
Alex Kriuchykhin
56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] (#6040) 2023-08-24 15:28:28 +02:00
ajugo
fe58d9c864
Show team members counter in team table [SCI-5589] (#6073) 2023-08-24 15:15:06 +02:00
Soufiane
9d0f62824e
Remove blinking button from actiontoolbar when loading [SCI-9067] (#6062) 2023-08-24 09:19:35 +02:00
ajugo
253be93368
Fix loading of navigators [SCI-8797] (#5868) 2023-08-23 15:49:00 +02:00
aignatov-bio
4f0909e298
Merge pull request #6054 from aignatov-bio/ai-sci-9027-move-task-status-to-secondary-navigation
Move status flow css to independent scope [SCI-9027]
2023-08-23 15:38:44 +02:00
Anton
d99ba04e39 Move status flow css to independent scope [SCI-9027] 2023-08-23 15:37:18 +02:00
artoscinote
0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
artoscinote
abd6e794e9
Merge pull request #6049 from artoscinote/ma_SCI_9013
Implement result filters [SCI-9013]
2023-08-23 15:03:24 +02:00
aignatov-bio
3308ec9e55
Merge pull request #6051 from aignatov-bio/ai-sci-9027-move-task-status-to-secondary-navigation
Move status block to secondary navigation [SCI-9027]
2023-08-23 14:07:39 +02:00
Anton
f964a7461d Move status block to secondary navigation [SCI-9027] 2023-08-23 14:03:41 +02:00
artoscinote
e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013 2023-08-23 12:01:14 +02:00
Martin Artnik
b3965e5aca Implement result filters [SCI-9013] 2023-08-23 11:59:21 +02:00
aignatov-bio
3159cfb0e2
Merge pull request #6048 from aignatov-bio/ai-fix-file-name-for-result-orderable
Fix file name for result orderable
2023-08-23 11:39:08 +02:00
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