9148 commits

Author	SHA1	Message	Date
aignatov-bio	0facc2bda0	Merge pull request #4647 from aignatov-bio/ai-sci-7452-add-archived-view-for-experiment-table ... Add archived view for experiment table [SCI-7452]	2022-11-24 13:24:50 +01:00
Alex Kriuchykhin	3685176ce7	Merge pull request #4645 from okriuchykhin/ok_SCI_7439 ... Update the existing endpoint for listing the users with access to the task [SCI-7439]	2022-11-24 13:15:34 +01:00
Anton	2e2086a03b	Add archived view for experiment table [SCI-7452]	2022-11-24 12:07:52 +01:00
aignatov-bio	c2be99abda	Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout ... Fix time picket CSS [SCI-7359]	2022-11-24 09:44:12 +01:00
ajugo	c44aa2cb9c	Implement session end for multiple tabs [SCI-7502] (#4632)	2022-11-23 20:08:26 +01:00
Oleksii Kriuchykhin	daecd6a766	Update the existing endpoint for listing the users with access to the task [SCI-7439]	2022-11-23 17:20:14 +01:00
artoscinote	5605c3dfed	Merge pull request #4644 from aignatov-bio/ai-sci-7446-experiment-table-task-flyout-menu ... Add menu to experiment table row [SCI-7446]	2022-11-23 16:48:20 +01:00
Anton	440800537c	Add menu to experiment table row [SCI-7446]	2022-11-23 15:05:13 +01:00
Martin Artnik	2959cf6276	Add exposed IDs to recent work [SCI-7206]	2022-11-23 15:03:35 +01:00
aignatov-bio	d1c664e0ab	Merge pull request #4640 from aignatov-bio/ai-sci-7522-fix-session-modal-overlap ... Fix session modal overlap [SCI-7522]	2022-11-23 14:37:53 +01:00
artoscinote	7d53027530	Merge pull request #4641 from G-Chubinidze/gc_SCI_7492 ... Missing navigate away pop up at inventory page [SCI-7492]	2022-11-23 14:14:35 +01:00
Giga Chubinidze	f78cf58552	pointer events value change	2022-11-23 17:12:25 +04:00
Anton	007aeaa2b6	Fix session modal overlap [SCI-7522]	2022-11-23 13:21:28 +01:00
Giga Chubinidze	dac093823e	few double quotes changed to single quotes	2022-11-23 16:08:43 +04:00
Giga Chubinidze	3b8a58b7db	fixed code according to hound styling comments	2022-11-23 16:05:56 +04:00
ajugo	5b291acc27	Fix smart annotation [SCI-7498] (#4626)	2022-11-23 12:58:32 +01:00
Giga Chubinidze	47d593f0db	Missing navigate away pop up at inventory page [SCI-7492]	2022-11-23 15:38:01 +04:00
aignatov-bio	d6b5034db9	Merge pull request #4634 from aignatov-bio/ai-sci-7472-fix-tooltip-on-new-button-in-inventory ... Fix tooltip on new button in inventory [SCI-7472]	2022-11-23 12:05:24 +01:00
Martin Artnik	c21152b2e2	Add protocol ID to linked protocol dropdown [SCI-7204]	2022-11-23 11:49:53 +01:00
aignatov-bio	176f3c48e1	Merge pull request #4637 from aignatov-bio/ai-sci-7233-fix-show-password-for-edit-settings ... Fix show password for edit settings [SCI-7233]	2022-11-22 16:23:36 +01:00
Anton	7079072eb8	Fix show password for edit settings [SCI-7233]	2022-11-22 16:06:47 +01:00
Anton	e940bf8c0e	Small canvas edit mode changes [SCI-7387]	2022-11-22 13:08:56 +01:00
G-Chubinidze	415443a108	Merge pull request #4633 from G-Chubinidze/gc_SCI_7179 ... add IDs to the protocol templates tables [SCI-7179]	2022-11-22 14:50:57 +04:00
Anton	98e87a2f4b	Fix markup [SCI-7359]	2022-11-22 11:29:57 +01:00
Alex Kriuchykhin	b7664ad70f	Merge pull request #4621 from scinote-eln/release/1.26.2.1 ... Release/1.26.2.1	2022-11-22 11:07:20 +01:00
Anton	961b39159e	Fix tooltip on new button in inventory [SCI-7472]	2022-11-22 11:05:57 +01:00
Alex Kriuchykhin	dd54a30e13	Merge pull request #4601 from rekonder/aj_SCI_7376 ... Enable checkboxes for experiment table/card view for all roles [SCI-7376]	2022-11-22 10:57:34 +01:00
Alex Kriuchykhin	d6728ef9d3	Merge pull request #4597 from rekonder/aj_SCI_7361 ... Fixed external protocol icon out of body [SCI-7361]	2022-11-22 10:56:55 +01:00
Alex Kriuchykhin	b487894c9d	Merge pull request #4596 from aignatov-bio/ai-sci-7389-fix-protocol-import-error ... fix protocol import error [SCI-7389]	2022-11-22 10:56:10 +01:00
Giga Chubinidze	43f8370a08	add IDs to the protocol templates tables [SCI-7179]	2022-11-22 13:55:41 +04:00
Alex Kriuchykhin	dc9831d3bc	Merge pull request #4568 from rekonder/aj_SCI_7181 ... Remove old step code [SCI-7181]	2022-11-22 10:52:06 +01:00
ajugo	f2a680d826	Fix zebra printer print status [SCI-7474] (#4625)	2022-11-21 16:55:03 +01:00
artoscinote	92d446b43d	Merge pull request #4628 from artoscinote/ma_SCI_7473 ... Fix inventory multiline file uploads [SCI-7473]	2022-11-21 12:59:40 +01:00
Martin Artnik	5d41ea5fa7	Disable instead of hide edit button when selected items not on page [SCI-7460]	2022-11-21 11:58:15 +01:00
Martin Artnik	95348b82e8	Fix inventory multiline file uploads [SCI-7473]	2022-11-21 11:47:46 +01:00
Alex Kriuchykhin	d9897d6e7c	Merge pull request #4624 from okriuchykhin/ok_SCI_7457 ... Fix protocol owner re-assignment when removing a user from a team [SCI-7457]	2022-11-21 11:03:50 +01:00
Oleksii Kriuchykhin	49fbc2c561	Add basic modal for direct task creation [SCI-7197]	2022-11-18 17:00:11 +01:00
Oleksii Kriuchykhin	69812786ba	Fix protocol owner re-assignment when removing a user from a team [SCI-7457]	2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin	66f9f13508	Implement current team switch when navigating to tasks and experiments from another team [SCI-7447]	2022-11-18 11:48:49 +01:00
Giga Chubinidze	44d74b5797	refactoring projects scss	2022-11-17 22:29:15 +04:00
Giga Chubinidze	7f09fb8997	Archived projects cards and table updates [SCI-7201]	2022-11-17 22:25:54 +04:00
Anton	85c00c61e0	Add table columns display modal to experiment table [SCI-7441]	2022-11-16 09:54:12 +01:00
Anton	7523535e24	Add archive action to experiment table [SCI-7384]	2022-11-14 11:31:53 +01:00
ajugo	42af732073	Fix zebra printer switch and optimize zebra library loading [SCI-7430] (#4612) ... * Fix zebra printer switch and optimize zebra library loading [SCI-7430] * Fix zebra enabled [SCI-7430]	2022-11-14 10:43:09 +01:00
ajugo	4e77174e52	Fix vue print modal component initialization [SCI-7469] (#4616)	2022-11-14 10:42:51 +01:00
Anton	51446b130f	Add experiment table manage access [SCI-7385]	2022-11-13 22:33:41 +01:00
Anton	0a87513458	Add edit modal to experiment table [SCI-7383]	2022-11-11 11:24:23 +01:00
Giga Chubinidze	e9d9f613fb	updated old code version in empty_index	2022-11-11 14:22:26 +04:00
G-Chubinidze	e3b9314646	Update my_modules.scss	2022-11-11 12:48:22 +04:00
Giga Chubinidze	5a429549da	archived tasks updates [SCI-7203]	2022-11-11 12:45:07 +04:00
aignatov-bio	c5466771ff	Merge pull request #4609 from aignatov-bio/ai-sci-7471-fix-merge-issue ... Fix merge issue [SCI-7471]	2022-11-10 11:47:54 +01:00
Anton	c0141137eb	Fix merge issue [SCI-7471]	2022-11-10 11:46:14 +01:00
aignatov-bio	4b6ab3bd25	Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms ... Fix css issues for login and signup forms [SCI-7233]	2022-11-10 11:15:03 +01:00
aignatov-bio	a72795ec98	Merge pull request #4586 from aignatov-bio/ai-sci-7387-fix-options-dropdown-position-on-step ... Fix options dropdown position on step [SCI-7387]	2022-11-10 11:12:28 +01:00
aignatov-bio	2c17c05c7d	Merge pull request #4260 from artoscinote/ma_SCI_6982 ... Implement multiline editing in repositories [SCI-6982][SCI-6983]	2022-11-10 11:07:30 +01:00
artoscinote	0994c4a25b	Merge branch 'develop' into ma_SCI_6982	2022-11-10 11:04:57 +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
Anton	63ce422367	Add basic filters for experiment table [SCI-7215]	2022-11-09 15:27:39 +01:00
G-Chubinidze	8e63bfb7c2	Update my_module.rb	2022-11-09 14:46:36 +04:00
G-Chubinidze	996cb68fdd	Update my_module.rb	2022-11-09 14:45:18 +04:00
G-Chubinidze	62b48ee59a	updated my_module rb, added searchable id attribute	2022-11-09 13:36:55 +04:00
Anton	a17cd78c20	Add view dropdown to experiment screen	2022-11-08 16:39:52 +01:00
Miha Mencin	c8bd5513cf	Merge pull request #4604 from okriuchykhin/ok_SCI_7434 ... Fix team export/import [SCI-7434]	2022-11-08 16:02:11 +01:00
Oleksii Kriuchykhin	be7ef8fdc0	Fix team export/import [SCI-7434]	2022-11-08 14:50:16 +01:00
Giga Chubinidze	18fe2cd207	update display of the current tasks with IDs [SCI-7205]	2022-11-08 16:06:48 +04:00
Anton	7ceb94ab1f	Add toolbar to experiment table [SCI-7379]	2022-11-08 12:52:49 +01:00
Oleksii Kriuchykhin	82d4b03cf6	Fix global activities user selection dropdown [SCI-7402]	2022-11-07 21:58:06 +01:00
Andrej	aa99c2d7c8	Enable checboxes for experiment table/card view for all roles [SCI-7376]	2022-11-07 15:51:39 +01:00
ajugo	dd22d53bda	Implemented pagination for experiment table [SCI-7214] (#4591) ... * Implement pagination for experiment table [SCI-7214] * Fix table experiment pagination [SCI-7214] * Move pagination to service [SCI-7214]	2022-11-07 11:46:54 +01:00
Andrej	a88d41ca6a	Fixed external protocol icon out of body [SCI-7361]	2022-11-07 11:03:34 +01:00
Anton	22c682c58b	fix protocol import error [SCI-7389]	2022-11-04 11:49:05 +01:00
Anton	b3bd165d01	Fix time picket CSS [SCI-7359]	2022-11-04 11:36:21 +01:00
Anton	5b08ee1cc8	Hide active reminders, if stock management disabled [SCI-7428]	2022-11-03 15:48:32 +01:00
Anton	bacd3524e8	Add tags manager to experiment table view [SCI-7368]	2022-11-02 15:17:10 +01:00
Giga Chubinidze	a8b1dbfe76	archived experiments cards updates [SCI-7202]	2022-11-02 11:18:18 +04:00
Giga Chubinidze	d1aa127b7a	Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176	2022-10-28 15:30:28 +04:00
Giga Chubinidze	a9287df1a0	exposed experiment ids on card view page / other styling updates [SCI-7176]	2022-10-28 15:16:49 +04:00
G-Chubinidze	81c5978805	Merge branch 'features/exposed_ids' into gc_SCI_7172	2022-10-28 15:05:38 +04:00
Giga Chubinidze	fe488ed00f	fixed unstable project name and code styling in cards	2022-10-28 11:38:38 +04:00
Giga Chubinidze	b1296adeb3	pitstop	2022-10-28 10:49:13 +04:00
ajugo	29ce28a1af	Implement canvas view navigator [SCI-7198] (#4577)	2022-10-27 14:43:31 +02:00
ajugo	bdf56ea2a1	Add comments to the experiment table view [SCI-7217] (#4583)	2022-10-27 14:41:35 +02:00
Anton	eddd5b7476	Fix options dropdown position on step [SCI-7387]	2022-10-27 12:42:54 +02:00
Anton	c2338d677d	Fix label preview height in print modal [SCI-7410]	2022-10-27 12:13:25 +02:00
ajugo	fedaf703d4	Add view button to experiment title bar [SCI-7216] (#4579)	2022-10-27 09:53:01 +02:00
ajugo	449283b4f5	Show only active result in experiment table view [SCI-7369] (#4578)	2022-10-27 09:52:20 +02:00
Oleksii Kriuchykhin	c16d0cb7a6	Fix update of shared inventories user assignments [SCI-7360]	2022-10-25 23:26:20 +02:00
Alex Kriuchykhin	d0f604f21e	Merge pull request #4576 from okriuchykhin/ok_SCI_7375 ... Fix displaying of user access for E/T [SCI-7375]	2022-10-25 16:14:51 +02:00
Oleksii Kriuchykhin	232f58dd30	Fix displaying of user access for E/T [SCI-7375]	2022-10-25 16:07:55 +02:00
artoscinote	938f2ce63b	Merge pull request #4573 from artoscinote/ma_SCI_7377 ... Add ENV setting for max step text length [SCI-7377]	2022-10-25 16:04:36 +02:00
artoscinote	78b3975759	Merge pull request #4575 from artoscinote/ma_SCI_7396 ... Fix label preview double refresh and unit issues [SCI-7396]	2022-10-25 15:55:57 +02:00
Martin Artnik	31b075ea8c	Fix label preview double refresh and unit issues [SCI-7396]	2022-10-25 15:54:05 +02:00
Martin Artnik	ebe0ffa286	Add ENV setting for max step text length [SCI-7377]	2022-10-25 13:08:33 +02:00
ajugo	ea75eefd88	Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574)	2022-10-25 13:07:45 +02:00
artoscinote	eec5fd9ab3	Merge pull request #4570 from artoscinote/ma_SCI_7357 ... Only render last label in ZPL [SCI-7357]	2022-10-25 11:53:52 +02:00
ajugo	58bca40632	Change zebra label instructions [SCI-7390] (#4572)	2022-10-25 11:44:50 +02:00
Martin Artnik	7f384f1964	Only render last label in ZPL [SCI-7357]	2022-10-24 15:50:10 +02:00
Anton	8feaedc0d1	Add core columns to experiment table [SCI-7212]	2022-10-24 15:27:57 +02:00
Andrej	09a1adb194	Fix hound [SCI-7181]	2022-10-24 13:12:28 +02:00
Andrej	745be5a0f7	Remove old step code [SCI-7181]	2022-10-24 13:07:10 +02:00
Alex Kriuchykhin	60dc26a42b	Merge pull request #4567 from okriuchykhin/ok_SCI_7375 ... Fix display of user access for experiments and tasks [SCI-7375]	2022-10-24 13:05:02 +02:00
Oleksii Kriuchykhin	09440d4f83	Fix display of user access for experiments and tasks [SCI-7375]	2022-10-24 12:57:08 +02:00
Oleksii Kriuchykhin	d38556e3fa	Fix repository permissions helper [SCI-7360]	2022-10-21 14:51:16 +02:00
Alex Kriuchykhin	3bc3036b58	Merge pull request #4563 from okriuchykhin/ok_SCI_7360_v2 ... Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]	2022-10-21 14:36:52 +02:00
Alex Kriuchykhin	23a8f8fc07	Merge pull request #4561 from okriuchykhin/ok_SCI_7363 ... Fix task access display modal [SCI-7363]	2022-10-21 14:29:28 +02:00
Oleksii Kriuchykhin	a9e7e81e51	Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]	2022-10-21 14:04:33 +02:00
Alex Kriuchykhin	2ddb6d8685	Merge pull request #4558 from rekonder/aj_SCI_7373 ... Fix permission on experiment open for org admins [SCI-7373]	2022-10-21 13:48:28 +02:00
Alex Kriuchykhin	207b8311af	Merge pull request #4559 from aignatov-bio/ai-sci-7374-fix-protocol-creation-from-dashboard ... Fix protocol creation from dashboard [SCI-7374]	2022-10-21 13:47:33 +02:00
Oleksii Kriuchykhin	8dfedfe165	Fix task access display modal [SCI-7363]	2022-10-21 13:33:22 +02:00
Anton	bc86f11404	Add experiment table view [SCI-7174]	2022-10-21 12:22:38 +02:00
Anton	05902d485b	Fix protocol creation from dashboard [SCI-7374]	2022-10-21 11:40:50 +02:00
Andrej	140dc8c768	Fix permission on experiment open for org admins [SCI-7373]	2022-10-21 11:25:54 +02:00
Oleksii Kriuchykhin	7d3f48199a	Fix shared repositories migration, update sharing logic and permissions [SCI-7360]	2022-10-21 11:00:52 +02:00
Alex Kriuchykhin	1799361944	Merge pull request #4555 from okriuchykhin/ok_SCI_7366 ... Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]	2022-10-21 10:35:10 +02:00
Oleksii Kriuchykhin	94978ea2ea	Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]	2022-10-20 16:19:02 +02:00
Anton	ac0fe4389d	Fix label preview in print modal [SCI-7367]	2022-10-20 10:57:40 +02:00
Alex Kriuchykhin	a55390898a	Merge pull request #4553 from okriuchykhin/ok_SCI_7348_v2 ... Fix protocol permission propagation [SCI-7348]	2022-10-20 09:24:44 +02:00
ajugo	3a0eec7043	Fix button shrink for inventory toolbar [SCI-7252] (#4551)	2022-10-19 18:09:59 +02:00
Oleksii Kriuchykhin	5ba6fe08d6	Fix protocol permission propagation [SCI-7348]	2022-10-19 17:26:13 +02:00
ajugo	0a56d772b7	Move print button for shared repository in view mode [SCI-7277] (#4550)	2022-10-19 14:10:04 +02:00
ajugo	9639e30c72	Generate correct format for create at at print time [SCI-7351] (#4547)	2022-10-19 13:18:52 +02:00
ajugo	98c32fda78	Fix label preview for custom repository columns [SCI-7358] (#4549)	2022-10-19 13:18:33 +02:00
Anton	2ae8943d80	Update general canvas layout [SCI-7196]	2022-10-19 11:46:16 +02:00
aignatov-bio	822a4f87c7	Merge pull request #4548 from aignatov-bio/ai-sci-7350-replace-label-template-promo-logo ... Replace label template promo logo [SCI-7350]	2022-10-19 11:44:06 +02:00
Anton	1062fbc2fd	Replace label template promo logo [SCI-7350]	2022-10-19 11:25:49 +02:00
Anton	c6e5fba21c	Fix file name in attachment delete modal [SCI-7356]	2022-10-19 11:12:27 +02:00
Alex Kriuchykhin	482044a448	Merge pull request #4542 from rekonder/aj_SCI_7346 ... Update default density for label templates [SCI-7346]	2022-10-19 10:04:53 +02:00
Anton	689c34e54d	Fix css issues for login and signup forms [SCI-7233]	2022-10-18 11:54:10 +02:00
aignatov-bio	83c3699493	Merge pull request #4539 from aignatov-bio/ai-sci-7340-save-label-dimenssions-on-preview-button ... Save dimensions on refresh label template preview [SCI-7340]	2022-10-18 11:26:36 +02:00
ajugo	fab625d819	Set correct permission for repository on team role change [SCI-7341] (#4540)	2022-10-18 10:43:51 +02:00
ajugo	64975effc6	Close print label modal at print click [SCI-7327] (#4526)	2022-10-18 10:42:50 +02:00
Andrej	538f141aaf	Change default density for label templates [SCI-7346]	2022-10-18 09:41:25 +02:00
Anton	bb354f2dbc	Save dimensions on refresh label template preview [SCI-7340]	2022-10-17 12:25:08 +02:00
Anton	91c46e2005	Fix copy experiment only to active projects [SCI-7345]	2022-10-17 11:08:59 +02:00
Alex Kriuchykhin	6abfc8d293	Merge pull request #4527 from rekonder/aj_SCI_7326 ... Move loading label print modal for task [SCI-7326]	2022-10-17 10:21:51 +02:00
Alex Kriuchykhin	4cee224180	Merge pull request #4534 from okriuchykhin/ok_SCI_7338 ... Fix user role selection when inviting new users [SCI-7338]	2022-10-17 10:21:37 +02:00
Alex Kriuchykhin	63a1b35a45	Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2 ... Unify tags loading order [SCI-6943]	2022-10-17 10:21:13 +02:00
Alex Kriuchykhin	d12cdb8a9a	Merge pull request #4530 from okriuchykhin/ok_SCI_7297_v2 ... Fix display of a creator in the reports table [SCI-7297]	2022-10-17 10:18:09 +02:00
Alex Kriuchykhin	15813166fe	Merge pull request #4537 from okriuchykhin/ok_SCI_7343 ... Allow team owners to manage project users [SCI-7343]	2022-10-17 10:16:50 +02:00
Alex Kriuchykhin	eba3fc574b	Merge pull request #4536 from okriuchykhin/ok_SCI_7330 ... Fix permission checking in reports controller [SCI-7330][SCI-7331]	2022-10-17 10:16:15 +02:00
Alex Kriuchykhin	51da8edacc	Merge pull request #4533 from okriuchykhin/ok_SCI_7336 ... Fix project users assignment to newly created experiments [SCI-7336]	2022-10-17 10:15:44 +02:00
Alex Kriuchykhin	15af00934b	Merge pull request #4535 from rekonder/aj_SCI_7322 ... Implemented label preview options for the Viewer role [SCI-7322]	2022-10-17 09:35:47 +02:00
Oleksii Kriuchykhin	bded75ac2c	Allow team owners to manage project users [SCI-7343]	2022-10-14 15:51:37 +02:00
Alex Kriuchykhin	ec81234ec5	Merge pull request #4531 from rekonder/aj_SCI_7305 ... Remove old label printer modal code [SCI-7305]	2022-10-14 14:44:02 +02:00
Oleksii Kriuchykhin	8e838fe09f	Fix permission checking in reports controller [SCI-7330][SCI-7331]	2022-10-14 14:26:02 +02:00
Andrej	16b4a89fb8	Disable label preview options for Viewer role [SCI-7322]	2022-10-14 11:49:31 +02:00
Oleksii Kriuchykhin	a5336608f8	Fix user role selection when inviting new users [SCI-7338]	2022-10-14 11:35:35 +02:00
Alex Kriuchykhin	c725e1f100	Merge pull request #4521 from okriuchykhin/ok_SCI_7325 ... Fix protocol import in templates [SCI-7325]	2022-10-14 11:19:29 +02:00
Oleksii Kriuchykhin	a3b8f98b24	Fix project users assignment to newly created experiments [SCI-7336]	2022-10-14 10:23:57 +02:00
Giga Chubinidze	62febd44dd	centered project code for tables	2022-10-13 20:31:37 +04:00
Giga Chubinidze	94e28ecc8d	fixed switching from cards to list	2022-10-13 19:22:41 +04:00
Andrej	f3fdcc1204	Remove old label printer modal code [SCI-7305]	2022-10-13 16:49:06 +02:00
Oleksii Kriuchykhin	68fab55328	Fix display of a creator in the reports table [SCI-7297]	2022-10-13 14:55:24 +02:00
Oleksii Kriuchykhin	e43aa30193	Unify tags loading order [SCI-6943]	2022-10-13 13:55:36 +02:00
Andrej	5752401a29	Move loading label print modal on task [SCI-7326]	2022-10-13 13:16:18 +02:00
ajugo	58acb94977	Remove status from print label modal [SCI-7328] (#4524)	2022-10-12 16:56:58 +02:00
Oleksii Kriuchykhin	1bd3a7e783	Fix protocol import in templates [SCI-7325]	2022-10-12 14:27:21 +02:00
Alex Kriuchykhin	1e6c6da964	Merge pull request #4517 from okriuchykhin/ok_SCI_7298 ... Add option to disable local password log in [SCI-7298]	2022-10-12 12:54:34 +02:00
Alex Kriuchykhin	827567c167	Merge pull request #4515 from rekonder/aj_SCI_7314 ... Fixed the existing templates [SCI-7314]	2022-10-12 11:49:09 +02:00
Martin Artnik	b67bea81b8	Remove legacy protocol links [SCI-7323]	2022-10-12 11:01:16 +02:00
Oleksii Kriuchykhin	f0ea7ea2a4	Add option to disable local password log in [SCI-7298]	2022-10-12 10:30:09 +02:00
Andrej	230aea15fc	Update experiment templates [SCI-7314]	2022-10-11 15:55:56 +02:00
ajugo	e96ccdb1d5	Fix start date on locked task and correct format of number [SCI-7098] (#4366)	2022-10-11 11:31:53 +02:00
Alex Kriuchykhin	99ffbf47ab	Merge pull request #4512 from okriuchykhin/ok_SCI_7297 ... Fix report creation permission check [SCI-7297]	2022-10-11 11:01:31 +02:00
ajugo	0493d6f31d	Fix label template preview issues [SCI-7313] (#4514) ... * Add preview label at open modal [SCI-7313] * Add density and unit to the label template [SCI-7313]	2022-10-11 10:58:37 +02:00
Alex Kriuchykhin	4c9f96f7f7	Merge pull request #4510 from okriuchykhin/ok_SCI_7292 ... Add logic for user role updates for team child objects [SCI-7292]	2022-10-11 10:49:08 +02:00
Oleksii Kriuchykhin	f68e85532c	Fix report creation permission check [SCI-7297]	2022-10-10 16:16:54 +02:00
Alex Kriuchykhin	3592faea78	Merge pull request #4511 from okriuchykhin/ok_SCI_7230 ... Fix filtering by user role for teams table [SCI-7320]	2022-10-10 16:07:34 +02:00
Alex Kriuchykhin	4ac46f876a	Merge pull request #4509 from rekonder/aj_SCI_7315 ... Fix selected printer for printing [SCI-7315]	2022-10-10 15:59:29 +02:00
Alex Kriuchykhin	3a9b568358	Merge pull request #4508 from rekonder/aj_SCI_7318 ... Fix view permission at label template table [SCI-7318]	2022-10-10 15:59:02 +02:00
Oleksii Kriuchykhin	a88e936693	Fix filtering by user role for teams table [SCI-7230]	2022-10-10 15:48:38 +02:00
Oleksii Kriuchykhin	9322052f9d	Add logic for user role updates for team child objects [SCI-7292]	2022-10-10 15:27:42 +02:00
Andrej	5d6b454756	Fix selected printer for printing [SCI-7315]	2022-10-10 13:33:35 +02:00
Andrej	42193bbe81	Fix view permission at label template table [SCI-7318]	2022-10-07 17:16:40 +02:00
Giga Chubinidze	f7472d25b9	more styling fixes	2022-10-07 17:14:43 +04:00
Alex Kriuchykhin	5158b3e155	Merge pull request #4505 from okriuchykhin/ok_SCI_7308 ... Fix user invitation modal [SCI-7308]	2022-10-07 14:53:34 +02:00
Alex Kriuchykhin	4d529cfcb5	Merge pull request #4499 from okriuchykhin/ok_SCI_7291 ... Update teams table with new user assignments system [SCI-7291]	2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin	0e95b7ea66	Connect update fluics template button with controller action [SCI-7261]	2022-10-07 14:52:23 +02:00
Giga Chubinidze	3f3c2a3504	project name card size change	2022-10-07 15:27:33 +04:00
G-Chubinidze	47e4244d9e	Update _manage_due_date_modal.html.erb	2022-10-07 14:38:59 +04:00
Giga Chubinidze	8b5ff3955b	fixed can not set due date on task card issue [SCI-7251]	2022-10-07 14:14:29 +04:00
Oleksii Kriuchykhin	173e3b09cd	Fix user invitation modal [SCI-7308]	2022-10-06 17:55:51 +02:00
Alex Kriuchykhin	07d470b2ff	Merge pull request #4479 from okriuchykhin/ok_SCI_7271 ... Fix label printing status modal [SCI-7271]	2022-10-06 15:46:36 +02:00
Alex Kriuchykhin	0f394b34ce	Merge pull request #4495 from okriuchykhin/ok_SCI_7289 ... Fix search in team members table [SCI-7289]	2022-10-06 15:46:03 +02:00
Alex Kriuchykhin	9152cee31f	Merge pull request #4496 from okriuchykhin/ok_SCI_7290 ... Fix user role loading for Team in permission checking concern [SCI-7290]	2022-10-06 15:45:48 +02:00
Alex Kriuchykhin	d648492bad	Merge pull request #4500 from okriuchykhin/ok_SCI_7293 ... Fix project visibility for team admins [SCI-7293]	2022-10-06 15:45:29 +02:00
Alex Kriuchykhin	5ab361123e	Merge pull request #4501 from okriuchykhin/ok_SCI_7295 ... Assign user to public projects after adding to a team [SCI-7295]	2022-10-06 15:45:17 +02:00
artoscinote	77b91b467a	Merge pull request #4485 from rekonder/aj_SCI_7270 ... Add label printer modal to task [SCI-7270][7296]	2022-10-06 15:01:31 +02:00
ajugo	5f38464369	Fix open label template in new tab [SCI-7302] (#4503)	2022-10-06 14:57:45 +02:00
Andrej	16a7dd261f	Add name to zebra printer initialization [SCI-7312]	2022-10-06 14:52:15 +02:00
ajugo	88d9ece237	Fix zebra printer library load [SCI-7310] (#4502)	2022-10-06 13:52:49 +02:00
ajugo	f87b42d042	Remove icon from the status repository column at label print time [SCI-7267] (#4471) ... * Remove icon from the status repository column at label print time [SCI-7267] * Fix status repository column at label print time [SCI-7267] * Fix status repository column at label print time [SCI-7267]	2022-10-06 11:53:12 +02:00
ajugo	eef93c42d8	Disable print modal button for offline printer statuses [SCI-7276] (#4493) ... * Disable print modal button for offline printer statuses [SCI-7276] * Disable print modal button for offline printer statuses [SCI-7276]	2022-10-06 11:19:51 +02:00
aignatov-bio	bd535dc9ad	Add dimension saving to label templates [SCI-7268] (#4489)	2022-10-06 11:09:10 +02:00
Alex Kriuchykhin	ae8f5526be	Merge pull request #4490 from aignatov-bio/ai-sci-7287-fix-validation-on-print-modal ... Fix validation on print modal [SCI-7287]	2022-10-06 10:42:36 +02:00
Oleksii Kriuchykhin	9a05bf04bd	Assign user to public projects after adding to a team [SCI-7295]	2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin	b87ed7db8e	Fix project visibility for team admins [SCI-7293]	2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin	0a8ebef095	Update teams table with new user assignments system [SCI-7291]	2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin	cf34ddcbd1	Fix user role loading for Team in permission checking concern [SCI-7290]	2022-10-04 13:53:45 +02:00
ajugo	7fbac92f9c	Add status for Zebra printers in label print modal [SCI-7269] (#4492)	2022-10-04 09:57:47 +02:00
Andrej	884fe58525	Fix label print open issue [SCI-7296]	2022-10-03 17:33:42 +02:00
Oleksii Kriuchykhin	830248ada9	Fix search in team members table [SCI-7289]	2022-10-03 16:56:15 +02:00
Andrej	e05ad97498	Enable label print modal for smart annotations [SCI-7270]	2022-10-03 13:39:18 +02:00
Oleksii Kriuchykhin	b20c2b13a3	Fix label printers dropdown on print modal [SCI-7258]	2022-10-03 10:37:04 +02:00
aignatov-bio	aba760f1a4	Merge pull request #4486 from aignatov-bio/ai-sci-7285-fix-duplicate-label-in-dropdown-component ... Fix duplicate labels in dropdown components [SCI-7285]	2022-09-30 19:51:34 +02:00
Anton	85248a0426	Fix validation on print modal [SCI-7287]	2022-09-30 19:48:13 +02:00
artoscinote	b65422b74d	Merge pull request #4488 from artoscinote/ma_SCI_7288 ... Add extension to icon image path, to fix it in production [SCI-7288]	2022-09-30 14:31:43 +02:00
Martin Artnik	846690401d	Add extension to icon image path, to fix it in production [SCI-7288]	2022-09-30 14:26:32 +02:00
aignatov-bio	13f24cac08	Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates ... CSS fixes for label templates [SCI-7262]	2022-09-30 09:47:39 +02:00
Anton	0107368b67	Fix duplicate labels in dropdown components [SCI-7285]	2022-09-29 21:11:00 +02:00
aignatov-bio	096c285235	Merge pull request #4484 from aignatov-bio/ai-sci-7265-fix-css-label-templates-table-view ... Fix css label templates table view [SCI-7265]	2022-09-29 20:58:51 +02:00
Andrej	e8528e6120	Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270	2022-09-29 16:36:44 +02:00
Andrej	eebdee5129	Add label printer modal to task [SCI-7270]	2022-09-29 16:35:51 +02:00
ajugo	103bdff654	Select default label template based on selected pritner type [SCI-7268][7257] (#4475)	2022-09-29 14:47:59 +02:00
ajugo	69bc48fef8	Add cancel button and fix number input [SCI-7274] (#4478)	2022-09-29 14:45:10 +02:00
Anton	9d9f6e26bb	Fix css label templates table view [SCI-7265]	2022-09-29 14:29:25 +02:00
Anton	9dc667f8e1	CSS fixes for label templates [SCI-7262]	2022-09-29 14:09:16 +02:00
aignatov-bio	d9dc76c0f9	Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template ... Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]	2022-09-29 13:56:39 +02:00
artoscinote	d08838bf48	Merge branch 'develop' into master_1_26_0_5	2022-09-29 10:12:29 +02:00
Oleksii Kriuchykhin	ac11d41359	Fix label printing status modal [SCI-7271]	2022-09-28 17:01:07 +02:00
Anton	7e06f29a75	Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]	2022-09-28 11:34:24 +02:00
aignatov-bio	31554d0fd9	Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal ... Add label validation and preview in print modal [SCI-7255][SCI-7256]	2022-09-28 11:32:39 +02:00
ajugo	0e8ad6abf1	Implement toggle for zebra printers searching feature [SCI-7242] (#4470)	2022-09-27 15:57:23 +02:00
Anton	3773fff093	Add label validation and preview in print modal [SCI-7255][SCI-7256]	2022-09-27 15:46:48 +02:00
Anton	d22ec4960d	Add loading label to settings printers search [SCI-7253]	2022-09-27 12:02:50 +02:00
Alex Kriuchykhin	db0a5ede84	Merge pull request #4462 from okriuchykhin/ok_SCI_7240 ... Fix user adding/removing from a team [SCI-7240]	2022-09-27 10:30:35 +02:00
Alex Kriuchykhin	0c41ee9dec	Merge pull request #4466 from okriuchykhin/ok_SCI_7263 ... Fix sorting in label templates datatable [SCI-7263]	2022-09-27 10:30:08 +02:00
Giga Chubinidze	8608e61513	fixed duplicate titles in empty index repositories [SCI-7162]	2022-09-27 12:25:39 +04:00
ajugo	aa10259d40	Fix loading of zebra printers to modal and some other small fixes [SCI-7244] (#4463) ... * Fix loading of zebra printers to modal and some other small fixes [SCI-7244] * Fix zebra printing [SCI-7244]	2022-09-27 09:58:22 +02:00
Oleksii Kriuchykhin	0d656f8976	Fix sorting in label templates datatable [SCI-7263]	2022-09-26 22:21:45 +02:00
Anton	dbfc3b2e2a	Fix column label template format [SCI-7236]	2022-09-26 21:01:31 +02:00
Oleksii Kriuchykhin	b675fb14eb	Fix user adding/removing from a team [SCI-7240]	2022-09-26 12:14:03 +02:00
Alex Kriuchykhin	fcd235b654	Merge pull request #4457 from okriuchykhin/ok_SCI_7241 ... Improve error handling in label template preview generation [SCI-7241]	2022-09-26 10:33:30 +02:00
aignatov-bio	e96b15b241	Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen ... Update fluics view and permissions for label templates [SCI-7222]	2022-09-26 10:22:01 +02:00
ajugo	8c2f7da87f	Escape underscores when sending ZPL to render service [SCI-7223] (#4456)	2022-09-26 10:21:12 +02:00
Anton	d3886c9bf7	Small fixes [SCI-7193]	2022-09-26 10:02:41 +02:00
Anton	40022a7012	Add initial VUE container for print dialog [SCI-7193]	2022-09-23 14:07:52 +02:00
aignatov-bio	bc1683dc40	Merge pull request #4459 from rekonder/aj_SCI_7250 ... Fix archived task button [SCI-7250]	2022-09-23 13:50:09 +02:00
aignatov-bio	94044d020d	Merge pull request #4458 from aignatov-bio/ai-sci-7239-fix-checkboxes-safari ... Fix checkbox in safari [SCI-7239]	2022-09-23 12:50:39 +02:00
Andrej	c60ca19c62	Fix archived task button [SCI-7250]	2022-09-23 12:42:17 +02:00
Anton	4e32707245	Fix dupicate protocols in activities search [SCI-7171]	2022-09-23 12:38:44 +02:00
ajugo	b7861f5fdb	Add zebra javascript print library [SCI-7245] (#4455)	2022-09-23 12:34:43 +02:00
Oleksii Kriuchykhin	1d7bca0664	Improve error handling in label template preview generation [SCI-7241]	2022-09-22 15:24:30 +02:00
ajugo	a3ea6e608c	Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448) ... * Add validation to print modal [SCI-7052] * Fix dropdown on label modal print [SCI-7052] * Fix hound [SCI-7052] * Rename validation endpoint [SCI-7052] * Add zpl label printing and fix fluics printing [SCI-7221] * Fix hound [SCI-7221]	2022-09-22 15:06:36 +02:00
Anton	9bc4610cae	Fix checkbox in safari [SCI-7239]	2022-09-22 11:24:02 +02:00
artoscinote	e0e592338c	Merge pull request #4440 from artoscinote/ma_SCI_7219 ... Migration fixes [SCI-7219]	2022-09-21 13:45:29 +02:00
artoscinote	e3ca916c2a	Merge pull request #4447 from scinote-eln/ma_SCI_7184 ... Add y-scroll to step tables [SCI-7184]	2022-09-21 10:29:19 +02:00
artoscinote	50e7531ffa	Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"	2022-09-21 10:07:44 +02:00
Anton	07f0142789	Fix links in locked step texts elements [SCI-7224]	2022-09-20 15:44:52 +02:00
ajugo	6f3a32f09f	Add label template dropdown to print dialog [SCI-7104] (#4387) ... * Add label template dropdown to print dialog [SCI-7051] * Add zebra printers in printing progress and modal [SCI-7104] * Fix hound [SCI-7104] * Fix hound [SCI-7104] * Fix hound [SCI-7104] * Clean code for zebra printer [SCI-7104]	2022-09-20 14:10:34 +02:00