16447 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
aignatov-bio	0808923f03	Merge pull request #7459 from aignatov-bio/ai-sci-10598-fix-draft-creation ... Fix draft creation to prevent duplicates [SCI-10598]	2024-04-10 11:32:13 +02:00
Anton	2bddac06b8	Fix draft creation to prevent dupciates [SCI-10598]	2024-04-10 11:25:59 +02:00
ajugo	9c559a0c65	Merge pull request #7433 from wandji20/wb-SCI-10572 ... Split external services for CSP for script_src and connect_src [SCI-10572]	2024-04-10 10:55:03 +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
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	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
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
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
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
wandji20	9ac0dca68a	Split external services for CSP for script_src and connect_src [sci_10572]	2024-04-05 11:12:35 +01: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
Ivan Kljun	cda3ce29df	Fix rufus jobs to release db connections after use [SCI-10581]	2024-04-04 13:09:49 +02:00
Andrej	6e95ba13f9	Merge branch 'develop' into features/sso-improvements	2024-04-03 13:32:15 +02:00
ajugo	f419a72556	Merge pull request #7401 from wandji20/wb-SCI-10214 ... Add check for different sso providers [SCI-10214]	2024-04-03 10:42:31 +02:00
Martin Artnik	e38ab63fa1	Bump version to 1.32.0	2024-04-03 10:23:53 +02:00
aignatov-bio	3c8cd674aa	Merge pull request #7415 from sboursen-scinote/sb_SCI-10519-v3 ... Fix experiment description position in table [SCI-10519]	2024-04-02 18:22:07 +02:00
sboursen-scinote	ad7310834a	Fix experiment description position in table [SCI-10519]	2024-04-02 18:03:59 +02:00
aignatov-bio	bf85b98b93	Merge pull request #7414 from wandji20/wb-SCI-10562 ... Improve gridApi method call [SCI-10562]	2024-04-02 17:57:21 +02:00
wandji20	683bad54e1	Improve gridApi method call [SCI-10562]	2024-04-02 16:45:29 +01:00
Martin Artnik	ccc66ab22b	Fix unsupported WOPI file button for inventory files [SCI-10546]	2024-04-02 16:55:28 +02:00
ajugo	55a8f0d793	Merge pull request #7412 from rekonder/aj_SCI_10569 ... Fix activity generation at project visibility change [SCI-10569]	2024-04-02 16:51:20 +02:00
Andrej	d4f33ff33d	Fix activity generation at project visibility change [SCI-10569]	2024-04-02 16:29:04 +02:00
aignatov-bio	53536b96ab	Merge pull request #7409 from wandji20/wb-SCI-10562 ... Clear selected rows with gridApi when reloading tables [SCI-10562]	2024-04-02 16:21:07 +02:00
aignatov-bio	b15ca0b680	Merge pull request #7396 from sboursen-scinote/sb_SCI-10519-v2 ... Fix experiment description position in table [SCI-10519]	2024-04-02 16:10:53 +02:00
sboursen-scinote	71e2b4a397	Fix experiment description position in table [SCI-10519]	2024-04-02 16:09:02 +02:00
ajugo	850dbc32a1	Merge pull request #7410 from wandji20/wb-SCI-10544 ... Update minWidth of task status column [SCI-10544]	2024-04-02 16:04:24 +02:00
ajugo	9f15a55326	Merge pull request #7411 from rekonder/aj_SCI_10570 ... Fix label template preview for print modal [SCI-10570]	2024-04-02 15:46:58 +02:00
Andrej	726b96eecb	Fix label template preview for print modal [SCI-10570]	2024-04-02 15:25:53 +02:00
wandji20	7eb3cff06e	Add check for different sso providers [SCI-10214]	2024-04-02 13:38:21 +01:00
wandji20	56be39f7de	Update minWidth of task status column [SCI-10544]	2024-04-02 13:08:37 +01:00
ajugo	8e8894c189	Merge pull request #7408 from rekonder/aj_SCI_10563 ... Fix experiment sorting by archived on [SCI-10563]	2024-04-02 13:43:35 +02:00
wandji20	4c1fc4ae3f	Clear selected rows with gridApi when reloading tables [SCI-10562]	2024-04-02 11:49:40 +01:00
Andrej	cf79812b4b	Fix experiment sorting by archived on [SCI-10563]	2024-04-02 12:41:32 +02:00
ajugo	fe6879a0e8	Merge pull request #7391 from wandji20/wb-SCI-10541 ... Fix Canvas - Broken new comment badge while adding new comments [SCI-10541]	2024-04-02 11:31:21 +02:00