Oleksii Kriuchykhin
|
ae7995fee2
|
Merge branch 'develop' into features/inventory-item-card-edit
|
2023-10-19 12:59:45 +02:00 |
|
Martin Artnik
|
a952f3ba70
|
Implement low stock notification [SCI-9522]
|
2023-10-19 11:33:40 +02:00 |
|
sboursen-scinote
|
885b66504b
|
FIX no custom columns placeholder [SCI-9529]
|
2023-10-19 10:53:18 +02:00 |
|
Martin Artnik
|
fb9204df64
|
Merge branch 'develop' into features/bugfixes-and-css
|
2023-10-18 14:51:35 +02:00 |
|
Giga Chubinidze
|
f268a0cab0
|
Attachments renamed to Files [SCI-9505]
|
2023-10-17 11:33:29 +04:00 |
|
wandji
|
c8359cdf3a
|
Add controller action to update inventory item cell data [SCI-9478] (#6379)
|
2023-10-16 17:43:53 +02:00 |
|
Gregor Lasnibat
|
3b4fbc944f
|
Added archived columns [SCI-9469]
|
2023-10-16 13:02:28 +02:00 |
|
Gregor Lasnibat
|
57bfe0036b
|
Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444)
|
2023-10-16 10:12:21 +02:00 |
|
Anton
|
225193387a
|
Update notifications settings saving
|
2023-10-16 09:41:38 +02:00 |
|
Gregor Lasnibat
|
b5ece3429f
|
Fixed missing inventory columns on item card [SCI-9469] (#6416)
|
2023-10-13 09:51:50 +02:00 |
|
ajugo
|
04a898760a
|
Add assign button to item cards [SCI-9158] (#6326)
|
2023-10-12 15:46:13 +02:00 |
|
wandji
|
45cfe77ef7
|
Add qr code and print label to item card [SCI-9471 (#6364)
* Add qr acode and print label to item card [SCI-9471
* Remove jQuery handler for setting barcode image src [SCI-9471]
|
2023-10-12 15:10:54 +02:00 |
|
Oleksii Kriuchykhin
|
e08304d0cd
|
Merge branch 'develop' into features/inventory-item-card-edit
|
2023-10-11 10:51:51 +02:00 |
|
wandji
|
d236ba0a5b
|
Add reminders to item card [SCI-9154] (#6285)
* Add reminders to item card [SCI-9154]
* Refactor item card reminder component [SCI-9154]
|
2023-10-11 09:35:10 +02:00 |
|
Andrej
|
79118effa7
|
Merge branch 'develop' into features/october-release
|
2023-10-10 11:09:04 +02:00 |
|
Martin Artnik
|
a9b629bdf7
|
Copy fixes [SCI-9440]
|
2023-10-09 11:40:12 +02:00 |
|
Martin Artnik
|
1df8ad6f87
|
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424
CSS: Various issues [SCI-9424]
|
2023-10-09 09:41:48 +02:00 |
|
Giga Chubinidze
|
9b9b486324
|
CSS: Various issues [SCI-9424]
|
2023-10-09 11:35:52 +04:00 |
|
wandji20
|
d3c2a7e0ad
|
Fix issue with timestamps for reports [SCI-9420]
|
2023-10-05 12:25:08 +01:00 |
|
Alex Kriuchykhin
|
4888ebc3eb
|
Merge pull request #6346 from rekonder/aj_SCI_9442
Add missing wording for failed export email/notifications [SCI-9442]
|
2023-10-04 15:46:22 +02:00 |
|
Andrej
|
9b1d9823c1
|
Add missing wording for failed export email/notifications [SCI-9442]
|
2023-10-04 09:02:35 +02:00 |
|
Martin Artnik
|
64449af994
|
Merge pull request #6341 from artoscinote/ma_SCI_9441
Fix error translations [SCI-9441]
|
2023-10-03 15:32:00 +02:00 |
|
Martin Artnik
|
2b76fe6b5b
|
Fix error translations [SCI-9441]
|
2023-10-03 15:23:49 +02:00 |
|
wandji20
|
285276a59a
|
Rename item card export label [SCI-9157]
|
2023-10-03 10:54:45 +01:00 |
|
wandji20
|
2372edcf25
|
Add export button to item card [SCI-9157]
|
2023-10-03 10:52:57 +01:00 |
|
Martin Artnik
|
295de7b0bc
|
Implement default name for results [SCI-9425]
|
2023-09-29 13:01:41 +02:00 |
|
Martin Artnik
|
a1df2b7b52
|
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2
DOCX not working if result name empty. [SCI-9245]
|
2023-09-29 12:24:18 +02:00 |
|
Giga Chubinidze
|
0be8ab5839
|
used i18n
|
2023-09-29 14:18:45 +04: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 |
|
Alex Kriuchykhin
|
ba5ef94764
|
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp
Add assigned tasks block to the item card [SCI-9155]
|
2023-09-27 15:03:20 +02:00 |
|
Martin Artnik
|
923006dc38
|
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
|
2023-09-27 12:41:34 +02:00 |
|
Alex Kriuchykhin
|
9f03d88f12
|
Merge pull request #6201 from wandji20/wb-SCI-9225
Improve UI for stock consumption export [SCI-9225]
|
2023-09-27 09:21:22 +02:00 |
|
Alex Kriuchykhin
|
dc40b4354d
|
Merge pull request #6298 from okriuchykhin/ok_SCI_9282
Fix column placement in stock consumption export, add missing localization [SCI-9282]
|
2023-09-27 09:20:00 +02:00 |
|
Anton
|
f630b8860b
|
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
|
2023-09-26 16:23:16 +02:00 |
|
wandji20
|
213c752941
|
Improve UI for for exports in inventory with stock enabled [SCI-9225]
|
2023-09-26 15:20:18 +01:00 |
|
Oleksii Kriuchykhin
|
efae35816f
|
Fix column placement in stock consumption export, add missing localization [SCI-9282]
|
2023-09-26 13:35:02 +02:00 |
|
Oleksii Kriuchykhin
|
d69b7cc6e8
|
Merge branch 'develop' into features/october-release
|
2023-09-26 11:11:30 +02:00 |
|
Anton
|
2b9ae65a51
|
Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379]
|
2023-09-25 15:04:41 +02:00 |
|
Gregor Lasnibat
|
4e6646e3f9
|
Added a missing RepositoryTimeValue component [SCI-9153-v2]
PR fix [SCI-9153-v2]
PR fix 02 [SCI-9153-v2]
|
2023-09-25 14:02:05 +02:00 |
|
Andrej
|
4e6ccce9dd
|
Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp
|
2023-09-25 11:49:51 +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 |
|
Martin Artnik
|
3a22d7715d
|
Merge branch 'develop' into features/september-release
|
2023-09-25 10:37:40 +02:00 |
|
wandji
|
7430f2240d
|
Add navigation section to item card [SCI-9154] (#6268)
|
2023-09-25 09:53:12 +02:00 |
|
Andrej
|
9ca96145d5
|
Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp
|
2023-09-25 08:05:28 +02:00 |
|
Anton
|
5b434c4e4c
|
Fixes for new flyout [SCI-9343]
|
2023-09-23 19:15:35 +02:00 |
|
wandji
|
767c98c101
|
Add barcode and print label to item card [SCI-9156] (#6269)
* Add barcode and print label to item card [SCI-9156]
* Rename wrong label [SCI-9156]
|
2023-09-22 16:17:42 +02:00 |
|
sboursen-scinote
|
adc0a460bd
|
Improve logic for custom logos on error pages [SCI-9147]
- Switch to dynamic ERB templates.
- Move text to I18n
|
2023-09-22 10:26:32 +02:00 |
|
Gregor Lasnibat
|
1bf2bc6156
|
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
Fixed regular card (without cusotm columns) styles [SCI-9153]
Updated API to return column name, working on subcomponents [SCI-9153]
TooltipPreview on dynamic file component working [SCI-9153]
Finished new item card refactor [SCI-9153]
PR fix 01 [SCI-9153]
PR fixes 02 [SCI-9153]
|
2023-09-21 20:18:20 +02:00 |
|
Martin Artnik
|
810e0ffaff
|
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269
CSS: Results revamp issues [SCI-9269]
|
2023-09-21 10:00:14 +02:00 |
|
Giga Chubinidze
|
eb5d09e2fb
|
CSS: Results revamp issues
|
2023-09-21 10:52:41 +04:00 |
|
Alex Kriuchykhin
|
8e1f8296f4
|
Merge pull request #6243 from rekonder/aj_SCI_9272
Fix message for successful import protocol from protocol parser [SCI-9272]
|
2023-09-20 19:36:12 +02:00 |
|
Anton
|
4cc968bcb2
|
Filters modal fixes [SCI-9276]
|
2023-09-20 11:07:48 +02:00 |
|
Andrej
|
b47651750b
|
Fix message for successful import protocol from protocol parser [SCI-9272]
|
2023-09-19 15:47:51 +02:00 |
|
Andrej
|
56a57233df
|
Add assigned tasks block to the item card [SCI-9155]
|
2023-09-19 15:40:32 +02:00 |
|
Oleksii Kriuchykhin
|
3b170a0c0d
|
Connect backend to the new item card [SCI-9313]
|
2023-09-18 16:42:01 +02:00 |
|
Andrej
|
aebea07be4
|
Change dropdown options for importing protocols [SCI-9288]
|
2023-09-18 13:15:55 +02:00 |
|
Giga Chubinidze
|
73c1f67510
|
Missing modal when deleting an archived result [SCI-9291]
|
2023-09-18 01:28:22 +04:00 |
|
Oleksii Kriuchykhin
|
36f4e22fa3
|
Merge branch 'develop' into features/october-release
|
2023-09-15 14:08:45 +02:00 |
|
wandji20
|
de4cb662a6
|
Update translation name for item_card [SCI-9151]
|
2023-09-15 12:30:02 +01:00 |
|
wandji20
|
0b0eddd62b
|
Add default columns to inventory item card [SCI-9151]
|
2023-09-15 11:39:42 +01:00 |
|
Anton
|
af0fbfeec0
|
Merge branch 'develop' into features/september-release
|
2023-09-14 13:45:40 +02:00 |
|
Anton
|
4dab80e814
|
Update protocol css
|
2023-09-14 12:12:15 +02:00 |
|
Alex Kriuchykhin
|
40a82f67c0
|
Merge pull request #6216 from scinote-eln/features/ove-integration
Features/ove integration
|
2023-09-13 17:05:48 +02:00 |
|
ajugo
|
efed11be3c
|
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] (#6203)
|
2023-09-13 15:02:30 +02:00 |
|
wandji
|
642e3b5ff4
|
Add link to knowledge base [SCI-9231] (#6190)
* Add link to knowledge base [SCI-9231]
* Remove custom OVE help link [SCI-9231]
|
2023-09-13 14:45:28 +02:00 |
|
Anton
|
3bee8feb7d
|
Add flyout menu to step/results elements [SCI-9262]
|
2023-09-13 12:12:36 +02:00 |
|
Martin Artnik
|
c5eb1759b6
|
Merge pull request #6198 from artoscinote/ma_SCI_9285
Fix result pagination, fix new step/result buttons [SCI-9285]
|
2023-09-13 10:00:01 +02:00 |
|
Martin Artnik
|
6114dd7afc
|
Fix result pagination, fix new step/result buttons [SCI-9285]
|
2023-09-12 17:33:47 +02:00 |
|
Martin Artnik
|
e359f373ea
|
Consumption export copy fixes [SCI-9281] (#6195)
|
2023-09-12 15:21:17 +02:00 |
|
sboursen-scinote
|
ba390d6239
|
Remove unecessary locals [SCI-8968]
|
2023-09-12 09:15:11 +02:00 |
|
sboursen-scinote
|
bebae64944
|
Update OVE promo [SCI-8968]
- Move OVE promo to addons
- Update text and style of the promo
- Fix the iFrame closing logic
|
2023-09-11 16:42:50 +02:00 |
|
wandji
|
76b1aaab87
|
Rename OVE labels in file uploads [SCI-9163] (#6115)
* Rename OVE labels in file uploads [SCI-9163]
* Move translations for ove trial reminders [SCI-9163]
|
2023-09-11 12:58:12 +02:00 |
|
wandji
|
a3dd30d218
|
Load OVE packages via yarn [SCI-9231] (#6176)
* Add OVE yarn package and load assets from node_modules [SCI-9231]
* Move hardcoded text to i18 [SCI-9231]
|
2023-09-11 09:50:05 +02:00 |
|
Anton
|
7b44a47d51
|
Add active/archive switch to results page [SCI-9264]
|
2023-09-08 13:42:02 +02:00 |
|
wandji
|
e6252e09cc
|
Change consumption reposrt esport modal text [SCI-9194] (#6167)
|
2023-09-08 11:39:46 +02:00 |
|
wandji
|
a59f94c5a9
|
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092)
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]
* Add consumption export modal and improve report generation [SCI-9023]
* Add repository_row association to repository_ledger_records [SCI-9023]
|
2023-09-07 13:12:27 +02:00 |
|
Anton
|
1247406055
|
Add archive view to results [SCI-9223]
|
2023-09-06 15:06:27 +02:00 |
|
Martin Artnik
|
1e49cc5608
|
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
|
2023-09-06 14:31:05 +02:00 |
|
Giga Chubinidze
|
76b7c45021
|
Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187]
|
2023-09-06 16:12:31 +04:00 |
|
Alex Kriuchykhin
|
eea24a69e9
|
Add FailureNotifiableJob jobs concerns for creating failure notifications for users [SCI-9119] (#6147)
|
2023-09-06 12:51:34 +02:00 |
|
aignatov-bio
|
b5883178a4
|
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework
Rework inline edit vue component UI [SCI-9016]
|
2023-09-06 10:49:18 +02:00 |
|
aignatov-bio
|
7a32703c1a
|
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability
|
2023-09-05 14:41:23 +02:00 |
|
aignatov-bio
|
c33243b962
|
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields
Add title to text component [SCI-9141]
|
2023-09-05 14:32:42 +02:00 |
|
Oleksii Kriuchykhin
|
2c816cf463
|
Merge branch 'release/1.28.0' into develop
|
2023-09-05 12:54:37 +02:00 |
|
Alex Kriuchykhin
|
5928f708e1
|
Remove user controlled method execution from connected_accounts controller, add Okta unlinking functionality [SCI-9220] (#6135)
|
2023-09-05 12:53:51 +02:00 |
|
Ivan Kljun
|
86e2cfe747
|
Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework
|
2023-09-05 11:31:30 +02:00 |
|
artoscinote
|
8d352b758a
|
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
|
2023-09-05 11:09:08 +02:00 |
|
Ivan Kljun
|
56744e2dcd
|
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
|
2023-09-05 11:02:39 +02:00 |
|
Giga Chubinidze
|
b7da98c1dd
|
Archiving results doesn't work [SCI-9179]
|
2023-09-05 11:55:15 +04:00 |
|
Anton
|
86f413cc71
|
Add title to text component [SCI-9141]
|
2023-09-04 14:13:29 +02:00 |
|
Gregor Lasnibat
|
589faef72f
|
Fix gene sequence attachment icons [SCI-9213]
|
2023-09-02 03:14:51 +02:00 |
|
Ivan Kljun
|
40638dbb63
|
Rework inline edit vue component UI [SCI-9016]
|
2023-09-01 17:18:13 +02:00 |
|
artoscinote
|
dc535bce52
|
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186
Button translation in the "Move to different result" Modal [sci-9186]
|
2023-09-01 11:40:57 +02:00 |
|
artoscinote
|
7b73e03a5f
|
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
|
2023-09-01 11:40:34 +02:00 |
|
artoscinote
|
51227b5c65
|
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081
Placeholder text (titles, description field) [SCI-9081]
|
2023-09-01 11:02:06 +02:00 |
|
Martin Artnik
|
3724a4a067
|
Merge branch 'develop' into features/september-release
|
2023-09-01 10:30:48 +02:00 |
|
Giga Chubinidze
|
6db9134065
|
Button translation in the "Move to different result" Modal
|
2023-09-01 11:59:56 +04:00 |
|
Giga Chubinidze
|
100fdde5ca
|
Placeholder text in the "Move to different result" modal dropdown
|
2023-09-01 11:49:43 +04:00 |
|
Giga Chubinidze
|
793ab0eb99
|
Placeholder text (titles, description field) [SCI-9081]
|
2023-09-01 10:58:00 +04:00 |
|