Commit graph

1826 commits

Author SHA1 Message Date
Gregor Lasnibat
6f72727e38 (dev) Redesign Addons page in the Settings [SCI-10002-core] 2024-01-31 10:22:22 +01:00
Oleksii Kriuchykhin
384afbcc4b Merge branch 'features/asset-sync' into develop 2024-01-25 11:32:26 +01:00
Ivan Kljun
718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
Martin Artnik
bd4471b98b
Merge pull request #6865 from G-Chubinidze/gc_SCI_9840
"Move" feature for multiple selected tasks and experiments (bulk action) [SCI-9840]
2024-01-23 14:32:23 +01:00
Giga Chubinidze
98af81cd8a Changed error handling [SCI-9840] 2024-01-23 17:28:11 +04:00
Giga Chubinidze
9b49e891a0 changed experiment move logic similar to modules move 2024-01-22 02:16:24 +04:00
Gregor Lasnibat
5c305c8728 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-19 15:26:42 +01:00
Martin Artnik
9c755fd911
Merge pull request #6968 from G-Chubinidze/gc_SCI_9962_v2
Improvements of the SciNote Edit option in "Add-ons" [SCI-9962]
2024-01-19 12:20:45 +01:00
Anton
bd48ae1d07 Merge branch 'features/asset-sync' of github.com:scinote-eln/scinote-web into features/asset-sync 2024-01-19 11:34:42 +01:00
Anton
9d19fe8382 Merge branch 'develop' into features/asset-sync 2024-01-19 11:33:40 +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
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
Giga Chubinidze
83a2657bd1 Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI9760] 2024-01-12 03:10:11 +04: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
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
wandji
9ade9e890f
Render webhooks form url errors using data-error-text attribute [SCI-9743] (#6869) 2024-01-03 19:08:33 +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
Giga Chubinidze
cc8a10edb0 "Move" feature for multiple selected tasks and experiments (bulk action) 2023-12-29 12:53:46 +04:00
Gregor Lasnibat
3e4ccbcc75
(fix) Item card minor issue [SCI-9814_v2] (#6846) 2023-12-21 11:55:12 +01:00
wandji
a4e573e02f
Rename relationships inventory column SCI-[9905] (#6850) 2023-12-20 16:24:39 +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
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
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
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
Soufiane
a37d4ead47
Improve wording in Protocol templates and Inventory [SCI-9685] (#6789) 2023-12-11 13:58:04 +01:00
Giga Chubinidze
d93b4c6b78 Update terminology for opening attached files 2023-12-08 12:25:28 +04:00
Martin Artnik
66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +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
Ivan Kljun
dde7c512a9 Fix translations for notif (Due date, Date/Date&Time, Low stock) [SCI-9775] 2023-12-04 14:13:16 +01:00
Giga Chubinidze
1415044054 Wording of subgroups of notifications in UI [SCI-9798] 2023-12-01 12:35:16 +04:00