Commit graph

16596 commits

Author SHA1 Message Date
Martin Artnik
fc9969fb56
Merge pull request #7455 from scinote-eln/hotfix/1.32.0.1
Hotfix/1.32.0.1
2024-04-09 15:21:03 +02:00
aignatov-bio
28082eecee
Merge pull request #7453 from aignatov-bio/ai-sci-10611-add-inventory-name-to-label-template
Add inventory name to label templates [SCI-10611]
2024-04-09 14:42:43 +02:00
aignatov-bio
3fe97b0b15
Merge pull request #7452 from aignatov-bio/ai-sci-10611-fix-folder-selection
Fix folder selection [SCI-10605]
2024-04-09 14:42:06 +02:00
Anton
e6bda25c82 Add inventory name to label templates [SCI-10611] 2024-04-09 14:39:49 +02:00
Anton
dde28a2f12 Fix folder selection [SCI-10611] 2024-04-09 14:30:34 +02:00
Andrej
7efbd223bf Merge branch 'develop' into features/sso-improvements 2024-04-09 13:54:23 +02:00
aignatov-bio
50e3311033
Merge pull request #7439 from wandji20/wb-SCI-10480
Implement skeleton loading for object groups in global search page [SCI-10480]
2024-04-09 13:35:42 +02:00
aignatov-bio
e44a6f20a6
Merge pull request #7445 from sboursen-scinote/sb_SCI-10590
Upgrade taiwindcss-rails gem to 2.4 [SCI-10590]
2024-04-09 12:36:38 +02:00
Andrej
8e94cd5ce6 Enable leave for team owners for yourself [SCI-9957] 2024-04-09 10:07:06 +02:00
ajugo
e0578778cf
Merge pull request #7443 from rekonder/aj_SCI_10522
Improve handling of tinymce images for pdf reports [SCI-10522]
2024-04-09 10:06:05 +02:00
sboursen-scinote
6104daf687 Upgrade taiwindcss-rails gem [SCI-10590] 2024-04-09 08:48:23 +02:00
wandji20
cc90078219 Implement skeleton loading for object groups in global search page [SCI-10480] 2024-04-08 17:23:14 +01:00
wandji20
ed3701e5ec Update icons [SCI-10480] 2024-04-08 16:59:26 +01:00
Andrej
7052c767ed Improve handling of tinymce images for pdf reports [SCI-10522] 2024-04-08 14:57:14 +02:00
Martin Artnik
c35c03e5b1
Merge pull request #7429 from ivanscinote/SCI-10581-ik
Fix rufus jobs to release db connections after use [SCI-10581]
2024-04-08 14:51:00 +02:00
aignatov-bio
ec8ab9cc8b
Merge pull request #7442 from aignatov-bio/ai-sci-10528-add-sorting-to-global-search
Add sorting to global search [SCI-10528]
2024-04-08 13:10:23 +02:00
Anton
c2da52a6bb Add sorting to global search [SCI-10528] 2024-04-08 12:54:46 +02:00
ajugo
6e094ffe5f
Merge pull request #7437 from sboursen-scinote/sb_SCI-10584
Add openid connect and saml connected accounts [SCI-10584]
2024-04-08 10:39:14 +02:00
aignatov-bio
1e7bb69763
Merge pull request #7436 from aignatov-bio/ai-sci-10536-add-filters-to-global-search
Connect filters modal [SCI-10536]
2024-04-08 10:38:13 +02:00
Anton
01abb78d4e Connecte filters modal [SCI-10536] 2024-04-08 10:36:29 +02:00
Martin Artnik
67f9c141fc
Merge pull request #7430 from artoscinote/ma_SCI_10592
Make sure current_user is set earlier in asset syncs controller [SCI-10592]
2024-04-08 09:20:02 +02:00
sboursen-scinote
874c333496 Add openid connect and saml connected accounts [SCI-10584] 2024-04-08 07:52:36 +02:00
Martin Artnik
08ad224f8d
Bump version to 1.32.0.1 2024-04-05 13:51:03 +02:00
aignatov-bio
e3c70e41d4
Merge pull request #7434 from aignatov-bio/ai-sci-10603-multiple-task-create-from-canvas
Fix task creation duplicates [SCI-10603]
2024-04-05 12:59:34 +02:00
Anton
6d069ce2ed Fix task creation duplicates [SCI-10603] 2024-04-05 12:57:34 +02:00
wandji20
9ac0dca68a Split external services for CSP for script_src and connect_src [sci_10572] 2024-04-05 11:12:35 +01:00
aignatov-bio
ba9686810a
Merge pull request #7432 from aignatov-bio/ai-sci-10596-fix-table-freezing
Fix table freezing [SCI-10596]
2024-04-05 10:18:29 +02:00
Anton
9f57e8161a Fix table freezing [SCI-10596] 2024-04-05 10:16:23 +02:00
Martin Artnik
bad4064288 Make sure current_user is set earlier in asset syncs controller [SCI-10592] 2024-04-04 15:10:40 +02:00
Martin Artnik
f31e0f365d
Merge pull request #7413 from artoscinote/ma_SCI_10546
Fix unsupported WOPI file button for inventory files [SCI-10546]
2024-04-04 14:40:52 +02:00
Anton
d101f8794c Fix merge issue 2024-04-04 14:30:58 +02:00
aignatov-bio
754e2f1625
Merge pull request #7397 from wandji20/wb-SCI-10474
Add task results to global search page [SCI-10474]
2024-04-04 14:29:25 +02:00
wandji20
e6741a79f5 Add task results to global search page [SCi-10474] 2024-04-04 13:26:09 +01:00
aignatov-bio
6e94650add
Merge pull request #7379 from wandji20/wb-SCI-10472
Add task to global search page [SCI-10472]
2024-04-04 14:24:16 +02:00
wandji20
72f496b966 Add task to global search page [SCI-10472] 2024-04-04 13:23:13 +01:00
aignatov-bio
3e561b4836
Merge pull request #7388 from wandji20/wb-SCI-10473
Add task protocol results to global search page [SCI-10473]
2024-04-04 14:19:59 +02:00
wandji20
a9b624f255 Fix project load error [SCI-10473] 2024-04-04 13:19:01 +01:00
wandji20
e993964692 Add task protocol results to global search page [SCI-10473] 2024-04-04 13:05:27 +01:00
aignatov-bio
2921a1fbaa
Merge pull request #7384 from sboursen-scinote/sb_SCI-10478
Implement global search results component for Label templates [SCI-10478]
2024-04-04 14:02:15 +02:00
aignatov-bio
8b56e6fa11
Merge pull request #7420 from wandji20/wb-SCI-10479
Add report results to global search page [SCI-10479]
2024-04-04 14:00:04 +02:00
aignatov-bio
6ac5ad3d71
Merge pull request #7426 from wandji20/wb-SCI-10475
Add asset results to global search page [SCI-10475]
2024-04-04 13:59:24 +02:00
ajugo
0475d814fe
Merge pull request #7421 from rekonder/aj_SCI_10527
Fix project export [SCI-10527]
2024-04-04 13:51:47 +02:00
Andrej
4cf0c7ac00 Fix project export [SCI-10527] 2024-04-04 13:27:46 +02:00
Ivan Kljun
cda3ce29df Fix rufus jobs to release db connections after use [SCI-10581] 2024-04-04 13:09:49 +02:00
wandji20
3dea7c1e6d Set table searchValue using table ref [SCI-10479] 2024-04-04 11:16:56 +01:00
aignatov-bio
ebb330ff26
Merge pull request #7372 from aignatov-bio/ai-sci-10305-add-global-search-filter-component
Add filter component to quick search [SCI-10305]
2024-04-04 12:00:17 +02:00
wandji20
d76fbf1eba Add report results to global search page [SCI-10479] 2024-04-04 10:54:16 +01:00
wandji20
6483780d33 Add asset results to global search page [SCI-10475] 2024-04-04 10:51:01 +01:00
Anton
c6f5997fda Add filter component to quick search [SCI-10305] 2024-04-04 11:49:20 +02:00
Andrej
ae5cebe7d7 Implement quick search backend [SCI-10246] 2024-04-04 11:24:17 +02:00