Commit graph

3893 commits

Author SHA1 Message Date
Martin Artnik
345093e09c
Merge pull request #8617 from aignatov-bio/ai-sci-12072-fix-step-position-in-acitvity
Fix step position in activity [SCI-12072]
2025-06-27 15:08:57 +02:00
Martin Artnik
581e477c51 Revert back to pre 7.2 ActiveStorage variant behaviour [SCI-11841] 2025-06-27 15:05:46 +02:00
Anton
9103ede18a Fix step position in activity [SCI-12072] 2025-06-27 14:47:48 +02:00
Martin Artnik
75fa364594
Merge pull request #8600 from scinote-eln/features/link-steps-results
Features/link steps results
2025-06-23 15:55:23 +02:00
Martin Artnik
fdefaa85be Rails upgrade fixes [SCI-11841] 2025-06-23 13:23:04 +02:00
Martin Artnik
0736c90bdb
Merge branch 'develop' into features/rails-7.2-upgrade 2025-06-20 13:03:22 +02:00
Anton
ce6524f46e Link step/results fixes [SCI-12034][SCI-12015][SCI-12035][SCI-12036] 2025-06-19 13:17:08 +02:00
Anton
330e713436 Sanity test fixes for link results [SCI-12008] 2025-06-13 13:37:33 +02:00
Martin Artnik
3ee93b287f
Merge pull request #8528 from artoscinote/ma_SCI_11903
Fix default ZPL 203dpi templates to properly break long text [SCI-11903]
2025-06-10 16:13:14 +02:00
Martin Artnik
d1d4d29f50 Merge branch 'develop' into features/link-steps-results 2025-06-10 13:00:37 +02:00
Martin Artnik
1385ef964c Fix start_date activities [SCI-11989] 2025-06-10 10:53:59 +02:00
Martin Artnik
e6b6648d0c Fix sorting projects/folders by date parameters [SCI-11989] 2025-06-09 13:39:45 +02:00
Alex Kriuchykhin
ae1d128588
Add time jitter for rufus scheduler tasks for better load distribution [SCI-11973] (#8552) 2025-06-09 10:11:56 +02:00
Anton
1a82872bf7 Fix statuses in reports [SCI-11981] 2025-06-06 15:26:21 +02:00
Martin Artnik
8367bf868e
Merge pull request #8549 from artoscinote/ma_SCI_11984
Fix naming of Project and Experiment statuses [SCI-11984]
2025-06-06 14:15:35 +02:00
Martin Artnik
0a1cfd437c Fix naming of Project and Experiment statuses [SCI-11984] 2025-06-06 13:58:40 +02:00
Andrej
23143c6a60 Fix project activity filter [SCI-11982] 2025-06-05 17:31:12 +02:00
Alex Kriuchykhin
79098b51b8
Initial upgrade to Rails 7.2.2 [SCI-11841] (#8524) 2025-06-04 13:31:57 +02:00
aignatov-bio
e64670dadd
Merge pull request #8538 from aignatov-bio/ai-sci-11885-add-activities-for-step-result-links
Add activities for step/result links [SCI-11885]
2025-06-03 13:03:05 +02:00
Anton
e6b1d27dfd Add activities for step/result links [SCI-11885] 2025-06-03 11:56:24 +02:00
aignatov-bio
0a44a44b51
Merge pull request #8535 from aignatov-bio/ai-sci-11889-add-linked-step-results-to-report
Add linked step/results to reports [SCI-11889]
2025-06-03 11:54:26 +02:00
Anton
01c740f2e5 Add linked step/results to reports [SCI-11889] 2025-06-02 18:51:20 +02:00
Andrej
08c9adc88f Fix various project management bugs [SCI-11940] 2025-06-02 15:52:12 +02:00
Anton
00b96de003 Add step/result linkt to shared tasks [SCI-11886] 2025-06-02 13:35:13 +02:00
Martin Artnik
95b80f187d Fix default ZPL 203dpi templates to properly break long text [SCI-11903] 2025-05-30 15:48:33 +02:00
Anton
2e8152abc4 Add experiments and tasks counter to project table [SCI-11944] 2025-05-30 14:57:15 +02:00
Martin Artnik
169145c405 Merge branch 'features/small-improvements' into develop 2025-05-29 10:12:47 +02:00
Martin Artnik
de907cff47
Merge pull request #8513 from artoscinote/ma_SCI_11910
Add an option to include serialized activity subject in a webhook [SCI-11910]
2025-05-26 12:35:46 +02:00
aignatov-bio
aaadfee2c1
Merge branch 'features/link-steps-results' into ai-sci-11918-improve-expand-all-for-results 2025-05-26 11:41:15 +02:00
Alex Kriuchykhin
d7f20fc56b
Add step text name field, add update action for task protocols to API [SCI-10764] (#8407) 2025-05-26 11:40:54 +02:00
Martin Artnik
1723810ec9 Add an option to include serialized activity subject in a webhook [SCI-11910] 2025-05-26 11:19:37 +02:00
Anton
4fc7cd5e01 Improve expand/collapse for results [SCI-11918] 2025-05-16 18:44:18 +02:00
Anton
da51137be1 Add new fields to reports [SCI-11832] 2025-05-15 11:58:00 +02:00
Anton
dbf76acc51 Add step/results linking [SCI-11883][SCI-11884] 2025-05-14 16:21:57 +02:00
Andrej
e63fb45b9e Add step result link [SCI-11879] 2025-05-13 12:19:00 +02:00
aignatov-bio
f2e7123245
Merge pull request #8498 from aignatov-bio/ai-sci-11874-update-breadcrumbs-for-templates-pages
Update breadcrumbs for templates pages [SCI-11874]
2025-05-12 15:07:32 +02:00
aignatov-bio
2b93baca94
Merge pull request #8492 from aignatov-bio/ai-sci-11870-rename-copied-to-duplicated
Rename copied to duplicated [SCI-11870]
2025-05-12 15:07:21 +02:00
Anton
63047c7aa5 Update breadcrumbs for templates pages [SCI-11874] 2025-05-09 14:00:28 +02:00
Martin Artnik
fe7cf6cbb1 Fix unresolved merge conflict 2025-05-09 11:31:29 +02:00
aignatov-bio
5a0ebdef67
Merge pull request #8490 from aignatov-bio/ai-sci-11854-add-favorites-widget
Add favorites widget [SCI-11854]
2025-05-09 11:29:01 +02:00
Anton
7f61f91d76 Add favorites widget [SCI-11854] 2025-05-09 11:21:31 +02:00
Martin Artnik
70e3db1d68 Merge branch 'develop' into features/project-management 2025-05-09 11:02:56 +02:00
Anton
0078681824 Rename copied to duplicated [SCI-11870] 2025-05-08 13:59:49 +02:00
Andrej
ed282a94bc Add favorites to experiment table [SCI-11851] 2025-05-07 16:19:53 +02:00
andrej-scinote
32ecaecf1d
Merge pull request #8487 from andrej-scinote/aj_SCI_11800
Add favorite to project table [SCI-11800]
2025-05-07 16:14:40 +02:00
Andrej
fe676f8996 Add favorite to project table [SCI-11800] 2025-05-07 16:06:52 +02:00
Anton
6dfa51d79d Add descripiton buttons to experiments list and tasks list [SCI-11858] 2025-05-06 14:11:58 +02:00
Andrej
3a778bbb3c Add new fields to experiments new/edit modal [SCI-11856] 2025-04-30 14:24:46 +02:00
Andrej
ccadde02ea Add new fields to projects new/edit modal [SCI-11855] 2025-04-30 12:34:21 +02:00
Martin Artnik
8f2efe62fc
Merge pull request #8475 from artoscinote/ma_SCI_11893
Add blank state for repository template columns, fix XSS [SCI-11893]
2025-04-30 12:21:39 +02:00