3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-07 18:55:40 +00:00
Commit Graph

55 Commits

Author SHA1 Message Date
cc5ac65909 Re-apply #18020, fixed #15107 (mostly) - added prefix and more options to label 2D tags 2025-11-04 18:43:35 +00:00
b383cd9493 Fixed CJK on labels 2025-09-16 12:10:01 +01:00
18d0a04efc Avoid dumping pdf contents to test results 2025-05-29 15:05:08 -07:00
bb68ed3ad9 Handle asset not having location 2025-05-29 14:49:53 -07:00
407962d998 Merge pull request #16790 from Godmartinz/empty_field_columns_labels
Adds Label fields offset as an option
2025-05-05 14:09:40 +01:00
2e0913bb3b remove unused method 2025-04-29 10:49:19 -07:00
851ae46ea9 reworked fix for for 24mm_D label indent errior 2025-04-29 10:45:29 -07:00
149d276e06 fix field alignment issue 2025-04-28 13:26:49 -07:00
7c2c5ea98d adds Field offset option to labels 2025-04-22 10:50:20 -07:00
a69133e2ae adds location qr code option to labels 2025-04-07 12:36:05 -07:00
d949a9689f fix all 2025-02-24 22:35:47 -06:00
1fe170e6a1 Merge pull request #16040 from Godmartinz/template_validate_error
Adds a null check to label templates, adds return types for validation methods
2025-02-18 21:00:10 +00:00
9a75131a98 removed old label artifact 2025-02-03 10:18:13 -08:00
3ac0877418 remove try/catch, add rules for template 2025-01-14 09:50:43 -08:00
9f0581275b Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
0118504cd3 adds redirect to render and save if template is null 2025-01-08 15:32:23 -08:00
f4e69679ca add a try catch around template validation 2025-01-08 12:13:31 -08:00
c17c011488 checks if template is null, adds return types for validation methods 2025-01-08 09:47:20 -08:00
83ee0e0fb6 untangled code visibility from each label engine 2025-01-07 10:37:59 -08:00
94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -08:00
52e4414bc5 Feature: Added asset ID option to 2D barcode in label generation 2024-11-05 13:41:34 +01:00
e22296fd79 Feature: Added serial number option to 2D barcode in label generation 2024-10-29 13:49:05 +01:00
6f3fb47e4a Feature: Added asset tag option to barcode in label generation 2024-10-28 15:39:04 +01:00
86049624c7 retargeted new label engine to correct 1d column 2024-07-29 10:42:26 -07:00
2fd357c346 Add rotation attribute to Label class to allow rotation of the generated label PDF.
This is necessary when printing labels with width = label width.
2024-06-28 09:49:53 +02:00
a4e959818a Add comment 2024-04-11 17:23:28 -07:00
c3a71cc182 Improve variable names and add comment 2024-04-11 16:44:13 -07:00
da03cfdbe5 Formatting 2024-04-11 16:39:29 -07:00
2b137d76fa Trim string to avoid leading whitespace if label is empty 2024-04-11 16:38:22 -07:00
81b8c111ca Allow multiple fields to be displayed in one row 2024-04-11 15:00:14 -07:00
c66267a0f9 Merge pull request #14389 from Godmartinz/remove-pdf-for-old-labels
old engine works as intended
2024-03-07 21:06:57 +00:00
d83974e07f old engine works as intended 2024-03-07 13:03:10 -08:00
4b13fa45c5 Merge pull request #14320 from Godmartinz/default_label_bug
Default label setup with custom fields
2024-03-07 10:33:43 +00:00
ff7d25c0f2 simplified 1dbarcode logic 2024-03-06 15:30:53 -08:00
5f0b7f328c if statement order change 2024-03-06 15:24:03 -08:00
6559581bad conditions 1dbarcode to populate based on settings 2024-03-06 15:10:42 -08:00
d78262f52b resolved merge conflicts 2024-03-06 14:48:47 -08:00
d83827a44e bulk actions are handled before sorting 2024-03-05 15:43:41 -08:00
23f8e35716 Added route parameter
Signed-off-by: snipe <snipe@snipe.net>
2024-03-05 20:39:56 +00:00
95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
e926db76a0 fixes inconsistencies with generating labels 2024-03-04 10:26:38 -08:00
b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08:00
c0215baca5 minor changes 2024-02-22 11:41:04 -08:00
c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
ccec190985 Set label title properly 2024-02-20 13:59:50 -08:00
4bdd070f7b formatting 2023-10-17 13:41:31 -05:00
277608d962 this seems to work 2023-10-17 13:30:51 -05:00
027afa71f1 Check that there is a company before trying to get name property
Signed-off-by: snipe <snipe@snipe.net>
2023-08-16 01:09:22 +01:00
9af850dbaa Re-apply a change that was dropped
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:27:47 +01:00
b72c6b7afc Fix 2D barcode defaults 2023-02-01 17:48:39 +11:00