Commit graph

18687 commits

Author SHA1 Message Date
Alex Kriuchykhin
79098b51b8
Initial upgrade to Rails 7.2.2 [SCI-11841] (#8524) 2025-06-04 13:31:57 +02:00
Martin Artnik
169145c405 Merge branch 'features/small-improvements' into develop 2025-05-29 10:12:47 +02:00
Martin Artnik
d6ef27a1e1
Merge pull request #8516 from aignatov-bio/ai-sci-11921-fix-tinymce-placegholder-in-projects-experiments
Fix project and experiment placeholder color and wording [SCI-11921]
2025-05-28 14:23:28 +02:00
Martin Artnik
8d9ee4884a
Merge pull request #8517 from artoscinote/connected-item-serializer-fix
Fix ConnectedItemSerializer eager class load issue
2025-05-26 15:55:19 +02:00
Anton
d4028d750a Fix project and experiment placeholder color and wording [SCI-11921] 2025-05-26 15:42:54 +02:00
Martin Artnik
fa9ebedbbf Fix ConnectedItemSerializer eager class load issue 2025-05-26 15:19:06 +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
181e92735a
Merge pull request #8509 from aignatov-bio/ai-sci-11911-fix-results-infinite-scroll
Fix results infinite scroll [SCI-11911]
2025-05-26 12:36:05 +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
Martin Artnik
067849e3d3
Merge pull request #8512 from artoscinote/ma_SCI_11891
Add format fallback to spreadsheet parser [SCI-11891]
2025-05-26 11:57:00 +02:00
Martin Artnik
a3419033a6
Merge pull request #8499 from aignatov-bio/ai-sci-11897-fix-smart-anotation-to-task-assigned-items
Fix smart annotation to task assigned items [SCI-11897]
2025-05-26 11:56:52 +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
Anton
0182c6368d Fix results infinite scroll [SCI-11911] 2025-05-26 11:35:07 +02:00
Anton
c1596b90ae Fix smart anotation to task assigned items [SCI-11897] 2025-05-26 11:32:34 +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
9bb7d0294c Merge branch 'features/api-improvements' into develop 2025-05-26 11:15:27 +02:00
Martin Artnik
b7f089025e Merge branch 'features/project-management' into develop 2025-05-26 11:06:17 +02:00
Alex Kriuchykhin
91f5b8b9c2
Bump version to 1.41.1.1 (#8514) 2025-05-23 14:18:51 +02:00
Martin Artnik
2948d2355c Add format fallback to spreadsheet parser [SCI-11891] 2025-05-22 11:33:43 +02:00
dependabot[bot]
2e47b46fba 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>
2025-05-22 11:24:16 +02:00
Martin Artnik
3a2f8da58e Remove db port config in dev docker-compose.yml 2025-05-22 11:24:16 +02:00
Martin Artnik
e907ff0b47 Bump version to 1.41.1 2025-05-22 11:24:16 +02:00
Anton
2a1daff737 Remove perfect scrollbar from task activities [SCI-11734] 2025-05-22 11:24:16 +02:00
Martin Artnik
add92f9f92 Make repository template migration skip check more robust [SCI-11896] 2025-05-22 11:24:16 +02:00
Anton
ad4cad11a3 Fix css for menu dropdown [SCI-11906] 2025-05-22 11:24:16 +02:00
Martin Artnik
beb382df8f
Merge pull request #8508 from aignatov-bio/ai-sci-11912-fix-step-reset-for-import-step-modal
Fix protocol steps counter in import [SCI-11912]
2025-05-19 09:40:48 +02:00
Martin Artnik
98185a23b3
Merge pull request #8507 from aignatov-bio/ai-sci-11913-fix-project-move-caret-css
Fix project move caret css [SCI-11913]
2025-05-19 09:40:32 +02:00
Martin Artnik
90625200d6
Merge pull request #8502 from andrej-scinote/aj_SCI_11862
Convert user timezones to IANA format [SCI-11862]
2025-05-19 09:39:14 +02:00
Martin Artnik
fabe4df0de
Merge pull request #8501 from aignatov-bio/ai-sci-11909-css-fixes-for-favorites-and-status
Fix css for favorites and status [SCI-11909]
2025-05-19 09:37:48 +02:00
Martin Artnik
066d80e076
Merge pull request #8497 from aignatov-bio/ai-sci-11871-update-column-managment-with-new-column
Update column management with new column [SCI-11871]
2025-05-19 09:36:54 +02:00
Martin Artnik
1bb3035ac6
Merge pull request #8463 from aignatov-bio/ai-sci-11832-add-new-fields-to-reports
Add new fields to reports [SCI-11832]
2025-05-19 09:34:29 +02:00
Anton
81e5294e2a Fix protocol steps counter in import [SCI-11912] 2025-05-15 14:28:02 +02:00
Anton
52edcb1107 Fix project move caret css [SCI-11913] 2025-05-15 14:05:43 +02:00
Anton
da51137be1 Add new fields to reports [SCI-11832] 2025-05-15 11:58:00 +02:00
dependabot[bot]
cf84e45351
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>
2025-05-14 09:16:58 +02:00
Martin Artnik
2bf4e23442 Remove db port config in dev docker-compose.yml 2025-05-13 11:51:26 +02:00
Martin Artnik
a1e22a7456
Merge branch 'master' into develop 2025-05-13 11:35:33 +02:00
Martin Artnik
c05aef3cd8
Bump version to 1.41.1 2025-05-13 11:19:58 +02:00
Andrej
66235b66ad Convert user timezones to Iana format [SCI-11862] 2025-05-13 06:55:49 +02:00
Anton
68b3a1bb4b Fix css for facorites and status [SCI-11909] 2025-05-12 15:50:39 +02:00
Anton
0df6ecc7f9 Fix css for facorites and status [SCI-11909] 2025-05-12 15:47:42 +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
dd02f08e3e
Merge pull request #8491 from aignatov-bio/ai-sci-11734-remove-perfect-scroll-from-activitio
Remove perfect scrollbar from task activities [SCI-11734]
2025-05-09 13:38:16 +02:00
Martin Artnik
b708c87f97
Merge pull request #8495 from scinote-eln/ma_SCI_11896
Make repository template migration skip check more robust [SCI-11896]
2025-05-09 12:20:26 +02:00
Martin Artnik
47c74a794d
Merge pull request #8496 from aignatov-bio/ai-sci-11906-fix-css-for-task-asset
Fix css for menu dropdown [SCI-11906]
2025-05-09 12:20:01 +02:00