Commit graph

19012 commits

Author SHA1 Message Date
andrej-scinote
34bedcd9ad
Merge pull request #8608 from andrej-scinote/aj_SCI_11960
Add notifications for user groups [SCI-11960]
2025-07-02 14:21:41 +02:00
Martin Artnik
394c152db9
Merge pull request #8605 from aignatov-bio/ai-sci-12044-fix-duplicated-breadcrumbs-in-notifications
Remove duplicated breadcrumbs from notifications [SCI-12044]
2025-07-02 13:01:16 +02:00
Andrej
6b3778d934 Unassign user from user groups when no longer in team [SCI-12040] 2025-07-02 12:13:00 +02:00
Martin Artnik
a6e5cc9d2e Merge branch 'develop' into features/user-groups 2025-06-30 15:24:22 +02:00
Martin Artnik
928c9ca372
Merge pull request #8622 from artoscinote/ma_SCI_12078
Fix pending migration check in db/seeds.rb [SCI-12078]
2025-06-30 15:15:04 +02:00
Martin Artnik
d36b22b1b4 Fix pending migration check in db/seeds.rb [SCI-12078] 2025-06-30 14:54:56 +02:00
Martin Artnik
702c882c51 Merge branch 'hotfix/1.42.0.1' into develop 2025-06-30 14:34:40 +02:00
Martin Artnik
4c1af7610d Merge branch 'hotfix/1.42.0.1' into develop 2025-06-30 14:04:26 +02:00
Martin Artnik
49a2869151
Merge pull request #8620 from artoscinote/ma_SCI_12074
Initialize custom tooltips for step-result link buttons [SCI-12074]
2025-06-30 11:38:50 +02:00
Martin Artnik
9a061f4a52 Initialize custom tooltips for step-result link buttons [SCI-12074] 2025-06-30 11:21:14 +02:00
Martin Artnik
4555762c80
Merge pull request #8619 from artoscinote/ma_SCI_12033
Fix result and task protocol search (caused by upgrade to Rails 7.2) [SCI-12033]
2025-06-30 10:54:14 +02:00
Martin Artnik
552337b203 Fix result and task protocol search (caused by upgrade to Rails 7.2) [SCI-12033] 2025-06-30 09:57:45 +02:00
Martin Artnik
0c1e207afb
Merge pull request #8615 from aignatov-bio/ai-sci-12065-add-loader-for-linking-modal
Add loader for linking modal [SCI-12065]
2025-06-27 15:09:24 +02:00
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
d0801c9d50
Merge pull request #8618 from artoscinote/ma_SCI_11841
Revert back to pre 7.2 ActiveStorage variant behaviour [SCI-11841]
2025-06-27 15:08:44 +02:00
Martin Artnik
581e477c51 Revert back to pre 7.2 ActiveStorage variant behaviour [SCI-11841] 2025-06-27 15:05:46 +02:00
aignatov-bio
6b85675e75
Merge pull request #8616 from aignatov-bio/ai-sci-12068-link-results-to-step-in-protocol-template
Disable results linking to protocol templates [SCI-12068]
2025-06-27 14:48:02 +02:00
Anton
9103ede18a Fix step position in activity [SCI-12072] 2025-06-27 14:47:48 +02:00
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
aignatov-bio
2813187276
Merge pull request #8614 from aignatov-bio/ai-sci-11889-fix-step-results-link-in-pdf
Fix long linked results in reports [SCI-11889]
2025-06-27 13:45:57 +02:00
Anton
ee569f4e70 Disable results linking to protocol templates [SCI-12068] 2025-06-27 13:44:00 +02:00
Anton
4c944da9a0 Add loader for linking modal [SCI-12065] 2025-06-27 13:27:23 +02:00
aignatov-bio
169f743a8a
Merge pull request #8613 from aignatov-bio/ai-sci-12062-improve-checkbox-handling-for-tables
Improve checkbox handling for tables [SCI-12062]
2025-06-27 13:09:56 +02:00
Anton
966d5b5160 Fix long linked results in reports [SCI-11889] 2025-06-27 13:09:35 +02:00
Anton
63a6867ab8 Improve checkbox handling for tables [SCI-12062] 2025-06-27 12:44:33 +02:00
Martin Artnik
1bf21894fc
Merge pull request #8612 from artoscinote/ma_SCI_12070
Amend Microsoft 365 naming [SCI-12070]
2025-06-27 12:19:51 +02:00
Martin Artnik
46ef842514 Bump version to 1.42.0.1 2025-06-27 11:50:36 +02:00
Martin Artnik
5da6418c2d Amend Microsoft 365 naming [SCI-12070] 2025-06-27 11:50:28 +02:00
Anton
a4defbdcbb Fix linking for archived and deleted results [SCI-12061][SCI-12060] 2025-06-26 14:29:41 +02:00
aignatov-bio
00722f04f9
Merge pull request #8609 from aignatov-bio/ai-sci-12037-add-step-number-to-dropdown
Add step number to dropodown [SCI-12037]
2025-06-26 14:27:04 +02:00
Anton
99c2b626a7 Add step number to dropodown [SCI-12037] 2025-06-26 11:14:56 +02:00
Andrej
6adf7c727b Add notifications for user groups [SCI-11960] 2025-06-26 11:01:46 +02:00
aignatov-bio
3290348860
Merge pull request #8606 from aignatov-bio/ai-sci-12052-fix-link-modal-for-collapses-results
Fix link modal for collapsed step and results [SCI-12052]
2025-06-26 10:50:06 +02:00
aignatov-bio
1efe2fb7a6
Merge pull request #8607 from aignatov-bio/ai-sci-12042-add-editable-user-group-name
Add user group editable name [SCI-12042]
2025-06-26 10:48:11 +02:00
aignatov-bio
0594d011ff
Merge pull request #8603 from aignatov-bio/ai-sci-11961-add-switchability-for-user-groups-page
Add promo page for user groups [SCI-11961]
2025-06-24 16:05:16 +02:00
Anton
399053efbf Add user group editable name [SCI-12042] 2025-06-24 16:04:55 +02:00
Anton
6d18343ec4 Fix link modal for collapsed step and results [SCI-12052] 2025-06-24 11:46:35 +02:00
Anton
8ffa778544 Remove duplicated breadcrumbs from notifications [SCI-12044] 2025-06-24 11:22:13 +02:00
Martin Artnik
2f6d0424a7 Merge branch 'develop' into features/user-groups 2025-06-24 10:28:09 +02:00
Martin Artnik
44b654a85f
Merge pull request #8589 from artoscinote/ma_SCI_12033
Fix search for exact phrases and with_subquery [SCI-12033]
2025-06-24 10:27:28 +02:00
Martin Artnik
fe28187b75 Merge branch 'develop' into features/user-groups 2025-06-24 10:25:10 +02:00
andrej-scinote
e2bc9ac7be
Merge pull request #8602 from andrej-scinote/aj_SCI_11965
Add activities for user groups [SCI-11965]
2025-06-24 10:17:40 +02:00
Martin Artnik
f7c95ecdec
Merge pull request #8604 from aignatov-bio/ai-sci-12045-add-validation-for-step-results-linking
Add front end validation for step results linking [SCI-12045]
2025-06-23 16:45:05 +02:00
Martin Artnik
d1461085e9 Fix label template migration [SCI-11903] 2025-06-23 16:38:44 +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
Andrej
1bd43f8eea Add activities for user groups [SCI-11965] 2025-06-23 15:54:34 +02:00
Martin Artnik
2b7de4871c
Fix label template migration [SCI-11903] 2025-06-23 15:36:15 +02:00
Anton
dcafaaec98 Add promo page for user groups [SCI-11961] 2025-06-23 15:18:01 +02:00
Martin Artnik
ee2577fe8b
Merge pull request #8601 from scinote-eln/rails_upgrade_fixes
Rails upgrade fixes [SCI-11841]
2025-06-23 15:14:08 +02:00
Anton
0fc6ba3996 Add front end valdation for step results linking [SCI-12045] 2025-06-23 13:58:06 +02:00