Commit graph

18667 commits

Author SHA1 Message Date
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
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
Anton
2684b21a44 Update column managment with new column [SCI-11871] 2025-05-09 12:15:42 +02:00
Anton
4464cdb52a Fix css for menu dropdown [SCI-11906] 2025-05-09 11:42:27 +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
Martin Artnik
f2c90da8b6
Make repository template migration skip check more robust [SCI-11896] 2025-05-09 10:41:34 +02:00
aignatov-bio
3d7c433c2e
Merge pull request #8493 from aignatov-bio/ai-sci-11779-fix-comment-send-button-position
Fix comment send button position [SCI-11779]
2025-05-08 15:38:26 +02:00
Anton
9b149304b2 Fix comment send button position [SCI-11779] 2025-05-08 15:25:15 +02:00
Anton
0078681824 Rename copied to duplicated [SCI-11870] 2025-05-08 13:59:49 +02:00
Anton
4db5fe2444 Remove perfect scrollbar from task activities [SCI-11734] 2025-05-08 13:53:17 +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-scinote
21c05c4b60
Merge pull request #8488 from andrej-scinote/aj_SCI_11851
Add favorites to experiment table [SCI-11851]
2025-05-07 16:36:59 +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-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
aignatov-bio
8dc6b6270d
Merge pull request #8459 from aignatov-bio/ai-sci-11865-fix-decimal-format-in-numbers
Fix decimal format in form numbers [SCI-11865]
2025-05-07 12:16:49 +02:00