Commit graph

3985 commits

Author SHA1 Message Date
aignatov-bio
2de9de69cd
Merge pull request #8610 from aignatov-bio/ai-sci-12061-add-archived-results-to-unlinking
Fix linking for archived and deleted results [SCI-12061][SCI-12060]
2025-06-27 13:46:10 +02:00
Anton
a4defbdcbb Fix linking for archived and deleted results [SCI-12061][SCI-12060] 2025-06-26 14:29:41 +02:00
Anton
99c2b626a7 Add step number to dropodown [SCI-12037] 2025-06-26 11:14:56 +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
0736c90bdb
Merge branch 'develop' into features/rails-7.2-upgrade 2025-06-20 13:03:22 +02:00
Martin Artnik
e349c58b59 Merge branch 'features/link-steps-results' into develop 2025-06-19 14:54:22 +02:00
Anton
c976965a71 Fix error for link results [SCI-12013] 2025-06-13 11:25:04 +02:00
aignatov-bio
0f2b7746ed
Merge pull request #8577 from aignatov-bio/ai-sci-12016-fix-link-after-moving-experiment
Fix link after moving experiment [SCI-12016]
2025-06-12 14:30:47 +02:00
Martin Artnik
f2b985d398
Merge pull request #8554 from artoscinote/ma_SCI_11984
Allow supervisor and fix start_date in Projects API [SCI-11984]
2025-06-12 11:32:41 +02:00
Anton
952f9b1555 Fix link after moving experiment [SCI-12016] 2025-06-12 11:07:07 +02:00
Martin Artnik
d1d4d29f50 Merge branch 'develop' into features/link-steps-results 2025-06-10 13:00:37 +02:00
Martin Artnik
19dff4515f Unify handling of timezone-less dates and datetimes on frontend [SCI-11989] 2025-06-09 15:25:05 +02:00
Martin Artnik
008c1c127d Allow supervisor and fix start_date in Projects API, add archived_on to InventoryItemSerializer [SCI-11984] 2025-06-09 11:33:53 +02:00
Alex Kriuchykhin
c78df5c520
Fix missing repository relations in included repository child/parent relations in the API [SCI-11769] (#8553) 2025-06-09 10:11:44 +02:00
aignatov-bio
92de60ddcb
Merge pull request #8539 from aignatov-bio/ai-sci-11964-head-of-project-fixes
Head of project fixes [SCI-11964]
2025-06-06 14:45:45 +02:00
Martin Artnik
0a1cfd437c Fix naming of Project and Experiment statuses [SCI-11984] 2025-06-06 13:58:40 +02:00
aignatov-bio
58c364eece
Fix due date in dashboard calendar [SCI-11925] (#8543) 2025-06-05 14:06:41 +02:00
Anton
83e6be09bc Head of project fixes [SCI-11964] 2025-06-04 13:46:25 +02:00
Alex Kriuchykhin
79098b51b8
Initial upgrade to Rails 7.2.2 [SCI-11841] (#8524) 2025-06-04 13:31:57 +02:00
Martin Artnik
f95c06e6c6
Merge pull request #8521 from artoscinote/ma_SCI_11834
Add project management fields to projects and experiments in API [SCI-11833][SCI-11834]
2025-06-04 09:48:56 +02:00
Martin Artnik
29cb3763e8
Merge pull request #8536 from artoscinote/ma_SCI_11948
Add team scope to favorites tab on dashboard [SCI-11948]
2025-06-03 13:37:08 +02:00
Anton
e6b1d27dfd Add activities for step/result links [SCI-11885] 2025-06-03 11:56:24 +02:00
Martin Artnik
5007cc9f26 Add team scope to favorites tab on dashboard [SCI-11948] 2025-06-03 10:21:26 +02:00
Andrej
c5a34b655e Fix project redirect [SCI-11946] 2025-06-02 09:36:48 +02:00
Martin Artnik
14a040e7f9
Always switch to appropriate team in MyModulesController [SCI-11937] (#8519) 2025-05-30 17:08:49 +02:00
Anton
37a323fc25 Fix due dates on calendar [SCI-11925] 2025-05-30 13:38:01 +02:00
Martin Artnik
7cc9746788 Add project management fields to projects in API [SCI-11833] 2025-05-28 15:35:10 +02:00
Martin Artnik
b8bd316666 Add project management fields to experiments in API [SCI-11834] 2025-05-28 15:34:52 +02:00
Martin Artnik
edeb24e6e4
Merge pull request #8510 from aignatov-bio/ai-sci-11917-fix-redirect-for-locations
Fix redirect for storage locations in activities [SCI-11917]
2025-05-26 12:55:10 +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
Anton
e092e31d88 Fix redirect for storage locations in activities [SCI-11917] 2025-05-26 11:39:20 +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
Martin Artnik
9bb7d0294c Merge branch 'features/api-improvements' into develop 2025-05-26 11:15:27 +02:00
Anton
4fc7cd5e01 Improve expand/collapse for results [SCI-11918] 2025-05-16 18:44:18 +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
Anton
63047c7aa5 Update breadcrumbs for templates pages [SCI-11874] 2025-05-09 14:00:28 +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
6dfa51d79d Add descripiton buttons to experiments list and tasks list [SCI-11858] 2025-05-06 14:11:58 +02:00
Alex Kriuchykhin
67b4e2bd99
Improve write permissions checking in WOPI controller, update Tika to 2.9.4 [SCI-11898] (#8481) 2025-05-06 10:58:03 +02:00
Andrej
ccadde02ea Add new fields to projects new/edit modal [SCI-11855] 2025-04-30 12:34:21 +02:00
Martin Artnik
64504fcfef Add location duplication activities [SCI-11866] 2025-04-30 11:38:19 +02:00
Martin Artnik
25db41b0e3 Handle permissions for form value repository row snapshots [SCI-11861] 2025-04-28 15:38:29 +02:00
Martin Artnik
0fdbc52ee0 Implement favorite actions for PET [SCI-11853] 2025-04-28 13:09:22 +02:00
Martin Artnik
63ab2ebf1a Fix activity subjects for bulk unassign in storage locations [SCI-11849] 2025-04-25 15:07:03 +02:00
Martin Artnik
4e5f9c738d Merge branch 'features/repository-templates' into develop 2025-04-25 14:20:37 +02:00