Commit graph

12957 commits

Author SHA1 Message Date
Martin Artnik
c9a57caf40 Fix ambiguous column issues in protocols list service [SCI-10688] 2024-05-09 13:45:34 +02:00
ajugo
21f224c05c
Merge pull request #7509 from sboursen-scinote/sb_SCI-10531-2
Disable toolbar state button only for archived inventories [SCI-10531]
2024-04-25 11:14:43 +02:00
ajugo
2e33c9aeaa
Merge pull request #7510 from sboursen-scinote/sb_SCI-10688
Fix the style of Okta and MS Entra buttons on login page [SCI-10668]
2024-04-24 16:36:33 +02:00
sboursen-scinote
e806cc9cca Fix the style of Okta an MS Entra btns on login page [SCI-10668] 2024-04-24 16:01:42 +02:00
sboursen-scinote
67ba0c1c85 Disable toolbar state button only for archived inventories [SCI-10531] 2024-04-24 15:47:25 +02:00
Anton
77f09e5e3c Fix label printing and experiment description [SCI-10662] 2024-04-23 14:07:46 +02:00
ajugo
ffbf36e1e8
Merge pull request #7493 from sboursen-scinote/sb_SCI-10531
Fix various issues with archived labels in repositories [SCI-10531]
2024-04-19 10:09:49 +02:00
sboursen-scinote
c36e2277fa Fix various issues with archived labels in reporsitories [SCI-10531] 2024-04-18 16:19:18 +02:00
Andrej
c740452086 Merge branch 'features/sso-improvements' into develop 2024-04-18 15:58:17 +02:00
wandji20
be093c9302 Add helper method for checking user 2fa enabled [SCI-10634] 2024-04-18 10:43:07 +01:00
aignatov-bio
018e36ca5a
Merge pull request #7464 from KlemenSciNote/kb_SCI-10571_data-e2e
e2e - Add data-e2e attributes [SCI-10571]
2024-04-18 11:39:42 +02:00
sboursen-scinote
910f2d4a49 Save due date when creating task from canvas [SCI-10642] 2024-04-16 11:25:37 +02:00
sboursen-scinote
6240608678 Fix for smart annotation in experiments description [SCI-10519] 2024-04-16 11:06:55 +02:00
wandji
63b7a864f0
Revert "Fix SSO button CSS [SCI-9621]" 2024-04-16 08:52:31 +01:00
Martin Artnik
c24bb3201c Add missing file extension downcasing for WOPI [SCI-10638] 2024-04-16 09:14:44 +02:00
wandji20
a51d63a388 Fix SSO button CSS [SCI-9621] 2024-04-15 14:52:24 +01:00
Martin Artnik
96ebe450c9 Fix file icon rendering for all-caps file extesions [SCI-10638] 2024-04-15 12:12:13 +02:00
Martin Artnik
83477a461a Properly set warden session in asset syncs controller [SCI-10637] 2024-04-15 10:29:28 +02:00
Anton
7b3e5a06e0 Fix label templates seelctor in print modal [SCI-10632] 2024-04-12 11:17:09 +02:00
Klemen Benedicic
5ab1b4eead Add data-e2e attributes [SCI-10571] 2024-04-11 12:45:55 +02:00
ajugo
d5665b9c14
Merge pull request #7461 from aignatov-bio/ai-sci-10614-lost-formatting-for-exp-desc
Bugs fixes for next release [SCI-10614][SCI-10598][SCI-10593][SCI-10611][SCI-9957][SCI-10605]
2024-04-11 10:44:23 +02:00
Anton
0d9024afff Fix folder selection [SCI-10611] 2024-04-11 09:57:44 +02:00
Andrej
d2ace74d75 Enable leave for team owners for yourself [SCI-9957] 2024-04-11 09:57:21 +02:00
Anton
4110e966c8 Add inventory name to label templates [SCI-10611] 2024-04-10 18:52:52 +02:00
Anton
52fd3ff801 Fix item card dropdown options list [SCI-10593] 2024-04-10 18:52:35 +02:00
Anton
70beec648a Fix draft creation to prevent dupciates [SCI-10598] 2024-04-10 18:52:01 +02:00
Anton
0c97ebfafb Fix lost formatting-for-exp-desc [SCI-10614] 2024-04-10 18:51:23 +02:00
ajugo
527c9d4128
Merge pull request #7457 from sboursen-scinote/sb_SCI-10515
prevent reviving the session if the page is being reloaded after signing a task [SCI-10515]
2024-04-10 17:30:10 +02:00
sboursen-scinote
271702e2a8 prevent reviving the session if the page is being reloaded after signing a task [SCI-10515] 2024-04-10 17:23:56 +02:00
Anton
2bddac06b8 Fix draft creation to prevent dupciates [SCI-10598] 2024-04-10 11:25:59 +02:00
ajugo
a35e6455df
Merge pull request #7454 from aignatov-bio/ai-sci-10593-not-all-dropdown-items-vissible
Fix item card dropdown options list [SCI-10593]
2024-04-10 10:53:33 +02:00
ajugo
591d733dc4
Merge pull request #7448 from rekonder/aj_SCI_9957
Enable leave for team owners for yourself [SCI-9957]
2024-04-10 10:44:32 +02:00
Anton
9f3cf70ad5 Fix item card dropdown options list [SCI-10593] 2024-04-10 10:38:09 +02:00
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
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
Andrej
7052c767ed Improve handling of tinymce images for pdf reports [SCI-10522] 2024-04-08 14:57:14 +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
Anton
6d069ce2ed Fix task creation duplicates [SCI-10603] 2024-04-05 12:57:34 +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
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