Commit graph

660 commits

Author SHA1 Message Date
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
artoscinote
f72a281e0a
Merge pull request #4850 from artoscinote/ma_SCI_7776
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
2023-01-19 14:27:19 +01:00
Alex Kriuchykhin
58be66a06c
Merge pull request #4855 from okriuchykhin/ok_SCI_7779
Fix icons in custom tinyMCE menu [SCI-7779]
2023-01-19 13:21:35 +01:00
aignatov-bio
d6bbdac2bb
Merge pull request #4862 from aignatov-bio/ai-sci-7782-fix-excel-tables-in-tinymce
Fix table overflow for TinyMCE [SCI-7782]
2023-01-19 12:59:20 +01:00
Anton
a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
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