Martin Artnik
160d9775d8
Merge branch 'develop' into features/september-release
2023-09-15 10:40:55 +02:00
Oleksii Kriuchykhin
45e9a459d7
Fix user and team activities filters [SCI-9287]
2023-09-14 14:22:01 +02:00
Anton
af0fbfeec0
Merge branch 'develop' into features/september-release
2023-09-14 13:45:40 +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
Alex Kriuchykhin
fae428e305
Fix OVE file preview from imported .eln [SCI-9263] ( #6200 )
2023-09-13 15:00:52 +02:00
Anton
d6ab6e15f8
Fix office creation on results [SCI-9260]
2023-09-13 14:30:00 +02:00
Martin Artnik
cb28c4d566
Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results
...
Fixed shared task to work with new results [SCI-9250]
2023-09-13 13:43:30 +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
6114dd7afc
Fix result pagination, fix new step/result buttons [SCI-9285]
2023-09-12 17:33:47 +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
Ivan Kljun
dfaa91c682
Fixed shared task to work with new results [SCI-9250]
2023-09-11 15:19:22 +02:00
Martin Artnik
8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267
...
Fix attachment sorting in results [SCI-9267]
2023-09-11 10:01:26 +02:00
Martin Artnik
ede9e40be8
Fix attachment sorting in results [SCI-9267]
2023-09-08 16:07:43 +02:00
Anton
7b44a47d51
Add active/archive switch to results page [SCI-9264]
2023-09-08 13:42:02 +02:00
Ivan Kljun
1242ec588f
Add and fix result activities [SCI-9010]
2023-09-08 11:36:59 +02:00
Alex Kriuchykhin
d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] ( #6170 )
2023-09-08 11:35:16 +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
Gregor Lasnibat
6934ae38aa
Fix wrong OVE file size [SCI-9243]
2023-09-07 11:36:17 +02:00
Anton
1247406055
Add archive view to results [SCI-9223]
2023-09-06 15:06:27 +02:00
G-Chubinidze
3976e05042
Merge branch 'features/september-release' into gc_SCI_9178
2023-09-06 16:38:25 +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
Giga Chubinidze
5a6202aea2
Unable to create a MarvinJS attachment [SCI-9178]
2023-09-05 18:29:15 +04: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
647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll
2023-09-05 14:40:03 +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
Alex Kriuchykhin
90cd330126
Fix removing user from public projects [SCI-9174] ( #6130 )
2023-09-05 11:36:26 +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
Oleksii Kriuchykhin
7b40b43922
Merge branch 'release/1.28.0' into develop
2023-09-04 16:01:46 +02:00
Alex Kriuchykhin
df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] ( #6129 )
2023-09-04 15:56:17 +02:00
Anton
86f413cc71
Add title to text component [SCI-9141]
2023-09-04 14:13:29 +02:00
Martin Artnik
3724a4a067
Merge branch 'develop' into features/september-release
2023-09-01 10:30:48 +02: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
Anton
2d76e628be
Add infinite scroll to results [SCI-9108]
2023-08-30 15:51:23 +02:00
Martin Artnik
8245ad9738
Fix up result element duplicate endpoints [SCI-9107]
2023-08-30 14:54:38 +02:00
Anton
c496d2c763
Fix transaction rollback [SCI-9088]
2023-08-30 11:48:16 +02:00
wandji
645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] ( #6103 )
2023-08-30 09:51:41 +02:00
artoscinote
c955c235d2
Fix user assignment endpoints [SCI-9150] ( #6094 )
...
* Fix project assignments API endpoint [SCI-9150]
* Fix API endpoint for updating experiment assignments [SCI-9150]
* Fix API endpoint for updating task assignments [SCI-9150]
2023-08-29 10:32:39 +02:00
wandji
c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] ( #6078 )
2023-08-29 09:42:51 +02:00
artoscinote
90f23cc61c
Fix API endpoints for user assignments [SCI-9150] ( #6089 )
...
* Fix project assignments API endpoint [SCI-9150]
* Fix API endpoint for updating experiment assignments [SCI-9150]
* Fix API endpoint for updating task assignments [SCI-9150]
2023-08-28 15:13:30 +02:00
artoscinote
953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors
...
Update 'Not started' status color at reports [SCI-9007]
2023-08-28 09:56:25 +02:00
Ivan Kljun
90199d3590
Add method light_color? to my_module_status [SCI-9007]
2023-08-25 15:47:34 +02:00
sboursen-scinote
195df7936f
Use custom images for marvin and OVE [SCI-9038]
2023-08-25 13:59:18 +02:00
Anton
e66968357a
Fix hound
2023-08-25 09:46:53 +02:00
ajugo
103b62798b
Return error if label template preview image is nil [SCI-9070] ( #6077 )
2023-08-24 16:45:34 +02:00
Anton
f31d2b8912
Add move ability to attachments [SCI-9088]
2023-08-24 15:57:03 +02:00