scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16560 commits 70 branches 179 tags 165 MiB
Commit graph

16560 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrej a87261d68d Merge branch 'develop' into features/global-search 2024-04-18 17:02:26 +02:00
ajugo b05406bf03
Merge pull request #7491 from wandji20/wb-SCI-10640 
Remove limit from inventory column dropdown list items query [SCI-10640]
 2024-04-18 16:34:27 +02:00
ajugo 43dbcf6760
Merge pull request #7490 from sboursen-scinote/sb_SCI-10229 
Fix assigned item table styles in reports [SCI-10229]
 2024-04-18 16:33:50 +02:00
Andrej c740452086 Merge branch 'features/sso-improvements' into develop 2024-04-18 15:58:17 +02:00
wandji20 50df1e153d Remove limit from inventory column dropdown list items query [SCI-10640] 2024-04-18 12:47:04 +01: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
sboursen-scinote b554eed8ee Fix assigned item table styles in reports [SCI-10229] 
In report, we are missing columns in assigned item to task table due to long inventory names.
 2024-04-18 11:56:53 +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
aignatov-bio 38d8e3a57e
Merge pull request #7488 from aignatov-bio/ai-sci-10636-unify-global-search-page 
Small css fixes and microinteractions [SCI-10630][SCI-10306]
 2024-04-18 11:06:39 +02:00
Anton 9bd64104f3 Small css fixes and microinteractions [SCI-10630] 2024-04-18 11:05:37 +02:00
Martin Artnik 3ffda603d3
Bump version to 1.32.0.2 2024-04-17 10:25:34 +02:00
ajugo a916bd1641
Merge pull request #7483 from rekonder/aj_SCI_10246 
Clean quick search [SCI-10246]
 2024-04-16 14:29:18 +02:00
Andrej c253d0ffcf Clean quick search [SCI-10246] 2024-04-16 13:52:53 +02:00
aignatov-bio 09ed1b251c
Merge pull request #7482 from aignatov-bio/ai-sci-10636-unify-global-search-page 
Unify global search page [SCI-10636]
 2024-04-16 13:43:06 +02:00
Anton 57c138f54f Unify global search page [SCI-10636] 2024-04-16 13:36:56 +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
ajugo a2a3c0ab28
Merge pull request #7479 from sboursen-scinote/sb_SCI-10623 
Fix Rack::Attack deprecation message [SCI-10623]
 2024-04-16 11:30:21 +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
sboursen-scinote b29ebc4005 Fix Rack::Attack deprication message [SCI-10623] 2024-04-16 10:14:29 +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
ajugo 7e966837d2
Merge pull request #7471 from aignatov-bio/ai-sci-10587-small-improvments-for-tags-modal 
Improve for tags modal [SCI-10587]
 2024-04-15 16:29:11 +02:00
ajugo eb91eaebd6
Merge pull request #7473 from aignatov-bio/ai-sci-10600-small-css-table-issues 
Small css fixes for table [SCI-10600]
 2024-04-15 16:28:10 +02:00
wandji20 a51d63a388 Fix SSO button CSS [SCI-9621] 2024-04-15 14:52:24 +01:00
Anton 5d552cb713 Small css fixes for table [SCI-10600] 2024-04-15 12:52:37 +02: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 2ff3477956
Merge pull request #7427 from rekonder/aj_SCI_10246 
Implement quick search backend [SCI-10246]
 2024-04-15 10:36:12 +02:00
Martin Artnik 83477a461a Properly set warden session in asset syncs controller [SCI-10637] 2024-04-15 10:29:28 +02:00
Anton 055421c6a3 Improve for tags modal [SCI-10587] 2024-04-15 10:25:59 +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
aignatov-bio 43750bf137
Merge pull request #7465 from wandji20/wb-SCI-10585 
Add archived tag to global search result object names [SCI-10585]
 2024-04-11 15:28:16 +02:00
aignatov-bio fc436619fe
Merge pull request #7466 from aignatov-bio/ai-sci-fix-quick-search-memory-leak 
Fix quick search memory leak
 2024-04-11 15:25:34 +02:00
Anton f29c107208 Fix quick search memory leak 2024-04-11 15:23:59 +02:00
wandji20 83dbd89f04 Add archived tag to global search result object names [SCI-10585] 2024-04-11 12:45:29 +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
Anton 0d9024afff Fix folder selection [SCI-10611] 2024-04-11 09:57:44 +02:00