Anton
de72f60cc1
Merge branch 'develop' into features/new-datatable
2024-01-11 15:14:36 +01:00
Anton
3346c55941
Merge branch 'develop' into features/new-datatable
2024-01-09 10:36:21 +01:00
ajugo
a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] ( #6875 )
2024-01-09 09:37:50 +01:00
Gregor Lasnibat
30300dbe1d
(fix) Fix formatting in VUE files [SCI-9936]
2024-01-08 16:11:27 +01:00
Oleksii Kriuchykhin
95ab33a58b
Merge branch 'develop' into features/inventory-items-relationships
2024-01-05 11:27:32 +01:00
Gregor Lasnibat
3e4ccbcc75
(fix) Item card minor issue [SCI-9814_v2] ( #6846 )
2023-12-21 11:55:12 +01:00
Alex Kriuchykhin
528d411910
e2e - modified and added new tags at inventories section [SCI-9813] ( #6741 ) ( #6832 )
...
Co-authored-by: Martin Artnik <martin@scinote.net>
Co-authored-by: mvrazic <144342580+mvrazic@users.noreply.github.com>
2023-12-15 16:33:13 +01:00
Anton
be9c6c759f
Remove legacy [SCI-9680]
2023-11-29 11:36:44 +01:00
Anton
16eedcdade
Revamp modals across app [SCI-8978]
2023-08-17 14:01:26 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] ( #5933 )
...
* Fix bugs with jquery3 upgrade [SCI-8973]
* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]
* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] ( #5895 )
...
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]
* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
Martin Artnik
3978d9efef
Merge branch 'develop' into features/august-release
2023-07-26 11:22:49 +02:00
Soufiane
5a44400fbb
Fix zebra printer CSP issue [SCI-8859] ( #5806 )
2023-07-21 16:54:57 +02:00
Martin Artnik
5cc087835a
Merge branch 'develop' into features/august-release
2023-07-19 11:21:24 +02:00
wandji
2698681548
Fix Not correct naming for label in global activity filter ( #5776 )
...
* Update translation for label_repository and sort template label names in label print modal
* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
2023-07-17 15:38:28 +02:00
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] ( #5766 )
...
* Fix label templates, inline edit, checklist and step [SCI-8792]
* Add mouse selection to protocol name on task and protocol desc.
* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
Anton
4e972de096
UI CSS fixes
2023-06-19 15:58:17 +02:00
Anton
ed1c4bcb69
Replace webpacker with jsbundling-rails [SCI-7926]
2023-03-30 13:39:57 +02:00
ajugo
b549938f13
Fix print modal css [SCI-7437] ( #4648 )
2022-12-22 11:09:20 +01:00
Martin Artnik
31b075ea8c
Fix label preview double refresh and unit issues [SCI-7396]
2022-10-25 15:54:05 +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
Anton
85248a0426
Fix validation on print modal [SCI-7287]
2022-09-30 19:48:13 +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
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
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
