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
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
wandji
94a2f2e6fd
Update placeholder text for date time field item card [SCI-9615] ( #6627 )
2023-11-13 17:07:51 +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
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
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
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
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
Anton
da3c54b7f0
Merge branch 'develop' into features/bugfixes-and-css
2023-10-25 13:26:06 +02:00
Ivan Kljun
2031286261
Implement file-checkout localhost call [SCI-9466]
2023-10-25 09:30:42 +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
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
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
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
Anton
225193387a
Update notifications settings saving
2023-10-16 09:41:38 +02:00
Martin Artnik
1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements
2023-10-13 14:55:16 +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
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
Anton
c2b85d8981
Add new general notifications structure [SCI-9511]
2023-10-12 11:51:01 +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
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
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
Andrej
9b1d9823c1
Add missing wording for failed export email/notifications [SCI-9442]
2023-10-04 09:02:35 +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
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
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
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
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
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
Gregor Lasnibat
1bf2bc6156
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
...
Fixed regular card (without cusotm columns) styles [SCI-9153]
Updated API to return column name, working on subcomponents [SCI-9153]
TooltipPreview on dynamic file component working [SCI-9153]
Finished new item card refactor [SCI-9153]
PR fix 01 [SCI-9153]
PR fixes 02 [SCI-9153]
2023-09-21 20:18:20 +02:00
Martin Artnik
810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269
...
CSS: Results revamp issues [SCI-9269]
2023-09-21 10:00:14 +02:00
Giga Chubinidze
eb5d09e2fb
CSS: Results revamp issues
2023-09-21 10:52:41 +04:00
Alex Kriuchykhin
8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272
...
Fix message for successful import protocol from protocol parser [SCI-9272]
2023-09-20 19:36:12 +02:00
Anton
4cc968bcb2
Filters modal fixes [SCI-9276]
2023-09-20 11:07:48 +02:00
Andrej
b47651750b
Fix message for successful import protocol from protocol parser [SCI-9272]
2023-09-19 15:47:51 +02:00
Andrej
56a57233df
Add assigned tasks block to the item card [SCI-9155]
2023-09-19 15:40:32 +02: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
Andrej
aebea07be4
Change dropdown options for importing protocols [SCI-9288]
2023-09-18 13:15:55 +02:00
Giga Chubinidze
73c1f67510
Missing modal when deleting an archived result [SCI-9291]
2023-09-18 01:28:22 +04:00
Oleksii Kriuchykhin
36f4e22fa3
Merge branch 'develop' into features/october-release
2023-09-15 14:08:45 +02:00
wandji20
de4cb662a6
Update translation name for item_card [SCI-9151]
2023-09-15 12:30:02 +01:00
wandji20
0b0eddd62b
Add default columns to inventory item card [SCI-9151]
2023-09-15 11:39:42 +01:00
Anton
af0fbfeec0
Merge branch 'develop' into features/september-release
2023-09-14 13:45:40 +02:00
Anton
4dab80e814
Update protocol css
2023-09-14 12:12:15 +02:00
Alex Kriuchykhin
40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration
...
Features/ove integration
2023-09-13 17:05:48 +02:00
ajugo
efed11be3c
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] ( #6203 )
2023-09-13 15:02:30 +02:00
wandji
642e3b5ff4
Add link to knowledge base [SCI-9231] ( #6190 )
...
* Add link to knowledge base [SCI-9231]
* Remove custom OVE help link [SCI-9231]
2023-09-13 14:45:28 +02:00
Anton
3bee8feb7d
Add flyout menu to step/results elements [SCI-9262]
2023-09-13 12:12:36 +02:00
Martin Artnik
c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285
...
Fix result pagination, fix new step/result buttons [SCI-9285]
2023-09-13 10:00:01 +02:00
Martin Artnik
2fc4f3c033
Merge pull request #6168 from ivanscinote/SCI-9010-rework-result-activities-to-be-aligned-with-step-activities
...
Add and fix result activities [SCI-9010]
2023-09-13 09:51:08 +02:00
Martin Artnik
6114dd7afc
Fix result pagination, fix new step/result buttons [SCI-9285]
2023-09-12 17:33:47 +02:00
Martin Artnik
e359f373ea
Consumption export copy fixes [SCI-9281] ( #6195 )
2023-09-12 15:21:17 +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
ba390d6239
Remove unecessary locals [SCI-8968]
2023-09-12 09:15:11 +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
cd892878db
Merge remote-tracking branch 'upstream/features/september-release' into SCI-9010-rework-result-activities-to-be-aligned-with-step-activities
2023-09-11 15:38:46 +02:00
wandji
76b1aaab87
Rename OVE labels in file uploads [SCI-9163] ( #6115 )
...
* Rename OVE labels in file uploads [SCI-9163]
* Move translations for ove trial reminders [SCI-9163]
2023-09-11 12:58:12 +02:00
wandji
6687ac178b
Fix issue displaying gene sequence activities in global activities [SCI-9268] ( #6180 )
2023-09-11 12:57:16 +02:00
wandji
a3dd30d218
Load OVE packages via yarn [SCI-9231] ( #6176 )
...
* Add OVE yarn package and load assets from node_modules [SCI-9231]
* Move hardcoded text to i18 [SCI-9231]
2023-09-11 09:50:05 +02:00
Anton
7b44a47d51
Add active/archive switch to results page [SCI-9264]
2023-09-08 13:42:02 +02:00
wandji
e6252e09cc
Change consumption reposrt esport modal text [SCI-9194] ( #6167 )
2023-09-08 11:39:46 +02:00
Ivan Kljun
1242ec588f
Add and fix result activities [SCI-9010]
2023-09-08 11:36:59 +02:00
wandji
a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] ( #6092 )
...
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]
* Add consumption export modal and improve report generation [SCI-9023]
* Add repository_row association to repository_ledger_records [SCI-9023]
2023-09-07 13:12:27 +02:00
Anton
1247406055
Add archive view to results [SCI-9223]
2023-09-06 15:06:27 +02:00
Martin Artnik
1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187
...
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
2023-09-06 14:31:05 +02:00
Giga Chubinidze
76b7c45021
Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187]
2023-09-06 16:12:31 +04:00
Alex Kriuchykhin
eea24a69e9
Add FailureNotifiableJob jobs concerns for creating failure notifications for users [SCI-9119] ( #6147 )
2023-09-06 12:51:34 +02:00
aignatov-bio
b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework
...
Rework inline edit vue component UI [SCI-9016]
2023-09-06 10:49:18 +02:00
aignatov-bio
7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability
2023-09-05 14:41:23 +02:00
aignatov-bio
c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields
...
Add title to text component [SCI-9141]
2023-09-05 14:32:42 +02:00
Oleksii Kriuchykhin
2c816cf463
Merge branch 'release/1.28.0' into develop
2023-09-05 12:54:37 +02:00
Alex Kriuchykhin
5928f708e1
Remove user controlled method execution from connected_accounts controller, add Okta unlinking functionality [SCI-9220] ( #6135 )
2023-09-05 12:53:51 +02:00
Ivan Kljun
86e2cfe747
Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework
2023-09-05 11:31:30 +02:00
artoscinote
8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation
...
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
2023-09-05 11:09:08 +02:00
Ivan Kljun
56744e2dcd
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
2023-09-05 11:02:39 +02:00
Giga Chubinidze
b7da98c1dd
Archiving results doesn't work [SCI-9179]
2023-09-05 11:55:15 +04:00
Anton
86f413cc71
Add title to text component [SCI-9141]
2023-09-04 14:13:29 +02:00
Gregor Lasnibat
589faef72f
Fix gene sequence attachment icons [SCI-9213]
2023-09-02 03:14:51 +02:00
Ivan Kljun
40638dbb63
Rework inline edit vue component UI [SCI-9016]
2023-09-01 17:18:13 +02:00
artoscinote
dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186
...
Button translation in the "Move to different result" Modal [sci-9186]
2023-09-01 11:40:57 +02:00
artoscinote
7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185
...
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
2023-09-01 11:40:34 +02:00
artoscinote
51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081
...
Placeholder text (titles, description field) [SCI-9081]
2023-09-01 11:02:06 +02:00
Martin Artnik
3724a4a067
Merge branch 'develop' into features/september-release
2023-09-01 10:30:48 +02:00
Giga Chubinidze
6db9134065
Button translation in the "Move to different result" Modal
2023-09-01 11:59:56 +04:00
Giga Chubinidze
100fdde5ca
Placeholder text in the "Move to different result" modal dropdown
2023-09-01 11:49:43 +04:00
Giga Chubinidze
793ab0eb99
Placeholder text (titles, description field) [SCI-9081]
2023-09-01 10:58:00 +04:00
Anton
d2ffaa209c
Fix results CSS [SCI-9177]
2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin
b4eb4d38e6
Merge branch 'develop' into features/ove-integration
2023-08-31 15:52:38 +02:00
wandji
167abe5239
Add .json extension to OVE import tooltip [SCI-9116] ( #6112 )
...
* Add .json extension to OVE import tooltip [SCI-9116]
* Override import and downlod tooltip values [SCI-9116]
2023-08-31 12:51:49 +02:00
G-Chubinidze
7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] ( #6104 )
...
* UI rework of thumbnail view asset controls [SCI-9015]
* styling change css -> tailwind
2023-08-30 15:42:55 +02:00
wandji
645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] ( #6103 )
2023-08-30 09:51:41 +02:00
wandji
c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] ( #6078 )
2023-08-29 09:42:51 +02:00
G-Chubinidze
bbffce5e03
Placeholder text (titles, description field) [SCI-9081] ( #6087 )
...
* Placeholder text (titles, description field) [SCI-9081]
* removed serializer code
* Update table.vue
2023-08-28 10:36:40 +02:00
Giga Chubinidze
6d8d804c71
Placeholder text (titles, description field) [SCI-9081]
2023-08-28 10:32:08 +04:00
Anton
f31d2b8912
Add move ability to attachments [SCI-9088]
2023-08-24 15:57:03 +02:00
Alex Kriuchykhin
56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] ( #6040 )
2023-08-24 15:28:28 +02:00
Alex Kriuchykhin
3c0389adc8
Make docx parser feature togglable [SCI-9094] ( #6055 )
2023-08-23 16:46:29 +02:00
Alex Kriuchykhin
b08a94ced6
Remove What's new section from user preferences section [SCI-9098] ( #6046 )
2023-08-23 13:12:06 +02:00
artoscinote
e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013
2023-08-23 12:01:14 +02:00
Martin Artnik
b3965e5aca
Implement result filters [SCI-9013]
2023-08-23 11:59:21 +02:00
wandji
196b6628ae
Add task protocol activities for gene sequence asset actions [SCI-8965] ( #6013 )
2023-08-22 14:24:43 +02:00
Anton
e9174ad158
Add element movements between step [SCI-9024]
2023-08-22 12:15:55 +02:00
