scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
11252 commits 70 branches 179 tags 165 MiB
Commit graph

11252 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ajugo 7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Alex Kriuchykhin d70428c6fe
Merge pull request #4477 from okriuchykhin/ok_SCI_7258 
Fix label printers dropdown on print modal [SCI-7258]
 2022-10-03 10:37:42 +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
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
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 99ef569006
Merge pull request #4482 from scinote-eln/master_1_26_0_5 
October cleanup 1.26.0.5
 2022-09-29 10:13:36 +02:00
artoscinote d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +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
artoscinote 6bec0f168c
Merge pull request #4474 from scinote-eln/release/1.26.0.5 
October cleanup, 1.26.0.5
 2022-09-28 10:16:56 +02:00
artoscinote 249bc05ca4
Bump version to 1.26.0.5 2022-09-28 10:15:54 +02:00
ajugo 0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] (#4470) 2022-09-27 15:57:23 +02:00
aignatov-bio 691b9abac7
Merge pull request #4469 from aignatov-bio/ai-sci-7253-add-loading-label-to-settings-printers-search 
Add loading label to settings printers search [SCI-7253]
 2022-09-27 15:48:15 +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
artoscinote 16d4a5fecb
Merge pull request #4443 from G-Chubinidze/gc_SCI_7162 
fixed duplicate title on empty repository index [SCI_7162]
 2022-09-27 11:57:30 +02:00
Giga Chubinidze da17348f98 Revert "Bump version to 1.26.0.5" 
This reverts commit 6cc19badfe.
 2022-09-27 12:35:23 +04: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
aignatov-bio 936814b054
Merge pull request #4465 from aignatov-bio/ai-sci-7236-fix-custom-template-column-format-label 
Fix column label template format [SCI-7236]
 2022-09-27 09:57:34 +02:00
Miha Mencin 7712690c54
Merge pull request #4468 from scinote-eln/release/1.26.0.5 
Release/1.26.0.5
 2022-09-27 09:46:16 +02:00
Miha Mencin 6cc19badfe
Bump version to 1.26.0.5 2022-09-27 09:41:53 +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
aignatov-bio 5a06a685aa
Merge pull request #4460 from aignatov-bio/ai-sci-7193-add-vue-component-for-print-dialog 
Add VUE component for print dialog [SCI-7193]
 2022-09-26 10:13: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
aignatov-bio 1bb7c2227b
Merge pull request #4452 from aignatov-bio/ai-sci-7239-fix-checkboxes-safari 
Fix checkbox in safari [SCI-7239]
 2022-09-22 11:26:53 +02:00