ajugo
d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] ( #4859 )
2023-01-19 11:39:14 +01:00
Oleksii Kriuchykhin
a6abc9d7e5
Fix icons in custom tinyMCE menu [SCI-7779]
2023-01-18 16:43:50 +01:00
Martin Artnik
b46c92b3c6
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
2023-01-18 11:00:08 +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
3e65ae921c
Fix TinyMCE blocking turbolinks [SCI-7729]
2023-01-12 12:09:44 +01:00
Martin Artnik
33dca201ba
Remove placeholder plugin [SCI-7729]
2023-01-11 15:49:18 +01:00
Martin Artnik
b559352128
Remove TinyMCE draft auto init functionality [SCI-7729]
2023-01-11 15:31:14 +01:00
Martin Artnik
2ffec1cf49
Fix TinyMCE style loading [SCI-7729]
2023-01-11 15:28:09 +01:00
Martin Artnik
edfc1c4e08
Fix editor close when clicking restore notification [SCI-7729]
2023-01-10 13:24:58 +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
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
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] ( #4616 )
2022-11-14 10:42:51 +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
Andrej
884fe58525
Fix label print open issue [SCI-7296]
2022-10-03 17:33:42 +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
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
Anton
2d925a3bfe
Add help and quick toolbar plugin to tinymce [SCI-7190]
2022-09-21 12:01:08 +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
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +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
Oleksii Kriuchykhin
557c4b205a
Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151]
2022-09-09 10:59:20 +02:00
Anton
9b52b7f3db
Fix tinymce pack code styling [SCI-7183]
2022-09-08 15:37:23 +02:00
aignatov-bio
7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin
2022-09-08 12:13:58 +02:00
Anton
2f01a5a358
Update tinymce placeholder plugin [SCI-7153]
2022-09-07 15:16:03 +02:00
Anton
c8af3e1fa8
Update tinymce image toolbar plugin [SCI-7152]
2022-09-07 11:24:54 +02:00
Anton
1ebd4046cd
Update tinyMCE marvinjs plugin [SCI-7154]
2022-09-06 13:05:56 +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
