Commit graph

3477 commits

Author SHA1 Message Date
Anton
9d19fe8382 Merge branch 'develop' into features/asset-sync 2024-01-19 11:33:40 +01:00
Anton
4b3666b4f8 Merge branch 'develop' into features/new-datatable 2024-01-19 11:10:32 +01:00
Anton
ed2a54229a Add design page 2024-01-19 10:52:07 +01:00
Giga Chubinidze
05b1e906bb removed archive confirm locales 2024-01-19 13:46:34 +04:00
Ivan Kljun
c9490ca528 Implement saving of table state to DB [SCI-9983] 2024-01-19 10:12:54 +01:00
Oleksii Kriuchykhin
d146dc8cb4 Merge branch 'develop' into features/sso-improvements 2024-01-19 09:31:12 +01:00
Giga Chubinidze
4f690db5a9 Improvements of the SciNote Edit option in "Add-ons" 2024-01-18 04:12:08 +04:00
Giga Chubinidze
a5c7e7b8c8 changed flash message 2024-01-17 12:58:43 +04:00
Giga Chubinidze
536f777341 Change text on Inventory modals [SCI-9991] 2024-01-17 12:56:34 +04:00
ajugo
d0ecfe53dc
Add no access text to item card [SCI-10013] (#6959) 2024-01-16 15:06:03 +01:00
Anton
af811db890 Remove old tables code [SCI-10006] 2024-01-16 14:13:40 +01:00
G-Chubinidze
51bcc96251
Merge branch 'features/asset-sync' into gc_SCI_9757 2024-01-16 17:02:46 +04:00
ajugo
701c4c2f86
Fix unlinkind relationship connections [SCI-9912] (#6942) 2024-01-15 12:03:09 +01:00
Martin Artnik
ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
ajugo
566decd9ed
Inventory relationship fixes [SCI-10005] (#6941) 2024-01-15 11:08:08 +01:00
ajugo
f39e9501cf
Removed proxing of API V1 endpoints to the new V2 namespace [SCI-9976] (#6943) 2024-01-15 10:01:51 +01:00
ajugo
98ee391d03
Filter already connected items on repository item relationship modal [SCI-9916] (#6934) 2024-01-15 09:41:52 +01:00
ajugo
81fbd38b0c
Increase timeout for PDF generation in Grover config [SCI-9969] (#6937) 2024-01-15 09:38:22 +01:00
Giga Chubinidze
83a2657bd1 Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI9760] 2024-01-12 03:10:11 +04:00
Anton
7233f4c8ab Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:27:10 +01:00
Anton
de72f60cc1 Merge branch 'develop' into features/new-datatable 2024-01-11 15:14:36 +01:00
Gregor Lasnibat
a7f332e630 (fix) Update the multiselect dropdown color switch step 2 [SCI-9973] 2024-01-11 11:59:08 +01:00
Anton
62edf89699 Replace reports table [SCI-9803] 2024-01-11 10:06:39 +01:00
Soufiane
c1453a1fe5
Add form for OpenID [SCI-9937] (#6918) 2024-01-10 17:20:39 +01:00
Oleksii Kriuchykhin
3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Martin Artnik
7a4d17f63e Merge branch 'develop' into features/asset-sync 2024-01-10 16:31:21 +01:00
Soufiane
a7dd9d49b2
Add links to items in linked/unlinked related activities [SCI-9718] (#6921) 2024-01-10 15:32:01 +01:00
Anton
3346c55941 Merge branch 'develop' into features/new-datatable 2024-01-09 10:36:21 +01:00
ajugo
a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
wandji
a201c96aef
Fix issue add/removing stock [SCI-9966] (#6909) 2024-01-09 09:33:14 +01:00
wandji
c43dd38af4
Fix CSS issues add relationship modal [SCI-9955] (#6897) 2024-01-08 14:49:38 +01:00
wandji
16bf3217e4
Fix issue opening item card [SCI-9961] (#6898)
* Fix issue opening item card [SCI-9961]

* Fix failing tests [SCI-9961]
2024-01-08 11:30:04 +01:00
wandji
465c8d1f80
Unify API step and result elements controllers implementation and types [SCI-9907] (#6854)
* Unify api step and result elements controllers implementation and types [SCI-9907]

* Update wrong serializer types [SCI-9907]

* Rename result and step text types [SCI-9907]

* Combine result and step assets serializer [SCI-9907]
2024-01-08 10:31:14 +01:00
Anton
993a8da518 Migrate inventory tables [SCI-9804] 2024-01-05 19:03:14 +01:00
Soufiane
c3f8e873e9
Fix 500 error when adding stock to item [SCI-9498] (#6883) 2024-01-05 13:10:45 +01:00
Oleksii Kriuchykhin
95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Ivan Kljun
44556f5070 Add Teleport for modals [SCI-9862] 2024-01-05 11:17:00 +01:00
Soufiane
67ea1b15fe
Implement API V2 endpoints for item relationships [SCI-9719] (#6847) 2024-01-04 16:42:25 +01:00
Ivan Kljun
60001e282c Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-9862-ik 2024-01-04 13:27:28 +01:00
Martin Artnik
e360113838 Merge branch 'develop' into features/asset-sync 2024-01-04 10:07:11 +01:00
Giga Chubinidze
509024458d new linter fixes 2024-01-04 03:13:21 +04:00
wandji
9ade9e890f
Render webhooks form url errors using data-error-text attribute [SCI-9743] (#6869) 2024-01-03 19:08:33 +01:00
G-Chubinidze
84c53cb5f5
Merge branch 'features/asset-sync' into gc_SCI_9710 2024-01-03 18:23:25 +04:00
Anton
4671754d52 Migrate protocols table [SCI-9802] 2024-01-03 14:57:32 +01:00
Soufiane
cbe1eef8af
Add the ability to unlink parent/child items [SCI-9712] (#6725) 2024-01-03 14:15:30 +01:00
Martin Artnik
bd2d843684
Merge pull request #6822 from ivanscinote/SCI-9838-ik
Implement 'Open locally' button and dropdown for thumbnail [SCI-9838]
2024-01-03 11:46:44 +01:00
Martin Artnik
7308e18435
Merge pull request #6836 from G-Chubinidze/gc_SCI_9839
Add 12 well plate option - "Insert content" select menu (protocol, results, protocol template) [SCI-9839]
2024-01-03 11:34:55 +01:00
Giga Chubinidze
cc8a10edb0 "Move" feature for multiple selected tasks and experiments (bulk action) 2023-12-29 12:53:46 +04:00
Soufiane
5ca33bb96a
Add activities for item relationships [SCI-9718] (#6788) 2023-12-21 12:33:06 +01:00
Gregor Lasnibat
3e4ccbcc75
(fix) Item card minor issue [SCI-9814_v2] (#6846) 2023-12-21 11:55:12 +01:00
Alex Kriuchykhin
3de2f6d0f1
Add generic SAML SSO strategy implementation [SCI-9579] (#6775) 2023-12-20 17:52:33 +01:00
Anton
79969492dd Replace tasks table [SCI-9801] 2023-12-20 17:47:09 +01:00
wandji
a4e573e02f
Rename relationships inventory column SCI-[9905] (#6850) 2023-12-20 16:24:39 +01:00
Alex Kriuchykhin
dbedac3a9b
Add omniauth_openid_connect gem, implement basic sign-in flow [SCI-9578] (#6666) 2023-12-20 14:02:09 +01:00
Soufiane
6d65315741
Fix wide table scroll bar issues on shared tasks [SCI-9762] (#6767) 2023-12-20 10:11:15 +01:00
wandji
54b1c182d8
Add V2 API endpoints for step elements [SCI-9650] (#6825)
* Add V2 API endpoints for step elements [SCI-9650]

* Rewrite step controller actions in order to read V2 step serializer [SCI-9650]
2023-12-19 15:36:41 +01:00
Giga Chubinidze
9ff30b2795 Add 12 well plate option - "Insert content" select menu (protocol, results, protocol template) 2023-12-18 12:32:33 +04:00
Ivan Kljun
455fdd2cd4 Show modal when no predefined app for opening asset locally [SCI-9862] 2023-12-14 16:19:15 +01:00
Soufiane
453ec32e8f
Add CSS classes to relationships add button [SCI-9781] (#6811) 2023-12-14 12:49:53 +01:00
ajugo
a343701299
Implement api v2 for results [SCI-9651] (#6699) 2023-12-14 11:31:12 +01:00
Oleksii Kriuchykhin
372ef32f03 Merge branch 'develop' into features/inventory-items-relationships 2023-12-14 11:28:04 +01:00
Ivan Kljun
f1dd767f35 Implement 'Open locally' button and dropdown for thumbnail [SCI-9838] 2023-12-14 11:11:12 +01:00
Gregor Lasnibat
eb1401789e
Merge pull request #6818 from lasniscinote/gl_SCI_9845
(fix) Wording improvments for the 'Delete attachments' modal [SCI-9845]
2023-12-14 09:01:47 +01:00
Giga Chubinidze
7de19c31ec Implement the Open Locally button on file previews [SCI-9757] 2023-12-13 23:54:41 +04:00
Anton
c3b4360ff5 Merge branch 'develop' into features/new-datatable 2023-12-13 16:11:35 +01:00
Martin Artnik
9b97e397ed Merge branch 'develop' into features/asset-sync 2023-12-13 16:05:18 +01:00
Oleksii Kriuchykhin
970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +01:00
Gregor Lasnibat
f5791f5fa7 (fix) Wording improvments for the 'Delete attachments' modal [SCI-9845] 2023-12-13 15:36:37 +01:00
Alex Kriuchykhin
741e053ef4
Add checking for ability to share a repository with allowed write [SCI-9853] (#6807) 2023-12-13 15:31:21 +01:00
Soufiane
456bd0922f
Make item relationship togglable [SCI-9669] (#6648)
* Make item relationship togglable [SCI-9669]

* Fix broken tests [SCI-9669]
2023-12-12 12:54:15 +01:00
Martin Artnik
b1492ff0ce
Merge pull request #6801 from ivanscinote/SCI-9865-ik
Make scheduler run only on worker [SCI-9865]
2023-12-12 11:01:20 +01:00
Ivan Kljun
d4d5209535 Make scheduler run only on worker [SCI-9865] 2023-12-12 10:56:26 +01:00
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