828 commits

Author	SHA1	Message	Date
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
aignatov-bio	4182194b31	Merge branch 'features/label-templates' into features/team-permissions	2022-09-14 14:34:02 +02:00
Anton	75a15310ac	Merge branch 'features/team-permissions' into features/label-templates	2022-09-13 14:26:15 +02:00
Oleksii Kriuchykhin	d5205843f4	Enable Fluics sync only if env variable is present [SCI-7047]	2022-09-08 17:22:29 +02:00
Oleksii Kriuchykhin	bb6e638528	Add activities for label template actions [SCI-7086]	2022-09-08 16:35:53 +02:00
artoscinote	44b7c866b5	Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) ... * Move tinymce to webpacker and upgrade to v6 [SCI-7081] * Cleanup and refactor [SCI-7081] * Clean up legacy plugins [SCI-7150] * Linter fix [SCI-7081]]	2022-09-05 11:29:19 +02:00
Oleksii Kriuchykhin	f586c73dc8	Convert team_repository to polymorphic relation [SCI-6917]	2022-08-31 16:42:08 +02:00
Anton	d555227652	Add acitvities and flash messages for component duplication [SCI-7108]	2022-08-31 11:09:38 +02:00
Oleksii Kriuchykhin	b2b059b7e1	Add syncing service and schedule for Fluics templates sync [SCI-7047]	2022-08-29 09:59:13 +02:00
Anton	e22af8830a	Add activties to step duplication [SCI-7109]	2022-08-24 13:45:39 +02:00
ajugo	83c78d660f	Added activity for update protocol name [SCI-7095] (#4346) ... * Added activity for update protocol name [SCI-7095] * Fix activity log for updated protocol name [SCI-7095] * Fix activity log for updated protocol name [SCI-7095]	2022-08-11 14:09:01 +02:00
artoscinote	eb619184a5	Implement typed label templates [SCI-7046] (#4316) ... * Implement typed label templates [SCI-7046] * Add structure.sql, fix migration [SCI-7046] * Fix method name [SCI-7046] * Add dependent option to team - label_template relation [SCI-7046] * Migration code style, add input sanitization [SCI-7046] * Fix new label creation [SCI-7046]	2022-08-08 10:06:00 +02:00
aignatov-bio	e5448f3d1f	Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen ... Add general layout for template view screen [SCI-7030]	2022-08-04 14:13:25 +02:00
Anton	a38aa80fb5	Add main functionality to view/edit screen [SCI-7041]	2022-08-04 13:37:21 +02:00
ajugo	b58e3cd4d8	Add zebra settings screen [SCI-7016] (#4310) ... * Add zebra settings screen [SCI-7016] * Fix hound [SCI-7016]	2022-08-04 11:14:35 +02:00
Oleksii Kriuchykhin	da9ad5797c	Make devise session timeout configurable through env variable [SCI-7028]	2022-07-28 17:15:47 +02:00
ajugo	ad4f52d912	Add Label template list screen - view mode [SCI-7018] (#4292) ... * Initial label template datatable [SCI-7018] * Add new columns to LabelTemplate and update datatable view [SCI-7018] * Fix after rebase [SCI-7018] * Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]	2022-07-27 10:10:32 +02:00
artoscinote	3d2e835268	DOCX layout improvements [SCI-6857] (#4160)	2022-07-13 12:52:56 +02:00
Alex Kriuchykhin	26820b9abb	Fix subject references for repository row activities [SCI-6906] (#4203)	2022-07-07 12:00:35 +02:00
Oleksii Kriuchykhin	3fbc5af9a1	Convert team_repository to polymorphic relation [SCI-6917]	2022-06-29 15:22:22 +02:00
artoscinote	ab5cb19d6e	Add step activities, fix checklists [SCI-6852] (#4136) ... * Add step activities, fix checklists [SCI-6852] * Linter fix [SCI-6852]	2022-06-02 11:15:32 +02:00
artoscinote	98d66a3276	Implement reordering activities [SCI-6851] (#4129) ... * Implement reordering activities [SCI-6851] * Added asset activity types [SCI-SCI-6853]	2022-06-01 12:30:09 +02:00
Oleksii Kriuchykhin	c120a357cd	Add permissions for Report model [SCI-6834]	2022-05-24 10:59:21 +02:00
Oleksii Kriuchykhin	39cfcd5522	Add migration for user team roles, including protocols and inventories [SCI-6820]	2022-05-23 16:28:53 +02:00
Oleksii Kriuchykhin	c397616106	Add teams, protocols and inventories specific permission definitions [SCI-6819]	2022-05-16 11:10:19 +02:00
Anton	24d68da455	Fix tinymce assets for steps [SCI-6809]	2022-05-11 13:01:23 +02:00
ajugo	54474b2bba	API GET repository stock column output fix [SCI-6550] (#4030) ... * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550]	2022-04-19 16:05:17 +02:00
aignatov-bio	4a232ac391	Merge pull request #4020 from biosistemika/features/projects-experiments-pagination ... Features/projects experiments pagination	2022-04-14 10:45:27 +02:00
Anton	d091c56e9f	Add pagination for experiments [SCI-6656]	2022-04-12 15:16:02 +02:00
ajugo	0a5e93a018	API: add endpoint for creating stock column [SCI-6550] (#3956) ... * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550]	2022-04-08 14:09:00 +02:00
artoscinote	5effe34221	Add reminder preset to date(time) reminders [SCI-6693] (#3996)	2022-04-07 12:27:21 +02:00
artoscinote	8d25f456d1	Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986)	2022-04-04 12:09:41 +02:00
Martin Artnik	45a325e824	Merge branch 'develop' into features/stock-management	2022-03-30 11:10:40 +02:00
ajugo	5cc97122e5	Viewer role does not see any tasks in archived project [SCI-6616] (#3958) ... * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616]	2022-03-30 11:01:26 +02:00
aignatov-bio	004aeda601	Add stock filters [SCI-6547] (#3938) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-23 10:05:07 +01:00
Anton	8b8e2c6d92	Merge branch 'develop' into features/stock-management	2022-03-14 11:56:38 +01:00
ajugo	959b86b40c	Task inventory activity for assigned item consumption [SCI-6453] (#3830) ... * Add task inventory activity [SCI-6453]	2022-03-09 18:43:38 +01:00
Alex Kriuchykhin	ed8ba13525	Fix advanced search for file type columns [SCI-6518] (#3839)	2022-02-11 10:47:32 +01:00
artoscinote	bc5822de7b	Added error messges for missing search columns/values [SCI-6483] (#3824) ... * Added error messges for missing search columns/values [SCI-6483]	2022-02-11 10:24:29 +01:00
Alex Kriuchykhin	4627d15fc3	Implement import for repository stock values [SCI-6461] (#3818)	2022-02-04 10:29:48 +01:00
artoscinote	cdbf1f5fa0	Implement stock management activities [SCI-6452] (#3810) ... * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452]	2022-02-02 10:33:02 +01:00
Alex Kriuchykhin	3c165996fa	Fix table names in advanced filters configuration [SCI-6467] (#3814)	2022-02-02 10:26:43 +01:00
aignatov-bio	0d6b2ad4b4	Add searchable list for advanced filters [SCI-6466] (#3808) ... Co-authored-by: Anton <anton@scinote.net>	2022-02-01 14:39:04 +01:00
Alex Kriuchykhin	c1972e4fb2	Fix advanced filtering with multiple filters [SCI-6471] (#3807)	2022-01-31 11:10:39 +01:00
aignatov-bio	c8784d1f66	Add advanced filters for date/datetime/time range [SCI-6462] (#3806) ... Co-authored-by: Anton <anton@scinote.net>	2022-01-31 09:21:08 +01:00
Oleksii Kriuchykhin	dd5f8c2793	Add stock management columns to snapshots [SCI-6448]	2022-01-28 13:19:37 +01:00
aignatov-bio	2c88843924	Task stock consumption modal[SCI-6444][SCI-6445] (#3798) ... Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net>	2022-01-28 11:10:56 +01:00
aignatov-bio	371d5f0636	Add current/new amount section to stock [SCI-6416] (#3791) ... Co-authored-by: Anton <anton@scinote.net>	2022-01-26 10:28:43 +01:00
Alex Kriuchykhin	e55c9ec1cc	Merge pull request #3785 from okriuchykhin/ok_SCI_6423 ... Fix filtering for repository snapshots [SCI-6423]	2022-01-25 12:59:46 +01:00
artoscinote	4ede001cf1	Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) ... * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418]	2022-01-25 12:41:16 +01:00
Martin Artnik	abac837cd4	Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters	2022-01-20 13:26:08 +01:00
aignatov-bio	01f1b5bd10	Add stock column type (#3786) ... * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net>	2022-01-18 13:17:05 +01:00
Oleksii Kriuchykhin	34554e57e3	Fix filtering for repository snapshots [SCI-6423]	2022-01-17 21:53:13 +01:00
Oleksii Kriuchykhin	738da6094f	Add advanced filters to repository datatable service [SCI-6210]	2021-12-21 12:38:52 +01:00
Oleksii Kriuchykhin	c56a088ad9	Improve database and Okta config [SCI-6184]	2021-12-13 10:29:28 +01:00
artoscinote	561746158e	Further fix scoping of table styles [SCI-6315] (#3720)	2021-12-06 10:40:08 +01:00
artoscinote	9652362c46	Fix remove user from project notification [SCI-6264] (#3708)	2021-12-01 11:17:07 +01:00
artoscinote	9937d1d913	Add print feature to protocols [SCI-6028] (#3700) ... * Add print feature to protocols [SCI-6028] * Close tab after closing print dialog [SCI-6028] * CSS linter fixes [SCI-6028]	2021-12-01 11:16:45 +01:00
Anton	a44dd8c915	Merge branch 'features/bmt-search' into features/repository-filters	2021-11-22 14:24:28 +01:00
artoscinote	9b06a24288	Added granular task permissions, permission check fixes [SCI-6278] (#3683)	2021-11-19 13:24:57 +01:00
aignatov-bio	c22ff3acc8	Fix technician role permission for results [SCI-6276] (#3681) ... Co-authored-by: Anton <anton@scinote.net>	2021-11-18 15:01:29 +01:00
Oleksii Kriuchykhin	f73f9dd2c1	Fix activities for assigning to experiments and tasks [SCI-6254]	2021-11-11 21:30:30 +01:00
Alex Kriuchykhin	0a8af99368	Merge pull request #3627 from okriuchykhin/ok_SCI_6184 ... Add support of Okta SSO provider [SCI-6184]	2021-11-08 15:01:16 +01:00
artoscinote	3e3e2cc24e	Revert "Implement experiment and task access removal" [SCI-6218] (#3635) ... * Revert "Implement experiment and task access removal [SCI-6156] (#3614)" This reverts commit 2abefd78e6. * Rename assign to module activity to designate to my module [SCI-6218]	2021-11-05 15:44:14 +01:00
aignatov-bio	1ef9ea2cbb	Fix roles permission and helper [SCI-6198][SCI-6181] (#3630) ... Co-authored-by: Anton <anton@scinote.net>	2021-11-04 13:29:34 +01:00
Oleksii Kriuchykhin	47b8347ce6	Add support of Okta SSO provider [SCI-6184]	2021-11-02 16:19:56 +01:00
Oleksii Kriuchykhin	a99599efea	Merge branch 'features/new_permissions' into develop	2021-10-29 15:16:30 +02:00
artoscinote	1bb30b2c49	Also move activities when moving experiment to another project [SCI-6047] (#3535) ... * Also move activities when moving experiment to another project [SCI-6047] * Changed update to update! [SCI-6047]	2021-10-28 16:35:47 +02:00
artoscinote	2abefd78e6	Implement experiment and task access removal [SCI-6156] (#3614)	2021-10-28 16:32:05 +02:00
artoscinote	6f2d883706	Added permissions specs for API, minor changes to permissions [SCI-6152] (#3609)	2021-10-28 14:48:28 +02:00
Alex Kriuchykhin	047f47a46a	Merge pull request #3617 from aignatov-bio/ai-sci-6181-update-permissions-on-task ... Small fixes on task permissions [SCI-6181]	2021-10-28 14:46:57 +02:00
Alex Kriuchykhin	f8e433a0ca	Merge branch 'features/new_permissions' into ok_SCI_6151	2021-10-28 14:31:47 +02:00
aignatov-bio	bc7ee0da75	Fix type in permission name [SCI-6182] (#3616) ... Co-authored-by: Anton <anton@scinote.net>	2021-10-28 13:58:41 +02:00
Alex Kriuchykhin	1bde37db78	Merge branch 'develop' into ok_SCI_5579	2021-10-28 13:26:27 +02:00
Anton	5d517fc2b8	Small fixes on task permissions [SCI-6181]	2021-10-27 11:41:47 +02:00
aignatov-bio	e8e84a7c99	Add tags manage to normal user [SCI-6178] (#3612) ... Co-authored-by: Anton <anton@scinote.net>	2021-10-27 11:39:11 +02:00
Alex Kriuchykhin	f6a30cac6c	Merge pull request #3593 from okriuchykhin/ok_SCI_6134 ... Change Dashboard::RecentWorkService to use new user roles [SCI-6134]	2021-10-26 11:43:54 +02:00
artoscinote	7e96cc1272	Removed ExperimentPermissions::USERS_MANAGE permission for normal user role [SCI-6172] (#3606)	2021-10-22 13:05:31 +02:00
Oleksii Kriuchykhin	2051ea5360	Update the search to abide the permissions [SCI-6151]	2021-10-22 11:43:20 +02:00
Oleksii Kriuchykhin	bc806f0c86	Change Dashboard::RecentWorkService to use new user roles [SCI-6134]	2021-10-13 14:12:24 +02:00
aignatov-bio	d594778fa8	Add project comment manage own permission [SCI-6115] (#3574)	2021-10-04 15:43:50 +02:00
Martin Artnik	6f920f1a3a	Add experiment_read_canvas permission to all predefined roles [SCI-5924]	2021-10-04 11:50:08 +02:00
artoscinote	f68d724202	Rework experiment permissions [SCI-6054] (#3538) ... * Rework experiment permissions [SCI-6054]	2021-09-30 11:32:11 +02:00