scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
16314 commits 69 branches 179 tags 165 MiB
Commit graph

3405 commits

Author SHA1 Message Date
Anton 985dddef17 Finish experiment table [SCI-9800] 2023-12-11 15:57:45 +01:00
Soufiane a37d4ead47
Improve wording in Protocol templates and Inventory [SCI-9685] (#6789) 2023-12-11 13:58:04 +01:00
Martin Artnik c7c72983ca
Merge pull request #6793 from G-Chubinidze/gc_SCI_9811 
[CAPA] Unable to view assigned persons within a task [SCI-9811]
 2023-12-11 13:35:07 +01:00
Anton 75f7437001 Fix markup 2023-12-11 09:26:13 +01:00
Martin Artnik af7bae48a0 Implement delivery notifications, fix specs [SCI-9856] 2023-12-08 13:57:43 +01:00
Giga Chubinidze d93b4c6b78 Update terminology for opening attached files 2023-12-08 12:25:28 +04:00
Ivan Kljun aa04e9014c Create notification recipient class for change_users_role_on_team_activity [SCI-9847] 2023-12-07 14:36:12 +01:00
Anton 7ffad5b659 Experiments table migration [SCI-9800] 2023-12-07 12:53:21 +01:00
Anton 65e9e5abb4 Merge branch 'develop' into features/new-datatable 2023-12-07 09:51:45 +01:00
Anton 687bac024a Migrate access modal to VUE [SCI-9799] 2023-12-06 14:12:22 +01:00
Martin Artnik 7c73f284b4 Merge branch 'features/notification-revamp' into develop 2023-12-06 11:36:32 +01:00
Martin Artnik 66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Oleksii Kriuchykhin d1e7ab5efb Merge branch 'develop' into features/inventory-items-relationships 2023-12-06 11:11:30 +01:00
Martin Artnik 94e8a8d89f
Merge pull request #6759 from ivanscinote/SCI-9782-ik 
Create RepositoryItemRecipients for Low Stock and Date/Date&Time notifications [SCI-9782]
 2023-12-06 10:40:34 +01:00
Ivan Kljun 8c31680573 Create RepositoryItemRecipients for Low Stock and Date/Date&Time notifications [SCI-9782] 2023-12-06 10:38:24 +01:00
Giga Chubinidze b155462496 updated numbering to fit develop branch 2023-12-06 11:54:46 +04:00
G-Chubinidze e1ff625351
Merge branch 'features/asset-sync' into gc_SCI_9710 2023-12-06 11:48:18 +04:00
Martin Artnik 804ee30169 Add scheme to asset sync url in extends 2023-12-05 15:39:57 +01:00
Oleksii Kriuchykhin feeb350114 Merge branch 'develop' into features/linked-inventories 2023-12-05 14:12:42 +01:00
Martin Artnik 5ce927ce37
Merge pull request #6763 from ivanscinote/SCI-9775-ik 
Fix wording for my_module_due_date_reminder [SCI-9775]
 2023-12-05 13:23:17 +01:00
Ivan Kljun 2ddcbe9824 Fix wording for my_module_due_date_reminder [SCI-9775] 2023-12-05 13:19:35 +01:00
Martin Artnik 235d94e1cf Implement SciNote edit button with checks and info [SCI-9756] 2023-12-05 12:35:55 +01:00
Ivan Kljun 472a095a6a Remove 'There is a change on assigned task' notification category [SCI-9767] 2023-12-05 10:55:54 +01:00
Giga Chubinidze 33527d14c8 [CAPA] Unable to view assigned persons within a task [SCI-9811] 2023-12-05 12:05:35 +04:00
Ivan Kljun dde7c512a9 Fix translations for notif (Due date, Date/Date&Time, Low stock) [SCI-9775] 2023-12-04 14:13:16 +01:00
Anton 9971de5c4c Finalize projects table 2023-12-01 09:56:14 +01:00
Giga Chubinidze 1415044054 Wording of subgroups of notifications in UI [SCI-9798] 2023-12-01 12:35:16 +04:00
Martin Artnik a5bbc190f9 Merge branch 'develop' into features/inventory-items-relationships 2023-11-29 15:16:22 +01:00
Anton be9c6c759f Remove legacy [SCI-9680] 2023-11-29 11:36:44 +01:00
Anton c09ce12ddc Add design page and refactored dropdown [SCI-9680] 2023-11-29 00:01:23 +01:00
Gregor Lasnibat 3dd15ed1a5 Implement the 'Add relationship' modal, only front end [SCI-9671] 2023-11-28 12:44:57 +01:00
Martin Artnik f3ee9a854f Merge branch 'develop' into features/notification-revamp 2023-11-28 10:26:51 +01:00
Martin Artnik dd2b33ddaf
Merge pull request #6654 from ivanscinote/SCI-9636-IK 
Add notification cleanup job [SCI-9636]
 2023-11-27 17:48:27 +01:00
Martin Artnik 481abd0cc1 Add notification cleanup job [SCI-9636] 2023-11-27 17:44:12 +01:00
Martin Artnik 54fe02d289
Merge pull request #6718 from G-Chubinidze/gc_SCI_9390 
Smaller changes in activity grouping [SCI-9390]
 2023-11-27 14:11:04 +01:00
Martin Artnik 5aff062a76 Copy changes for report wizard [SCI-9693] 2023-11-27 12:56:33 +01:00
Giga Chubinidze cc48087beb Smaller changes in activity grouping [SCI-9390] 2023-11-27 15:54:14 +04:00
G-Chubinidze 006b0d32b3
Merge branch 'features/notification-revamp' into gc_SCI_9695 2023-11-27 15:05:45 +04:00
Giga Chubinidze ceb94f72c0 added always on subgroup 2023-11-27 15:01:23 +04:00
Anton f6783b219b Fix smart annotations [SCI-9605][SCI-9772] 2023-11-27 11:38:54 +01:00
Giga Chubinidze 28921bec47 Default Notifications and migration (notifications revamp) [SCI-9695] 2023-11-27 09:21:34 +04:00
Alex Kriuchykhin 9e9f8ab402
Add external_id field to repository list and checklist items [SCI-9454] (#6702) 2023-11-24 14:21:11 +01:00
Oleksii Kriuchykhin fa35de6a58 Merge branch 'develop' into features/inventory-items-relationships 2023-11-24 14:04:18 +01:00
Oleksii Kriuchykhin 9adad3139c Merge branch 'features/inventory-item-card-edit' into develop 2023-11-23 11:39:08 +01:00
Oleksii Kriuchykhin 01219f09eb Merge branch 'develop' into features/inventory-items-relationships 2023-11-23 11:08:42 +01:00
Anton 38024d563a Add initial table [SCI-9680] 2023-11-23 10:55:51 +01:00
Anton 8a0dd0258e Merge branch 'develop' into features/new-datatable 2023-11-23 10:47:58 +01:00
Anton b18b1d9697 Fix invitation notifications [SCI-9609] 2023-11-23 10:36:13 +01:00
Anton 0ec734b467 Merge branch 'develop' into features/notification-revamp 2023-11-23 10:05:42 +01:00
Giga Chubinidze d0877de13c Add activity for updating a file via AssetSync [SCI-9710] 2023-11-23 04:12:38 +04:00
Gregor Lasnibat 6db47192fd
Merge pull request #6686 from lasniscinote/gl_SCI_9683 
(fix) Item card behavior in cases of error states [SCI-9683]
 2023-11-22 16:16:10 +01:00
Martin Artnik e13314349c Merge branch 'release/1.28.0' into develop 2023-11-22 15:13:57 +01:00
Martin Artnik 18b5222227 Merge branch 'features/inventory-item-card-edit' into develop 2023-11-22 15:09:10 +01:00
Gregor Lasnibat 1ff3e43171 (fix) Item card behavior in cases of error states [SCI-9683] 2023-11-22 14:15:24 +01:00
Martin Artnik 720eceb59f
Merge pull request #6557 from artoscinote/ma_SCI_9608 
Implement general notification mailer [SCI-9608]
 2023-11-21 14:49:06 +01:00
Martin Artnik e0cd9cf9fd Implement general notification mailer [SCI-9608] 2023-11-21 14:21:55 +01:00
Anton 25048ddd4e Fix filters and missing barcode icon [SCI-9748] 2023-11-21 13:51:16 +01:00
Giga Chubinidze 5f35b4510c added MyModules module 2023-11-21 10:59:16 +04:00
wandji 7a916b7d11
Add activities to inventories [SCI-5578] (#6588) 
* Add activities for stock consumption and inventories export and inventory item file edit [SCI-5578]

* Improve check for creating inventory item asset activity [5578]

* Improve query for inventory items in consumption export [SCI-5578]
 2023-11-20 13:37:57 +01:00
Alex Kriuchykhin 43b8f97126
Improve handling of unshared inventories and unassigned items for stock ledger records [SCI-9504] (#6565) 2023-11-20 13:24:31 +01:00
Giga Chubinidze 8bd87a5dd4 Modify 3 colors for tags [SCI-9664] 2023-11-17 16:17:51 +04:00
Oleksii Kriuchykhin cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
Oleksii Kriuchykhin e8abbbbcdf Merge branch 'develop' into features/inventory-items-relationships 2023-11-16 11:04:27 +01:00
Giga Chubinidze 85709d7b43 Fix setting of ASSET_SYNC_URL on the fronted [SCI-9665] 2023-11-16 12:28:31 +04:00
Anton 13eca7e035 Fix time format and picker position [SCI-9706] 2023-11-15 16:18:00 +01:00
Oleksii Kriuchykhin 3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Oleksii Kriuchykhin fdb4e93e16 Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-14 15:28:57 +01:00
Soufiane 12006bc286
Add relationships section to the items sidebar [SCI-9668] (#6623) 2023-11-14 14:04:46 +01:00
wandji 73cb2528c8
Add repository_row_connection controller and actions [SCI-9672] (#6633) 
* Add repository_row_connection controller and actions [SCI-9672]
 2023-11-14 14:02:26 +01:00
Soufiane f80046418a
Add relationship columns to inventory exports [SCI-9673] (#6634) 2023-11-14 11:57:11 +01:00
Martin Artnik fd159f0adc
Merge pull request #6599 from G-Chubinidze/gc_SCI_9625 
Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625]
 2023-11-14 09:44:35 +01:00
Martin Artnik 57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +01:00
wandji 94a2f2e6fd
Update placeholder text for date time field item card [SCI-9615] (#6627) 2023-11-13 17:07:51 +01:00
Anton cf0a1931cd Merge branch 'develop' into features/datetime-picker 2023-11-13 14:14:09 +01:00
wandji 2e3ae5cc5c
Fix multiple css issues on Item card [SCI-9653] (#6608) 2023-11-13 14:13:53 +01:00
Martin Artnik fcefb64666 Allow data-turbolinks attribute in sanitization [SCI-9683] 2023-11-10 14:33:50 +01:00
Giga Chubinidze 31883ff4c0 Add colors for tags [SCI-9664] 2023-11-10 17:00:18 +04:00
Anton 7048729415 Merge branch 'features/datetime-picker' into features/new-datatable 2023-11-10 13:35:46 +01:00
Oleksii Kriuchykhin 29f43d42af Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin 0b72740062 Merge branch 'develop' into features/inventory-items-relationships 2023-11-10 09:19:45 +01:00
Anton c7cd435e95 Merge branch 'develop' into features/datetime-picker 2023-11-09 11:40:26 +01:00
Anton 3211fa7cce Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2023-11-09 11:36:44 +01:00
Alex Kriuchykhin 125e0fbbfe
Run Chromium with unset env variables [SCI-9660] (#6606) 2023-11-08 14:27:11 +01:00
Anton ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Giga Chubinidze 39ce9c1781 Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625] 2023-11-08 12:22:34 +04:00
Ivan Kljun 4481541a9f Implement repository date reminder notification [SCI-9561] 2023-11-07 11:36:23 +01:00
Oleksii Kriuchykhin 67f9fe8ed0 Implement fetching of endpoint URLs from OpenID config URL in Azure AD strategy [SCI-9041] 2023-11-06 13:28:49 +01:00
Gregor Lasnibat 68dc671f06 Fixed Translation error for Error message on item card [SCI-9601] 2023-11-03 11:17:55 +01:00
Martin Artnik f015c8c56e Create a copy of the synced file in case of conflict [SCI-9640] 2023-11-03 09:46:05 +01:00
Martin Artnik 3a3d62a1be Merge branch 'develop' into features/asset-sync 2023-11-02 11:28:17 +01:00
Giga Chubinidze dd2a4a4047 Implement Task Due Date Reminder notification [SCI-9562] 2023-11-02 07:07:35 +04:00
wandji 4fd3933bdb
Fix wrong placeholders for item card fields in edit mode [SCI-9615] (#6553) 
* Fix wrong placeholders for item card fields in edit mode [SCI-9615]

* Refactor date time range className [SCI-9615]
 2023-10-30 17:30:23 +01:00
Anton 70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
Oleksii Kriuchykhin ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00
Martin Artnik 6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +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
Martin Artnik 5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Anton fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
ajugo 7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +02:00
Anton 0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
aignatov-bio ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize 
Features/navigator resize
 2023-10-25 14:05:14 +02:00
Anton da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Martin Artnik d181465e12 Fix initialization and add download endpoint [SCI-9465] 2023-10-25 09:30:42 +02:00
Ivan Kljun 2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Martin Artnik 7376b363a8 Asset sync model and endpoints [SCI-9465] (#6399) 2023-10-25 09:30:42 +02:00
Anton e0f2677d1c Fix marvinJS in tinymce [SCI-9594] 2023-10-24 16:31:20 +02:00
ajugo a98d86e9b8
Add activities for cell editing on the new item card [SCI-9423] (#6465) 2023-10-24 16:22:10 +02:00
Soufiane 809aaa8aa3
Implement field editing for the new item card [SCI-9412] (#6421) 
- Created new checklist component.
- updated the functionality of the select-search component.
- Name field.
- Text fields.
- Numeric fields.
- List fields.
- Status fields.
- Checklist fields.
 2023-10-24 15:49:37 +02:00
Anton 3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
Oleksii Kriuchykhin ae7995fee2 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-19 12:59:45 +02:00
Martin Artnik 4e76fbe087
Merge pull request #6436 from okriuchykhin/ok_SCI_9372 
Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372]
 2023-10-19 11:44:02 +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
Soufiane fc52b7bdab
Fix item card css issues [SCI-9536] (#6458) 2023-10-17 17:09:11 +02:00
ajugo 9f1c668a10
Fix result assets download for shareable links [SCI-9542] (#6460) 2023-10-17 11:35:16 +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
aignatov-bio bb0bb7088a
Merge pull request #6450 from aignatov-bio/ai-sci-9513-migrate-user-settings-to-vue 
Refactor user settings page [SCI-9513]
 2023-10-16 15:21:54 +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
Martin Artnik dd4ea9be8a
Merge pull request #6449 from G-Chubinidze/gc_SCI_9390 
Smaller changes in activity grouping [SCI-9390]
 2023-10-16 10:03:04 +02:00
Anton 225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Anton 16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02:00
Giga Chubinidze 9e86f23858 cleanup 2023-10-16 11:33:53 +04:00
Giga Chubinidze ee6da5b0d6 Smaller changes in activity grouping [SCI-9390] 2023-10-16 11:27:44 +04:00
Martin Artnik 1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements 2023-10-13 14:55:16 +02:00
aignatov-bio 2db189ab95
Merge pull request #6422 from aignatov-bio/ai-sci-9384-migrate-to-noticed-gem 
Migrate to noticed gem [SCI-9384]
 2023-10-13 14:01:26 +02:00
Oleksii Kriuchykhin 984ad7757f Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372] 2023-10-13 13:38:41 +02:00
Martin Artnik 9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +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
Oleksii Kriuchykhin 9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
aignatov-bio d7dd6fdf15
Remove result activities from protocol group [SCI-9491] (#6420) 2023-10-12 15:36:39 +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
Ivan Kljun d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45:51 +02:00
Anton c2b85d8981 Add new general notifications structure [SCI-9511] 2023-10-12 11:51:01 +02:00
Anton 726ff5e238 Remove old notification extends [SCI-9384] 2023-10-12 11:38:19 +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
Martin Artnik d8247813c3
Merge pull request #6402 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file 
Allow data attr in sanitize config [SCI-9464]
 2023-10-10 14:37:54 +02:00
Ivan Kljun d68d7af529 Allow data attr in sanitize config [SCI-9464] 2023-10-10 14:33:55 +02:00
Anton 1ab62616c4 Fix marvinJS move on results [SCI-9499] 2023-10-10 14:29:06 +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 9bf5903c54
Merge pull request #6384 from aignatov-bio/ai-sci-9491-fix-acitvity-type-selector 
Fix activity type selector [SCI-9491]
 2023-10-09 09:42:50 +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
Anton 6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02:00
Giga Chubinidze 9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
Alex Kriuchykhin 5b39c2f08e
Merge pull request #6258 from sboursen-scinote/sb_SCI-9068 
FIX: Clicking any link makes a side scrollbar appear on the page [SCI-9068]
 2023-10-05 15:33:35 +02: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
Oleksii Kriuchykhin 421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Andrej 9b1d9823c1 Add missing wording for failed export email/notifications [SCI-9442] 2023-10-04 09:02:35 +02:00
Martin Artnik 5960446401
Merge pull request #6320 from wandji20/wb-SCI-9406 
Add helper method to show grey layout background [SCI-9406]
 2023-10-03 16:43:18 +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
sboursen-scinote 1aaea77070 Add dynamic card placeholder calculation to prevent scrollbars [SCI-9068] 2023-10-03 15:00:26 +02:00
wandji20 b5acdd2bf6 Refactor application helper method [SCI-9406] 2023-10-03 13:24:39 +01:00
Alex Kriuchykhin f3f4fc1ad0
Merge pull request #6333 from okriuchykhin/ok_SCI_9368 
Use custom sanitizer config for PDF reports generation [SCI-9368]
 2023-10-03 13:09:50 +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 a85b2643ce
Merge pull request #6319 from artoscinote/ma_SCI_9425 
Implement default name for results [SCI-9425]
 2023-10-03 10:56:03 +02: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
Oleksii Kriuchykhin d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Gregor Lasnibat 80de7483eb Prepare a modal displaying relationships for a specific item [SCI-9357] 2023-10-03 09:33:39 +02:00
Andrej 835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Alex Kriuchykhin f40e5a3c46
Merge pull request #6294 from lasniscinote/gl_SCI_9354 
Item card preload and section title animation[SCI-9354]
 2023-10-02 13:51:49 +02: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
Oleksii Kriuchykhin 2bbb33d225 Reduce allowed data attributes in sanitizer config only to data-mce-token [SCI-9369] 2023-09-29 10:49:53 +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
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 d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299 
OVE - Activities related to Task result [SCI-9299]
 2023-09-27 12:49:58 +02:00
Giga Chubinidze b53ac04577 styling fix 2023-09-27 14:47:35 +04: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
Giga Chubinidze da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04: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
Andrej 1aa9b17b1a Add relationship column to the inventory [SCI-9356] 2023-09-26 11:12:45 +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
Anton bb4349f346 Initial label templates refactor [SCI-9303] 2023-09-25 14:24:22 +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
aignatov-bio a19a2d16e9
Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions 
Refactor checklist [SCI-9340]
 2023-09-22 12:09:41 +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
Oleksii Kriuchykhin f6dbd45746 Fix missing fonts in PDF reports [SCI-7548] 2023-09-22 10:11:18 +02:00
Anton 77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00