Anton
|
72b40a63a0
|
Merge branch 'develop' into features/new-datatable
|
2024-01-30 12:02:04 +01:00 |
|
aignatov-bio
|
5725e5808c
|
Merge pull request #7021 from aignatov-bio/ai-sci-10091-update-access-modal
Update access modal [SCI-10091]
|
2024-01-30 10:53:35 +01:00 |
|
Anton
|
007bebed46
|
Update access modal [SCI-10091]
|
2024-01-30 10:28:02 +01:00 |
|
Anton
|
fad8b53222
|
Update task table designated users [SCI-10092]
|
2024-01-25 15:56:48 +01:00 |
|
Oleksii Kriuchykhin
|
384afbcc4b
|
Merge branch 'features/asset-sync' into develop
|
2024-01-25 11:32:26 +01:00 |
|
Anton
|
6bce6808f2
|
Fix small sanity check bugs [SCI-10080]
|
2024-01-24 14:06:26 +01:00 |
|
Ivan Kljun
|
718f5fbfad
|
Add error messages to AssetSyncController [SCI-10020]
|
2024-01-24 11:02:37 +01:00 |
|
Ivan Kljun
|
c2fa110fb2
|
Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-10010-ik
|
2024-01-23 15:32:27 +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 |
|
Ivan Kljun
|
0eb323b2f1
|
Add wrong-version modal for SciNote Edit [SCI-10010]
|
2024-01-23 11:54:42 +01:00 |
|
aignatov-bio
|
35774441f2
|
Merge pull request #6970 from G-Chubinidze/gc_SCI_9989
Remove archive confirmation modals from all tables [SCI-9989]
|
2024-01-22 10:07:19 +01: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 |
|
Anton
|
4b3666b4f8
|
Merge branch 'develop' into features/new-datatable
|
2024-01-19 11:10:32 +01:00 |
|
Giga Chubinidze
|
05b1e906bb
|
removed archive confirm locales
|
2024-01-19 13:46:34 +04: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
G-Chubinidze
|
84c53cb5f5
|
Merge branch 'features/asset-sync' into gc_SCI_9710
|
2024-01-03 18:23:25 +04: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 |
|
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 |
|
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 |
|
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 |
|
Anton
|
75f7437001
|
Fix markup
|
2023-12-11 09:26:13 +01:00 |
|
Giga Chubinidze
|
d93b4c6b78
|
Update terminology for opening attached files
|
2023-12-08 12:25:28 +04: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
|
66feec3074
|
Merge branch 'develop' into features/asset-sync
|
2023-12-06 11:23:31 +01:00 |
|
G-Chubinidze
|
e1ff625351
|
Merge branch 'features/asset-sync' into gc_SCI_9710
|
2023-12-06 11:48:18 +04: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 |
|
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 |
|
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
|
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 |
|
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
|
8a0dd0258e
|
Merge branch 'develop' into features/new-datatable
|
2023-11-23 10:47:58 +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
|
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 |
|
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 |
|
Anton
|
13eca7e035
|
Fix time format and picker position [SCI-9706]
|
2023-11-15 16:18:00 +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 |
|