Commit graph

16514 commits

Author SHA1 Message Date
Martin Artnik
4fc41b08d8 Fix order-by distinct mismatch in protocols list service [SCI-10688] 2024-05-09 15:43:10 +02:00
Martin Artnik
c9a57caf40 Fix ambiguous column issues in protocols list service [SCI-10688] 2024-05-09 13:45:34 +02:00
Martin Artnik
f50725a570
Merge pull request #7537 from scinote-eln/develop
May 2024 Release
2024-05-08 10:01:00 +02:00
Martin Artnik
6bcff084fd
Bump version to 1.33.0 2024-05-08 09:59:48 +02:00
Martin Artnik
81e3f16d14
Merge pull request #7535 from scinote-eln/revert-7534-dependabot/npm_and_yarn/pdfjs-dist-4.2.67
Revert "Bump pdfjs-dist from 2.16.105 to 4.2.67"
2024-05-07 13:43:18 +02:00
Martin Artnik
290b91feaf
Revert "Bump pdfjs-dist from 2.16.105 to 4.2.67" 2024-05-07 13:43:04 +02:00
Martin Artnik
f9550e45cf
Merge pull request #7534 from scinote-eln/dependabot/npm_and_yarn/pdfjs-dist-4.2.67
Bump pdfjs-dist from 2.16.105 to 4.2.67
2024-05-07 13:32:51 +02:00
dependabot[bot]
af54944347
Bump pdfjs-dist from 2.16.105 to 4.2.67
Bumps [pdfjs-dist](https://github.com/mozilla/pdfjs-dist) from 2.16.105 to 4.2.67.
- [Commits](https://github.com/mozilla/pdfjs-dist/commits)

---
updated-dependencies:
- dependency-name: pdfjs-dist
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-07 10:57:49 +00:00
Martin Artnik
260bdca33e
Merge pull request #7528 from artoscinote/ma_SCI_10671
Fix OpenID unlink translation [SCI-10671]
2024-05-06 13:12:17 +02:00
Martin Artnik
496d3fe628 Fix OpenID unlink translation [SCI-10671] 2024-05-06 13:05:49 +02:00
Martin Artnik
220160b075
Merge pull request #7525 from artoscinote/ma_SCI_10669
Add unique constraint to viewable states [SCI-10669]
2024-05-06 10:46:14 +02:00
Martin Artnik
66e2bed6e6 Add unique constraint to viewable states [SCI-10669] 2024-05-03 15:48:19 +02:00
aignatov-bio
c795472eda
Merge pull request #7514 from sboursen-scinote/sb_SCI-10671
Fix typo in unlink connected accounts modal [SCI-10671]
2024-04-26 10:35:15 +02:00
sboursen-scinote
f9a060e5dd Fix typo in unlink connected accounts modal [SCI-10671] 2024-04-25 17:04:05 +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
ajugo
6fbdd055fc
Merge pull request #7504 from aignatov-bio/ai-sci-10662-fix-label-template-print-modal
Fix label printing and experiment description [SCI-10662][SCI-10660]
2024-04-24 10:33:30 +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
ajugo
77e7cb8f08
Merge pull request #7485 from wandji20/wb-SCI-10634
Refactor PasswordController update action to conditionally assign user [SCI-10634]
2024-04-18 12:02:22 +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
Martin Artnik
ddd939f6e3
Merge pull request #7487 from scinote-eln/develop
April 2024 Bugfix Release
2024-04-17 10:29:56 +02:00
Martin Artnik
3ffda603d3
Bump version to 1.32.0.2 2024-04-17 10:25:34 +02:00
ajugo
80aa14566d
Merge pull request #7480 from scinote-eln/aj_SCI_10631
Disable azure authentication for giot [SCI-10631]
2024-04-16 13:17:09 +02:00
Martin Artnik
499e1ca8e1
Merge pull request #7481 from sboursen-scinote/sb_SCI-10642
Save due date when creating task from canvas [SCI-10642]
2024-04-16 11:58:27 +02:00
sboursen-scinote
910f2d4a49 Save due date when creating task from canvas [SCI-10642] 2024-04-16 11:25:37 +02:00
Andrej
9e887db01d Disable azure authentication for giot [SCI-10631] 2024-04-16 11:17:42 +02:00
aignatov-bio
bb1e300acf
Merge pull request #7418 from sboursen-scinote/sb_SCI-10519-v4
Fix for smart annotation in experiments description [SCI-10519]
2024-04-16 11:15:16 +02:00
sboursen-scinote
6240608678 Fix for smart annotation in experiments description [SCI-10519] 2024-04-16 11:06:55 +02:00
ajugo
cb6ff350e3
Merge pull request #7478 from wandji20/revert-7476-wb-SCI-9621
Revert "Fix SSO button CSS [SCI-9621]"
2024-04-16 09:55:25 +02:00
wandji
63b7a864f0
Revert "Fix SSO button CSS [SCI-9621]" 2024-04-16 08:52:31 +01:00
Martin Artnik
2ea19c2875
Merge pull request #7477 from artoscinote/ma_SCI_10638
Add missing file extension downcasing for WOPI [SCI-10638]
2024-04-16 09:33:53 +02:00
Martin Artnik
c24bb3201c Add missing file extension downcasing for WOPI [SCI-10638] 2024-04-16 09:14:44 +02:00
ajugo
06729fde46
Merge pull request #7476 from wandji20/wb-SCI-9621
Fix SSO button CSS [SCI-9621]
2024-04-15 16:30:18 +02:00
wandji20
a51d63a388 Fix SSO button CSS [SCI-9621] 2024-04-15 14:52:24 +01:00
Martin Artnik
dcfc66535e
Merge pull request #7474 from artoscinote/ma_SCI_10638
Fix file icon rendering for all-caps file extesions [SCI-10638]
2024-04-15 12:50:42 +02: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
3882f5e33e
Merge pull request #7472 from artoscinote/ma_SCI_10637
Properly set warden session in asset syncs controller [SCI-10637]
2024-04-15 10:38:50 +02:00
Martin Artnik
83477a461a Properly set warden session in asset syncs controller [SCI-10637] 2024-04-15 10:29:28 +02:00
aignatov-bio
9a48d635b7
Merge pull request #7469 from aignatov-bio/ai-sci-10632-fix-label-templates-selector
Fix label templates selector in print modal [SCI-10632]
2024-04-12 11:54:21 +02:00
ajugo
0d17ce9d88
Merge pull request #7468 from wandji20/wb-SCI-10616
Rename Azure AD SSO to Microsoft Entra ID [SCI-10616]
2024-04-12 11:37:07 +02:00
Anton
7b3e5a06e0 Fix label templates seelctor in print modal [SCI-10632] 2024-04-12 11:17:09 +02:00
wandji20
4aa4b69608 Rename Azure AD SSO to Microsoft Entra ID [SCI-10616] 2024-04-11 18:57:42 +01: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