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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ajugo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fbac92f9c 
								
							 
						 
						
							
							
								
								Add status for Zebra printers in label print modal [SCI-7269] ( #4492 )  
							
							
							
						 
						
							2022-10-04 09:57:47 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								07f0142789 
								
							 
						 
						
							
							
								
								Fix links in locked step texts elements [SCI-7224]  
							
							
							
						 
						
							2022-09-20 15:44:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								fed1228adc 
								
							 
						 
						
							
							
								
								Update fluics and permissions for label templates [SCI-7222]  
							
							
							
						 
						
							2022-09-20 12:59:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									aignatov-bio 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e524355207 
								
							 
						 
						
							
							
								
								Merge pull request  #4441  from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates  
							
							... 
							
							
							
							Add validation to label template code [SCI-7210] 
							
						 
						
							2022-09-20 11:59:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									artoscinote 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dddbc16a50 
								
							 
						 
						
							
							
								
								Merge pull request  #4438  from scinote-eln/ma_SCI_7184  
							
							... 
							
							
							
							Add y-scroll to step tables [SCI-7184] 
							
						 
						
							2022-09-19 13:56:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								17bf490fef 
								
							 
						 
						
							
							
								
								Add validation to label template code [SCI-7210]  
							
							
							
						 
						
							2022-09-19 11:59:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Artnik 
								
							 
						 
						
							
							
							
							
								
							
							
								c67213db41 
								
							 
						 
						
							
							
								
								Add y-scroll to step tables [SCI-7184]  
							
							
							
						 
						
							2022-09-16 11:16:39 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								73917ec4c0 
								
							 
						 
						
							
							
								
								Fix tinymce errors [SCI-7182]  
							
							
							
						 
						
							2022-09-09 15:50:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									artoscinote 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a2037dc00 
								
							 
						 
						
							
							
								
								Fix smart annotations in locked elements [SCI-7135] ( #4421 )  
							
							
							
						 
						
							2022-09-09 11:15:33 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								34b87ae92f 
								
							 
						 
						
							
							
								
								Fix files loading during copy [SCI-7149]  
							
							
							
						 
						
							2022-09-02 15:09:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								5f21c06b26 
								
							 
						 
						
							
							
								
								Fix error handling for tinymce [SCI-7127]  
							
							
							
						 
						
							2022-09-02 11:19:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								d555227652 
								
							 
						 
						
							
							
								
								Add acitvities and flash messages for component duplication [SCI-7108]  
							
							
							
						 
						
							2022-08-31 11:09:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Artnik 
								
							 
						 
						
							
							
							
							
								
							
							
								bd1e30d19b 
								
							 
						 
						
							
							
								
								Add default measurments to label templates [SCI-7129]  
							
							
							
						 
						
							2022-08-30 16:16:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								81dd259c25 
								
							 
						 
						
							
							
								
								Fix tinymce memory leak [SCI-7138]  
							
							
							
						 
						
							2022-08-26 10:52:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								9daa3f6d69 
								
							 
						 
						
							
							
								
								Fix css for label view page [SCI-7085]  
							
							
							
						 
						
							2022-08-25 13:25:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								771c40d4f0 
								
							 
						 
						
							
							
								
								CSS fixes for label template screen [SCI-7085]  
							
							
							
						 
						
							2022-08-24 17:57:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									aignatov-bio 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d8908c1f5 
								
							 
						 
						
							
							
								
								Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor  
							
							
							
						 
						
							2022-08-24 17:48:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									artoscinote 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7a7df03396 
								
							 
						 
						
							
							
								
								Implement label preview component [SCI-7050] ( #4370 )  
							
							
							
						 
						
							2022-08-24 13:55:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								e22af8830a 
								
							 
						 
						
							
							
								
								Add activties to step duplication [SCI-7109]  
							
							
							
						 
						
							2022-08-24 13:45:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									artoscinote 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								766d2bb3e0 
								
							 
						 
						
							
							
								
								Fix checkboxes for technicians [SCI-7122] ( #4378 )  
							
							
							
						 
						
							2022-08-23 18:10:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								3e539adbde 
								
							 
						 
						
							
							
								
								Fix step drag/drop file [SCI-7123]  
							
							
							
						 
						
							2022-08-23 17:59:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton 
								
							 
						 
						
							
							
							
							
								
							
							
								bc112dd6af 
								
							 
						 
						
							
							
								
								Add step duplication [SCI-7109]  
							
							
							
						 
						
							2022-08-23 17:54:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									artoscinote 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74b9101e6f 
								
							 
						 
						
							
							
								
								Enable table scroll for locked tasks [SCI-7125] ( #4375 )  
							
							
							
						 
						
							2022-08-23 14:23:21 +02:00