1010 commits

Author	SHA1	Message	Date
ajugo	e1cf9775fd	Add new activites for all team members [SCI-8224] (#5227)	2023-03-30 16:04:57 +02:00
Anton	ed1c4bcb69	Replace webpacker with jsbundling-rails [SCI-7926]	2023-03-30 13:39:57 +02:00
artoscinote	00191e41de	Merge pull request #5192 from scinote-eln/features/token-revocation ... Features/token revocation	2023-03-24 11:13:38 +01:00
ajugo	8eb04c50c2	Add removing connected device [SCI-8146] (#5174)	2023-03-21 16:44:24 +01:00
Oleksii Kriuchykhin	7fff3e8f78	Merge branch 'hotfix/1.26.6.2' into develop	2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin	b67691acb5	Merge branch 'develop' into features/protocol_versioning	2023-03-17 13:53:30 +01:00
Alex Kriuchykhin	bd670bb177	Allow data attributes in html sanitization [SCI-8158] (#5159)	2023-03-16 18:17:18 +01:00
Alex Kriuchykhin	d285a0a9db	Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123)	2023-03-13 09:55:53 +01:00
Alex Kriuchykhin	cb1c49762a	Revert "Protocol permissions - button display [SCI-8058]" (#5121)	2023-03-10 11:45:32 +01:00
Alex Kriuchykhin	87153b8899	Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106)	2023-03-09 11:38:47 +01:00
G-Chubinidze	32d1c2cf6d	Merge branch 'features/protocol_versioning' into gc_SCI_8058	2023-03-08 21:15:36 +04:00
Giga Chubinidze	553c644811	Protocol permissions - button display [SCI-8058]	2023-03-08 21:12:29 +04:00
Martin Artnik	e4e8997cc1	Add draft created activity [SCI-8093]	2023-03-07 14:45:52 +01:00
Soufiane	d801677392	Merge branch 'develop' into sb_SCI-7562	2023-03-07 12:52:05 +01:00
Martin Artnik	ac0e0ba853	Fix asset initializer [SCI-7974]	2023-03-01 15:31:22 +01:00
ajugo	58fdcc785f	Make supporting material variable [SCI-6593] (#5014)	2023-02-24 17:57:10 +01:00
Martin Artnik	b0fc97a549	Fix assignable for top level assignables [SCI-7978]	2023-02-22 15:37:39 +01:00
Anton	f7d7113239	Add new protocol activities [SCI-7717]	2023-02-22 10:46:24 +01:00
Anton	a95ca75362	Add new protocol modal [SCI-7810]	2023-02-21 14:15:53 +01:00
artoscinote	6400745b0c	Merge pull request #4984 from artoscinote/ma_SCI_7937 ... Fix table of contents, add image download tooltip [SCI-7937]	2023-02-17 14:59:01 +01:00
Martin Artnik	43f6a8e66f	Fix table of contents, add image download tooltip [SCI-7937]	2023-02-17 10:36:47 +01:00
Alex Kriuchykhin	7f8f723cbe	Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974)	2023-02-14 16:50:15 +01:00
Anton	ea9d2d8291	Merge branch 'develop' into features/protocol_versioning	2023-02-14 11:07:58 +01:00
Alex Kriuchykhin	dadb2fdf06	Merge pull request #4909 from okriuchykhin/ok_SCI_7816 ... Fix date time inventories reminder processing [SCI-7816]	2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin	e887e7c82b	Merge branch 'develop' into features/sso-improvements	2023-02-01 16:08:56 +01:00
Alex Kriuchykhin	e1c4aa9469	Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732)	2023-01-31 11:55:31 +01:00
Oleksii Kriuchykhin	fa96a9a939	Fix date time inventories reminder processing [SCI-7816]	2023-01-30 17:07:27 +01:00
Oleksii Kriuchykhin	6ac64aaf34	Add permission for protocol draft management [SCI-7718]	2023-01-26 15:41:41 +01:00
sboursen-scinote	217561e809	Set the default sotring of inventory items datatable to asc on name [SCI-7562]	2023-01-25 16:11:33 +01:00
Martin Artnik	4e779e70a4	Merge branch 'develop' into features/tiny_mce_6	2023-01-04 14:21:02 +01:00
Alex Kriuchykhin	2ea5000ea5	Merge pull request #4737 from okriuchykhin/ok_SCI_7643 ... Add missing permissions for inventories and protocols [SCI-7643]	2023-01-04 13:22:33 +01:00
Oleksii Kriuchykhin	06f3c34e3a	Add missing permissions for inventories and protocols [SCI-7643]	2022-12-22 16:46:26 +01:00
aignatov-bio	ea661f3c19	Merge branch 'develop' into features/new_experiment_views	2022-12-22 13:33:25 +01:00
Oleksii Kriuchykhin	711dcfc7ac	Update Omniauth, Azure and Okta strategies [SCI-7284]	2022-12-19 16:43:24 +01:00
ajugo	5ab804c35a	Implement general protocol repository toolbar [SCI-7557] (#4698) ... * Implement general protocol repository toolbar [SCI-7557] * Move protocolsio page [SCI-7557]	2022-12-19 13:18:24 +01:00
Martin Artnik	c828d02b99	Merge branch 'develop' into features/tiny_mce_6	2022-12-07 14:07:43 +01:00
Oleksii Kriuchykhin	49fbc2c561	Add basic modal for direct task creation [SCI-7197]	2022-11-18 17:00:11 +01:00
aignatov-bio	0ee586a394	Merge pull request #4439 from rekonder/aj_SCI_7027 ... Session end implementation [SCI-7027]	2022-11-10 11:03:02 +01:00
Oleksii Kriuchykhin	c361dec0b6	Fix Fluics templates sync scheduler [SCI-7435]	2022-11-07 11:55:01 +01:00
Anton	bacd3524e8	Add tags manager to experiment table view [SCI-7368]	2022-11-02 15:17:10 +01:00
ajugo	58bca40632	Change zebra label instructions [SCI-7390] (#4572)	2022-10-25 11:44:50 +02:00
Anton	bc86f11404	Add experiment table view [SCI-7174]	2022-10-21 12:22:38 +02:00
Oleksii Kriuchykhin	f0ea7ea2a4	Add option to disable local password log in [SCI-7298]	2022-10-12 10:30:09 +02:00
ajugo	b7861f5fdb	Add zebra javascript print library [SCI-7245] (#4455)	2022-09-23 12:34:43 +02:00
Andrej	ec77c2a076	Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027	2022-09-16 10:44:07 +02:00
Andrej	ac7c873385	Session end implementation [SCI-7027]	2022-09-16 09:57:40 +02:00
Anton	7ccce8a6d8	Fix merge issues for templates	2022-09-15 13:48:41 +02:00
aignatov-bio	c0339b17be	Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps	2022-09-15 11:25:25 +02:00
Anton	0c596bb701	Merge branch 'develop' into features/label-templates	2022-09-15 10:40:17 +02:00
Anton	d7990cb058	Add new permissions for label templates [SCI-7088]	2022-09-14 15:13:13 +02:00