Commit graph

1531 commits

Author SHA1 Message Date
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
Martin Artnik
ee587021e5 Fix experiment sort by favorite [SCI-12032] 2025-06-17 15:17:25 +02:00
Martin Artnik
383a007290 Change join to subquery for favorites, to avoid pagination issues [SCI-11923] 2025-06-13 13:59:29 +02:00
Andrej
ff2aa00c37 Fix project filtering to exclude folders from results [SCI-11994] 2025-06-12 12:01:33 +02:00
Andrej
78129d73d1 Fix age sorting for tasks [SCI-12018] 2025-06-11 16:20:18 +02:00
Martin Artnik
fa6c81eaf9
Merge pull request #8566 from artoscinote/ma_SCI_11990
Task list fixes, repository permission check fix [SCI-11990]
2025-06-11 13:55:23 +02:00
Alex Kriuchykhin
ec6eaf3723
Merge Hotfix/1.41.1.2 to Develop (#8569)
* Merge Develop to Master (#8515)

* Bump rack from 2.2.13 to 2.2.14 (#8494)

Bumps [rack](https://github.com/rack/rack) from 2.2.13 to 2.2.14.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.13...v2.2.14)

---
updated-dependencies:
- dependency-name: rack
  dependency-version: 2.2.14
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump version to 1.41.1.1 (#8514)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Optimize joins in RepositoryDatatableService for better performance on task table [SCI-11998] (#8562)

* Bump version to 1.41.1.2

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-06-11 13:19:08 +02:00
Martin Artnik
75c2fe62ae Fix my_module sorting [SCI-11990] 2025-06-11 13:03:36 +02:00
Andrej
c7ec773825 Fix sorting on PET tables [SCI-11995] 2025-06-10 15:28:06 +02:00
Martin Artnik
d1d4d29f50 Merge branch 'develop' into features/link-steps-results 2025-06-10 13:00:37 +02:00
Martin Artnik
e6b6648d0c Fix sorting projects/folders by date parameters [SCI-11989] 2025-06-09 13:39:45 +02:00
Martin Artnik
6cb4985da5
Merge pull request #8542 from artoscinote/ma_SCI_11942
Fix project list issues [SCI-11942]
2025-06-06 16:27:24 +02:00
Anton
1a82872bf7 Fix statuses in reports [SCI-11981] 2025-06-06 15:26:21 +02:00
Martin Artnik
e781531ff7 Code style improvements [SCI-11942] 2025-06-06 14:50:04 +02:00
Martin Artnik
3e425b7786 Fix project list issues [SCI-11942] 2025-06-06 14:50:02 +02:00
Martin Artnik
0a1cfd437c Fix naming of Project and Experiment statuses [SCI-11984] 2025-06-06 13:58:40 +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
8da7a22fd1 Fix duplicates in task list [SCI-11966] 2025-06-03 13:56:45 +02:00
Anton
01c740f2e5 Add linked step/results to reports [SCI-11889] 2025-06-02 18:51:20 +02:00
aignatov-bio
6ae0960bc1
Merge pull request #8525 from aignatov-bio/ai-sci-11944-add-missed-columns-to-project-table
Add experiments and tasks counter to project table [SCI-11944]
2025-06-02 10:10:48 +02:00
Martin Artnik
0c85a50f6f
Fix issues with my_module list service pagination [SCI-11923] (#8518) 2025-05-30 17:08:17 +02:00
Anton
2e8152abc4 Add experiments and tasks counter to project table [SCI-11944] 2025-05-30 14:57:15 +02:00
Martin Artnik
5da6984940 Project list fixes [SCI-11942] 2025-05-30 13:42:17 +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
513acfd125
Merge pull request #8456 from aignatov-bio/ai-sci-11835-update-sorting-for-projects-table
Add new sorting for projects table [SCI-11835]
2025-05-26 12:11:56 +02:00
Anton
a380ac1bcf Add new sorting for projects table [SCI-11835] 2025-05-26 11:29:45 +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
2948d2355c Add format fallback to spreadsheet parser [SCI-11891] 2025-05-22 11:33:43 +02:00
Anton
da51137be1 Add new fields to reports [SCI-11832] 2025-05-15 11:58:00 +02:00
andrej-scinote
77269f776a
Merge pull request #8489 from andrej-scinote/aj_SCI_11852
Add favorites to the tasks table [SCI-11852]
2025-05-07 16:37:14 +02:00
Andrej
2fdbec4fcc Add favorites to the tasks table [SCI-11852] 2025-05-07 16:34:26 +02:00
Andrej
ed282a94bc Add favorites to experiment table [SCI-11851] 2025-05-07 16:19:53 +02:00
Andrej
fe676f8996 Add favorite to project table [SCI-11800] 2025-05-07 16:06:52 +02:00
Martin Artnik
7bf5f4381e Add favorite join and update serializers [SCI-11853] 2025-04-28 14:00:55 +02:00
Andrej
a9c668de22 Update projects filters [SCI-11796] 2025-04-24 14:42:13 +02:00
andrej-scinote
2e9ccb8d07
Merge pull request #8454 from andrej-scinote/aj_SCI_11794
Update experiments filters [SCI-11794]
2025-04-24 14:28:48 +02:00
Andrej
65b6485c41 Add project description field to search [SCI-11831] 2025-04-24 13:28:29 +02:00
Andrej
e20148c689 Update experiments filters [SCI-11794] 2025-04-24 09:37:24 +02:00
Andrej
8051acf34e Add experiments table sorting [SCI-11836] 2025-04-16 17:33:43 +02:00
Andrej
864d5d29e9 Add start date to tasks table and change status representation [SCI-11801] 2025-04-16 08:55:16 +02:00
Anton
343961ea4c Merge branch 'features/project-management' of https://github.com/scinote-eln/scinote-web into features/project-management 2025-04-14 16:10:35 +02:00
Andrej
b27705d3b1 Fix submitted at form field format in reports [SCI-11811] 2025-04-14 14:05:09 +02:00
Andrej
fde255b132 Fix date format for form response in reports [SCI-11811] 2025-04-14 10:50:39 +02:00
aignatov-bio
69307f50c0
Add new columns for projects and experiments [SCI-11793] (#8415) 2025-04-11 12:59:04 +02:00
Martin Artnik
da942edb75
Merge pull request #8365 from scinote-eln/features/forms-v2
Features/forms v2
2025-03-27 11:06:22 +01:00
Anton
077dbfb7d3 Fix forms table sorting and wording for multiple dropdown options [SCI-11687][SCI-11713] 2025-03-25 11:24:22 +01:00
Anton
423c0c19a1 Add SA to text form field [SCI-11646] 2025-03-24 15:14:16 +01:00
Martin Artnik
62fd211ce3 Filter Form activities based on permissions [SCI-11714] 2025-03-21 16:08:21 +01:00