Commit graph

1037 commits

Author SHA1 Message Date
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
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
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
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 01219f09eb Merge branch 'develop' into features/inventory-items-relationships 2023-11-23 11:08:42 +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
Martin Artnik e13314349c Merge branch 'release/1.28.0' into develop 2023-11-22 15:13:57 +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
Giga Chubinidze 8bd87a5dd4 Modify 3 colors for tags [SCI-9664] 2023-11-17 16:17:51 +04:00
Oleksii Kriuchykhin e8abbbbcdf Merge branch 'develop' into features/inventory-items-relationships 2023-11-16 11:04:27 +01:00
Oleksii Kriuchykhin 3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Martin Artnik 57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +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 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
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
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
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
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
Martin Artnik a952f3ba70 Implement low stock notification [SCI-9522] 2023-10-19 11:33:40 +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
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
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
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
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
Anton 6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02: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
Oleksii Kriuchykhin 421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +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
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
Giga Chubinidze b53ac04577 styling fix 2023-09-27 14:47:35 +04:00
Giga Chubinidze da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04: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 bb4349f346 Initial label templates refactor [SCI-9303] 2023-09-25 14:24:22 +02:00
Oleksii Kriuchykhin f6dbd45746 Fix missing fonts in PDF reports [SCI-7548] 2023-09-22 10:11:18 +02:00
sboursen-scinote aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
Giga Chubinidze b414cc4295 fixed hound and changed logic for ove to marvin 2023-09-19 12:50:45 +04:00
Giga Chubinidze 01e57e0395 Add activities for moving content between steps and results [SCI-9300] 2023-09-19 03:17:30 +04:00
Oleksii Kriuchykhin 3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Ivan Kljun af18a42129 Add constants for status state polling [SCI-9304] 2023-09-14 16:21:17 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Ivan Kljun c7123ebc8a Change result_* activities to *_old and create new ones [SCI-9010] 2023-09-12 09:45:34 +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
Ivan Kljun 1242ec588f Add and fix result activities [SCI-9010] 2023-09-08 11:36:59 +02:00
Anton 48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +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
wandji c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] (#6078) 2023-08-29 09:42:51 +02:00
Alex Kriuchykhin 165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00
artoscinote 9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] (#6056) 2023-08-23 16:49:17 +02:00
wandji 196b6628ae
Add task protocol activities for gene sequence asset actions [SCI-8965] (#6013) 2023-08-22 14:24:43 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +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