scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 02:16:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
12480 commits 69 branches 179 tags 166 MiB
Commit graph

382 commits

Author SHA1 Message Date
artoscinote 3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837 
Step timestamp display [SCI-7837]
 2023-02-06 12:03:02 +01:00
artoscinote 6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585 
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
 2023-02-06 11:17:43 +01:00
Alex Kriuchykhin 958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Giga Chubinidze e412f40948 simple logic update 2023-01-31 17:08:34 +04:00
Anton 68f2db7996 Fix label template logo dimenstion calculation [SCI-7822] 2023-01-30 12:59:51 +01:00
sboursen-scinote 95b339f759 Fix Hound related issue [SCI-7585] 2023-01-26 09:12:31 +01:00
sboursen-scinote 15da0f2f33 Remove commented code and change the name of the hide filters method [SCI-7585] 2023-01-26 08:47:55 +01:00
sboursen-scinote adcb0e84f8 Add close button [SCI-7585] 2023-01-26 08:41:33 +01:00
sboursen-scinote ef7395b0cd Adjust the size of the clear button on small screens [SCI-7585] 2023-01-26 08:26:34 +01:00
sboursen-scinote ceb193deee Make the applyFilters button work again [SCI-7585] 2023-01-25 13:49:40 +01:00
sboursen-scinote e2521e501c Change the position of the clear button [SCI-7585] 2023-01-25 11:28:39 +01:00
sboursen-scinote 2c8c008e49 Extract the filters_list component and reset it on clear [SCI-7585] 2023-01-25 09:34:01 +01:00
artoscinote 87fa3bc9a7
Merge pull request #4710 from G-Chubinidze/gc_SCI_7195 
Text block on step without title in rearrange modal [SCI-7195]
 2023-01-24 09:40:33 +01:00
Giga Chubinidze 01f6f4d5ea changed logic for item naming 2023-01-21 01:08:17 +04:00
Anton a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
ajugo 1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Martin Artnik 14c6c67a1a Fix merging tables in TinyMCE [SCI-7697] 2023-01-13 15:29:16 +01:00
artoscinote 80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6 
Features/tiny mce 6
 2023-01-13 13:53:03 +01:00
Alex Kriuchykhin d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo 
Features/label template logo
 2023-01-13 11:58:01 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00
Giga Chubinidze ae8efa8e1a changed if else logic, added back placeholders 2022-12-16 17:22:06 +04:00
Martin Artnik 3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Giga Chubinidze 556431a0da changed code for develop branch 2022-12-12 19:17:57 +04:00
Anton c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Martin Artnik c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Martin Artnik 13cf136ca4 Make overflowing tables in TinyMCE scrollable [SCI-7238] 2022-12-01 15:20:23 +01:00
Anton eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Martin Artnik 31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +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
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
Andrej 16b4a89fb8 Disable label preview options for Viewer role [SCI-7322] 2022-10-14 11:49:31 +02:00
ajugo 58acb94977
Remove status from print label modal [SCI-7328] (#4524) 2022-10-12 16:56:58 +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
Andrej 5d6b454756 Fix selected printer for printing [SCI-7315] 2022-10-10 13:33:35 +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
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
Andrej 16a7dd261f Add name to zebra printer initialization [SCI-7312] 2022-10-06 14:52:15 +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
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
Anton d8bcdb09e4 Fix drag n drop for locked tasks [SCI-7123 2022-08-23 14:20:24 +02:00
artoscinote c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] (#4374) 2022-08-23 10:10:20 +02:00
Anton 1bac9aeb4c Add duplication to components [SCI-7108] 2022-08-22 15:03:49 +02:00
Andrej 371f5e782b Remove strikethrough for step name and checklist items [SCI-7116] 2022-08-19 16:02:20 +02:00