Commit graph

727 commits

Author SHA1 Message Date
Martin Artnik 18b5222227 Merge branch 'features/inventory-item-card-edit' into develop 2023-11-22 15:09:10 +01:00
Anton 25048ddd4e Fix filters and missing barcode icon [SCI-9748] 2023-11-21 13:51:16 +01:00
Anton d68367eb37 Fix filters layout [SCI-9697] 2023-11-20 16:38:45 +01:00
Martin Artnik 3547b7c2d1
Merge pull request #6655 from scinote-eln/e2e
Merge e2e
2023-11-16 13:23:13 +01:00
Oleksii Kriuchykhin cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
Anton ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Anton d4f555da40 Replace datepicker in filters [SCI-9626] 2023-11-06 10:12:06 +01:00
Oleksii Kriuchykhin ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00
wandji c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474)
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
2023-10-27 10:31:38 +02:00
Oleksii Kriuchykhin 6235a03595 Merge branch 'develop' into e2e 2023-10-26 15:36:36 +02:00
Anton da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Martin Artnik 2850135e96 Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
2023-10-24 13:14:23 +02:00
Martin Artnik 1d3c17206c
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
2023-10-23 13:59:37 +02:00
Martin Artnik ee076c7f3b Fix user smart annotations [SCI-9574] 2023-10-23 11:50:24 +02:00
Martin Artnik d74cd77e41
Merge pull request #6516 from scinote-eln/develop
Merge develop
2023-10-23 11:14:50 +02:00
Gregor Lasnibat 0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
Martin Vražič c392b5114f Modified and added new tags mostly for inventories section. 2023-10-20 11:23:51 +02:00
Giga Chubinidze c865fedb7f Remove 'More [...]' button from the preview screens [SCI-9236] 2023-10-18 10:37:33 +04:00
Andrej 79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Oleksii Kriuchykhin c51612c2a1 Merge branch 'develop' into e2e 2023-10-09 10:26:00 +02:00
Andrej ab49c52054 Fix css for item card [SCI-9475] 2023-10-09 09:33:38 +02:00
Martin Artnik 5c7ee78cd6 Fix attachment issues [SCI-9410] 2023-10-05 15:44:41 +02:00
Martin Artnik 03d6d99f7e
Merge pull request #6323 from G-Chubinidze/gc_SCI_9332
Smart annotation modal: inventory name not correct [SCI-9332]
2023-10-03 10:39:23 +02:00
Giga Chubinidze de2023c873 removed unnecessary tw classes 2023-10-03 12:38:40 +04:00
Alex Kriuchykhin 40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Andrej 835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Giga Chubinidze f99db28760 using tailwind 2023-10-03 11:04:38 +04:00
Giga Chubinidze 3932b22cd4 Smart annotation modal: inventory name not correct [SCI-9332] 2023-10-02 08:14:16 +04:00
Martin Artnik 6e405d40a6 Refactor datepicker limits [SCI-9338] 2023-09-28 13:33:17 +02:00
Gregor Lasnibat f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354]
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
2023-09-28 13:21:20 +02:00
Oleksii Kriuchykhin d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
wandji 7dac5e63be
Add navigation section to item card [SCI-9154] (#6252) 2023-09-25 10:49:09 +02:00
wandji 5314ef14c7
Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284)
This reverts commit 7430f2240d.
2023-09-25 10:46:19 +02:00
wandji 7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Anton 97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
Martin Artnik 44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Oleksii Kriuchykhin 3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Martin Vražič b0f3628ee9 changing previous naming at left menu & adding e2e tags on project section 2023-09-13 23:40:50 +02:00
Martin Vražič cadc0a336b added e2e tags to left menu 2023-09-13 12:05:10 +02:00
Giga Chubinidze c071eb4c16 Implement inline edit design changes for legacy inline edit (PET titles, etc.) 2023-09-07 03:56:42 +04:00
Gregor Lasnibat 589faef72f Fix gene sequence attachment icons [SCI-9213] 2023-09-02 03:14:51 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Oleksii Kriuchykhin b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Anton 171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02:00
Soufiane e00a8bb7a3
Update logo across Scinote [SCI-8997] (#6058)
- Update logo in PDF reports
- Update logo in Docx reports
- Update logo in sign-in page
2023-08-24 16:27:33 +02:00
Martin Artnik 0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
wandji 71bcc78243
Verify sequence asset preview for non-editable role and add css class [SCI-8967] (#6012)
* Verify sequence asset preview for non-editable user role and add css class [SCI-8967]

* Add safe navigation operator when checking gene sequence blob meta asset_type [SCI-9867]
2023-08-23 13:12:46 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00