Godfrey M
fb7bec4be4
adds expiring asset and license mail
2025-02-11 10:55:56 -08:00
snipe
63cb4e70bc
Added notes to presenters
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:34:10 +00:00
snipe
e6ae9cae6b
Added notes to searchable and fillable attributes
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:33:51 +00:00
snipe
1f1e1401cf
Added location notes to importer
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:32:58 +00:00
snipe
af1159658d
Added notes to transformers
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:32:37 +00:00
snipe
4e2b22135a
Added notes to UI controllers
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:32:07 +00:00
snipe
4ee5a4c5c3
Added notes to API controllers
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-11 00:31:50 +00:00
snipe
b54d68ebf1
Merge pull request #16212 from Godmartinz/ternary-checks-on-location-in-notifications
...
adds ternaries on check in/out hardware notifications
2025-02-10 22:28:36 +00:00
snipe
c420670ebb
Small fixes to accessories files handling
...
Signed-off-by: snipe <snipe@snipe.net>
2025-02-10 22:26:00 +00:00
Brady Wetherington
dae1f43359
Merge branch 'develop' into v8
2025-02-10 15:14:55 +00:00
akemidx
d1cd670af5
oop forgot the user form bit
2025-02-06 18:05:22 -05:00
Godfrey M
f41583fd59
adds ternary checks on locations before pulling names in notifications
2025-02-06 11:34:14 -08:00
Brady Wetherington
de3ebfecfe
Ensure we don't call preg_split() with a null as the second parameter
2025-02-06 13:24:39 +00:00
snipe
b195168c83
Merge pull request #16167 from Godmartinz/asset_controller_qr_check_fix
...
Adds qr code type check in getQRCode method
2025-02-06 10:18:34 +00:00
snipe
39ce7b75ca
Merge pull request #16175 from Godmartinz/channel-not-found-warning-added
2025-02-04 21:38:15 +00:00
Godfrey M
cbf9239d86
adds channel not found warning
2025-02-04 11:21:56 -08:00
Godfrey M
ddc22b4d6b
adds a check to see that qr code type is not none
2025-02-03 10:38:49 -08:00
Godfrey M
9a75131a98
removed old label artifact
2025-02-03 10:18:13 -08:00
Marcus Moore
e94ee48f74
Extract helper
2025-01-30 10:37:11 -08:00
Marcus Moore
6a4a5d1380
Add translation
2025-01-30 10:35:31 -08:00
Marcus Moore
ab9e9b66d2
Reduce complexity
2025-01-29 16:27:18 -08:00
Marcus Moore
c15c338ffd
Merge if/else
2025-01-29 16:25:37 -08:00
Marcus Moore
e2805f4033
Add "Reminder" to subject line
2025-01-29 15:36:45 -08:00
spencerrlongg
0defed9abe
add nullsafe
2025-01-29 11:27:02 -06:00
Marcus Moore
8f512e5941
Replace isset with the more appropriate array_key_exists
2025-01-22 14:28:35 -08:00
Marcus Moore
8a1b6b0684
Add isset check
2025-01-22 14:15:35 -08:00
Marcus Moore
1098b8cd9d
Avoid trying to divide by zero
2025-01-22 10:21:30 -08:00
snipe
d5309c7d94
Added fragment to uploads for redirect
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-21 18:06:00 +00:00
snipe
8e4878fac0
Added serial as relation search
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 21:00:01 +00:00
snipe
0d7304eb8b
Use transformer for model files
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 20:20:35 +00:00
snipe
5afcd8ddb3
Merge pull request #16099 from snipe/add_id_to_locations_importer
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Fixed #16097 - added location ID to location importer
2025-01-20 16:58:24 +00:00
snipe
5273408631
Check for matching ID
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 16:53:48 +00:00
snipe
713c9fdd6f
Derp
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 16:46:22 +00:00
snipe
0a5c41ce23
Log error
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 16:42:53 +00:00
snipe
48a916ab77
Check that the ID has a value
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 16:38:31 +00:00
snipe
67ab602e3b
Merge pull request #16090 from snipe/fixes/s3_support_for_eulas
...
Fixed #16000 - add S3 support for eula PDF downloads
2025-01-20 16:26:11 +00:00
snipe
801328ec42
Fixed #16097 - allow location update by ID in importer
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-20 16:23:13 +00:00
Brady Wetherington
dd34f07989
Fix custom translator for new Laravel 11 syntax
2025-01-20 15:24:06 +00:00
snipe
446c7fb483
Merge pull request #16096 from uberbrady/detect_csv_encodings_v2
2025-01-20 14:42:07 +00:00
Brady Wetherington
bbb2af7f53
remove log messages
2025-01-20 13:52:26 +00:00
Brady Wetherington
d65206c7fe
Move tests to UI-side
2025-01-20 13:49:42 +00:00
snipe
e9ad43afbe
Better hide reset password functionality for LDAP users
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-17 18:51:08 +00:00
snipe
434068a2ed
Fixes #16000 - add S3 support for eula PDF downloads
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-17 17:49:19 +00:00
snipe
79951c3f17
Set support footer to on in reset demo script
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-17 16:37:00 +00:00
snipe
221ffb446c
Fixed #15946 - added comtent type to webhook test
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-17 16:36:43 +00:00
snipe
57f80290a1
Merge pull request #16081 from marcusmoore/fixes/zerofill-count-on-setup
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
2025-01-16 21:22:02 +00:00
Marcus Moore
4b2ede7a71
Use 0 for zerofill_count if nothing provided
2025-01-16 12:20:14 -08:00
snipe
5e465fa417
Merge remote-tracking branch 'origin/master' into develop
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
2025-01-16 19:06:02 +00:00
Brady Wetherington
a50c8c6269
Automatically detect character encoding of CSV files when processsing them
...
to handle non-UTF-8 file types. Added a new test case and enhanced the test
rigs to be able to write non-UTF-8 files.
Final cleanup
2025-01-16 17:03:37 +00:00
Marcus Moore
96379d0a62
Use provided zerofill_count
2025-01-15 16:39:50 -08:00
snipe
bbc9ed5778
Fixed audit date default on bulk audit
...
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2025-01-15 22:28:50 +00:00
Godfrey M
69d255f584
adds validation rules for label names
2025-01-14 12:07:59 -08:00
Godfrey M
3ac0877418
remove try/catch, add rules for template
2025-01-14 09:50:43 -08:00
snipe
9a4fd81c70
Use correct icon for ad-hoc notes on assets
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-14 14:34:17 +00:00
snipe
1c8d94c953
Merge pull request #15525 from akemidx/updated_ad_hoc_notes
2025-01-14 11:33:21 +00:00
snipe
ca11efd3ee
Merge pull request #16036 from Godmartinz/unaccepted_assets_reports_memory_fix
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
2025-01-13 22:23:30 +00:00
snipe
99526cfc2c
Remove mcrypt and legacy recrypter
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-13 19:54:00 +00:00
snipe
587449ef97
Merge pull request #15981 from akemidx/bug/sc-27551
2025-01-13 17:35:58 +00:00
snipe
06ffac9d7d
Merge pull request #16046 from uberbrady/ldap_asset_location_switch_fix
2025-01-13 17:33:13 +00:00
Nebel
9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode
2025-01-13 15:49:32 +01:00
snipe
41da04cd22
Merge pull request #16018 from aHVzY2g/patch-3
2025-01-13 13:55:04 +00:00
Marlon Spangenberg
0c4fc56b80
increased label/field size to 2.5, reduced supported fields to 3
2025-01-13 12:20:56 +01:00
Marlon Spangenberg
907f0553d4
moved label value into the same line, changed label font to freemono
2025-01-13 12:14:30 +01:00
Godfrey M
001ccf1ce9
adds translation string instead of hardcoded message
2025-01-09 14:47:07 -08:00
Godfrey M
082a974ee3
changed from redirect with error to with warning
2025-01-09 14:26:54 -08:00
Godfrey M
152c23b8f3
changed log from warning to error
2025-01-09 12:55:25 -08:00
Godfrey M
b635822a85
add try/catch around notification failing for inactive slack hooks
2025-01-09 12:51:54 -08:00
Brady Wetherington
049b9c542b
Conditionally update assets when user's location moves via LDAP
2025-01-09 13:43:59 +00:00
Godfrey M
0118504cd3
adds redirect to render and save if template is null
2025-01-08 15:32:23 -08:00
Godfrey M
f4e69679ca
add a try catch around template validation
2025-01-08 12:13:31 -08:00
Godfrey M
ce7a8ad808
add a space
2025-01-08 09:48:45 -08:00
Godfrey M
c17c011488
checks if template is null, adds return types for validation methods
2025-01-08 09:47:20 -08:00
Godfrey M
92762896ef
moar removal
2025-01-07 15:10:46 -08:00
Godfrey M
c699baf519
removed commented out code, and unrelated crap
2025-01-07 15:10:00 -08:00
Godfrey M
97b765b5cc
improved reports query, could be further optimized
2025-01-07 15:06:09 -08:00
snipe
40b41e646d
Merge pull request #16033 from Godmartinz/barcode-fix
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
2025-01-07 19:59:30 +00:00
snipe
63853db450
Merge pull request #16035 from marcusmoore/fixes/unaccepted-assets-reminder
2025-01-07 19:58:23 +00:00
Marcus Moore
48dd3252cb
Fix parameter order
2025-01-07 11:47:16 -08:00
Godfrey M
f6abf90ba0
fix locale check
2025-01-07 10:51:48 -08:00
Godfrey M
83ee0e0fb6
untangled code visibility from each label engine
2025-01-07 10:37:59 -08:00
Godfrey M
94f44d1b77
fix label type values in db and defaults. update help text
2025-01-07 10:00:52 -08:00
Godfrey M
e12c7473f8
tinkering with the polymorphic eager load
2025-01-07 09:08:36 -08:00
Godfrey M
0ec25d55a0
Merge branch 'develop' into unaccepted_assets_reports_memory_fix
2025-01-06 12:28:17 -08:00
Godfrey M
bb03e00279
fix deprecation on asset obs get unaccept report to populate
2025-01-06 11:26:45 -08:00
snipe
9672a13402
Set order by on companies
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-06 16:11:18 +00:00
aHVzY2g
eba1f03363
Added: TZe_24mm_D.php modified TZe_24mm_A that includes 1D code
...
New label format for TZe_24mm that includes all fields of TZe_24mm_A with the addition of the 1D code at the bottom of the label.
2025-01-03 11:10:44 +01:00
snipe
d410f168bd
Removed extra checks, since we already check higher up
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-26 10:28:27 +00:00
snipe
b38f9ad33c
Updated return types
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-26 10:18:00 +00:00
snipe
f8311815ee
Check for valid asset before accessing properties
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-26 10:17:45 +00:00
snipe
3edb501973
Fixed typo sanitze to sanitize
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-12-25 20:45:19 +00:00
Marcus Moore
876ab44a16
Update settings property keys
2024-12-19 15:18:27 -08:00
snipe
15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template
...
Saved Custom Report Templates
2024-12-19 22:43:59 +00:00
snipe
1434522149
Merge pull request #15912 from marcusmoore/bug/harden-checkout-validation-v2
...
Harden asset checkout validation
2024-12-19 22:42:06 +00:00
snipe
6b8c1eb523
Merge branch 'develop' into testing/accessories-ui
2024-12-19 22:38:04 +00:00
snipe
26264e1d55
Merge branch 'develop' into testing/consumable-ui
2024-12-19 22:34:10 +00:00
snipe
d49bfb562a
Merge branch 'develop' into testing/license-checkin
2024-12-19 22:29:31 +00:00
snipe
8d24c0af0d
Merge pull request #15982 from spencerrlongg/bug/sc-27228
...
Update Checkout Button Permission for Predefined Kits
2024-12-19 22:25:51 +00:00
snipe
0dce3b8b8c
Merge pull request #15987 from spencerrlongg/bug/sc-27192
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Add `string` to Password Reset Username Rules
2024-12-18 20:09:14 +00:00
spencerrlongg
5042c2b30a
oops, rm dump
2024-12-18 13:58:18 -06:00
spencerrlongg
b45cf6124f
add note
2024-12-18 13:57:18 -06:00
spencerrlongg
7eb936883a
rm note
2024-12-17 16:38:29 -06:00
akemidx
c3b5a92a48
added builder
2024-12-17 17:11:52 -05:00
spencerrlongg
eb054897d6
Remove leftover testing logic and fix checkout permissions
...
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
2024-12-17 16:06:10 -06:00
akemidx
f6dbda4056
fixing count to not used trashed
2024-12-17 17:03:46 -05:00
akemidx
5992d2a1d2
adding to controller
2024-12-17 15:43:13 -05:00
Marcus Moore
7aa5195e87
Add tests for license checkin
2024-12-16 14:39:24 -08:00
snipe
b233715796
Fixed property
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
b93fc80011
Fixed admin -> adminuser property
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
51b426f0b4
Added accessory transformer to assets transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
021c4f2598
Added assets endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
ac96b8d4ae
Added assignedAccessories method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
bc8719e336
Specify created_by in the API call as well
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
bd38d64e66
Removed create() method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
74b5d6d12b
Updated transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
ddd11939a5
No need to include assigned_to
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
3caa5f2042
Fixed user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
a0b9714d72
Updated user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
e0643cd744
Added currency and history icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:30 +00:00
snipe
183a4d49d8
Refactor of #15235 - added accessory checkout to locations, assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:34:49 +00:00
snipe
edacc4eb54
Merge pull request #15446 from Godmartinz/barcode_settings_hide
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Refactored Barcode Settings into Label Settings
2024-12-16 16:09:34 +00:00
Marcus Moore
699476da90
Scaffold and implement some license checkin tests
2024-12-12 17:33:34 -08:00
Marcus Moore
d763feb803
Add consumable ui tests
2024-12-12 16:41:46 -08:00
Marcus Moore
d3bfa75251
Add accessory ui tests
2024-12-12 14:30:58 -08:00
Godfrey M
833af55806
Merge branch 'develop' into barcode_settings_hide
2024-12-12 12:05:29 -08:00
snipe
4d1d2fedb7
Merge pull request #15960 from uberbrady/improve_restore_cleaner_utf8
2024-12-12 17:05:10 +00:00
Brady Wetherington
a0e7dcf4ff
Fixes to 'clean' mode to better handle character sets and zero-values
2024-12-12 16:50:36 +00:00
Godfrey M
3264149a2c
fix other mailables
2024-12-11 16:26:18 -08:00
Godfrey M
331fbb66bd
fix other mailables
2024-12-11 16:25:04 -08:00
Godfrey M
400833f834
reversed order of the acceptance and note paramter
2024-12-11 16:14:06 -08:00
snipe
06a0ac895d
Fixed #15928 - updated method name to setCreatedBy from SetUserId
...
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-12-11 18:34:18 +00:00
snipe
f5a9e4bafa
Fixes #15952 - fixed typo in content-type
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-11 18:09:19 +00:00
Godfrey M
2e97b56deb
add null safe operator to acceptance reminder
2024-12-11 09:27:27 -08:00
snipe
cc8f72c3f9
Merge pull request #15914 from Godmartinz/send_reminder_emails
2024-12-09 19:23:13 +00:00
Brady Wetherington
b5c8251539
Only update asset locations to assets checked out to users.
2024-12-09 17:40:10 +00:00
snipe
0149ed75fd
Merge pull request #15565 from spencerrlongg/bug/sc-25921
2024-12-09 17:00:10 +00:00
Godfrey M
5120cddda4
delete notification version of reminder
2024-12-05 16:02:55 -08:00
Godfrey M
97398f1e68
adds testing to unaccepted reminder command
2024-12-05 12:41:33 -08:00
Godfrey M
281ff6ad5d
wrap comment
2024-12-05 11:52:34 -08:00
Godfrey M
9d49b01958
cleans up the Unaccepted Asset reminder variables
2024-12-05 11:46:56 -08:00
Godfrey M
3f8916ea2e
fix duplicate emails being sent in unaccepted reminder command
2024-12-05 11:37:03 -08:00
Godfrey M
f6b9ae6aee
missed a spot
2024-12-05 10:18:35 -08:00
Godfrey M
de41def2b3
fixed conditionals
2024-12-05 10:15:57 -08:00
Godfrey M
52b051e940
add mail class for unaccepted assets reminders
2024-12-05 10:08:39 -08:00
Godfrey M
e5284c03e2
fix typo
2024-12-03 09:10:50 -08:00
Godfrey M
16283b8fc0
adds mail from name to mail envelope
2024-12-03 09:08:39 -08:00
Godfrey M
983b78edd9
add property check
2024-12-02 14:27:04 -08:00
Godfrey M
ab67c48352
fix unaccepted assets report resend acceptance
2024-12-02 13:03:09 -08:00
Marcus Moore
1d0d14876c
Harden asset checkout validation
2024-12-02 12:49:02 -08:00
Fiala06
bdb0e6c2a3
Update LdapSync.php
...
Fix for duplicate entries preventing the sync from continuing.
SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '13178-6' for key 'PRIMARY' (Connection: mysql, SQL: insert into users_groups (group_id, user_id) values (6, 13178))
2024-12-02 11:07:37 -08:00
Godfrey M
99464fcd86
fixes general webhook not firing
2024-12-02 10:19:24 -08:00
Marcus Moore
b5e83899c6
Revert "Hardened asset checkout validation by requiring integer"
2024-12-02 09:37:21 -08:00
snipe
ee4a54be24
Fixed order by notes for users
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
2024-11-27 15:48:13 +00:00
snipe
46be1ada60
Merge pull request #15892 from marcusmoore/bug/harden-checkout-validation
...
Hardened asset checkout validation by requiring integer
2024-11-27 14:55:11 +00:00
snipe
2cb1b6d462
Use transformer on API update
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-27 13:51:53 +00:00
snipe
82108f8a18
Merge pull request #15208 from akemidx/feature/sc-26415
...
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
2024-11-26 20:11:04 +00:00
akemidx
2727210c78
requested changes from pr
2024-11-26 15:04:54 -05:00
Marcus Moore
fcbd5dcae5
Harden asset checkout validation by requiring ints
2024-11-26 11:33:17 -08:00
Godfrey M
60642cd902
fix user api update from clearing location_id unnecessarily
2024-11-26 09:58:17 -08:00
akemidx
dd223fc215
commit for testing
2024-11-21 19:01:27 -05:00
snipe
b7aedb7dcb
Merge pull request #15818 from spencerrlongg/bug/sc-27213
...
Resolves Validation for Encrypted Numeric and Alpha Custom Fields
2024-11-21 19:25:27 +00:00
snipe
8b38dc83f6
Merge pull request #15851 from marcusmoore/testing/api-component-checkin
...
Fixed bug in component checkins via api
2024-11-21 19:24:12 +00:00
snipe
2a21cce4f5
Merge pull request #15839 from Godmartinz/fix-mail-envelope-variable
...
replace env with config variable for from address
2024-11-21 14:41:04 +00:00
Marcus Moore
f932a4fc76
Always run validation on checkin
2024-11-20 12:25:06 -08:00
Godfrey M
f7c1fc852d
no checked out to email doesnt trigger a 500
2024-11-20 08:29:28 -08:00
snipe
8cd4b3303e
Merge pull request #15847 from NebelKreis/feature/hardware-label-generation-api
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Added #15677 : API Route for Generating Asset Labels
2024-11-20 11:14:28 +00:00
NebelKreis
d5c141dc59
Fix: Removed setting validation as it is not strictly necessary
2024-11-20 11:55:48 +01:00
snipe
cca76005a2
Merge pull request #15852 from marcusmoore/testing/ui-delete-component
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Added tests around deleting component via ui
2024-11-20 01:27:19 +00:00
Marcus Moore
54f5f46e31
Improve check for image existence
2024-11-19 16:44:42 -08:00
Marcus Moore
da4c877ed8
Use === over ==
2024-11-19 16:13:53 -08:00
Marcus Moore
e8cad0df69
Formatting
2024-11-19 16:13:30 -08:00
Godfrey M
99de639be4
fix mail.from.address variables in config, simplify envelop[ variable
2024-11-19 09:32:11 -08:00
spencerrlongg
22602c7997
use existing validation strings
2024-11-19 08:59:47 -06:00
snipe
15a31bd141
Fixed variable name
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-19 13:22:44 +00:00
NebelKreis
66d6b01307
Feature: Added translations for label generation API endpoint
2024-11-19 14:16:06 +01:00
NebelKreis
889aff43c2
Feature: Added API endpoint for generating asset labels
2024-11-19 14:13:05 +01:00
Godfrey M
f533cdc07a
update default from address to alternate config variable
2024-11-18 12:39:28 -08:00
Godfrey M
d14f43fbbe
replace env with config variable for from address
2024-11-18 10:54:03 -08:00
spencerrlongg
b71a90a3c5
this should be all it takes to fix this, i think
2024-11-18 12:44:24 -06:00
snipe
e8d1093376
Fixed admin user not showing in download all activity report
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-15 18:51:45 +00:00
snipe
187e231c0e
Fixed #15825
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-11-15 13:18:15 +00:00
snipe
09b7db5103
Additional fix for #15817
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 20:57:09 +00:00
snipe
f2faf58786
Merge pull request #15817 from Godmartinz/label_fix
...
Removes asset tag if 2D code is not present
2024-11-14 20:49:31 +00:00
spencerrlongg
124f9c84c2
oops, something went wrong translation
2024-11-14 13:45:47 -06:00
spencerrlongg
8465806536
rm unnecessary imports
2024-11-14 11:51:41 -06:00
Godfrey M
0f1f6bc6a5
fixed rest of dymos
2024-11-14 09:45:52 -08:00
spencerrlongg
95cd779334
translations and attribute names
2024-11-14 11:42:35 -06:00
Godfrey M
23038ab209
removes tag if qr code is not present
2024-11-14 08:54:12 -08:00
Godfrey M
702621ec57
replace the via channel class
2024-11-14 08:38:18 -08:00
snipe
a0b8483878
Removed extra sort
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 14:41:11 +00:00
snipe
940f1c2ecc
Fixed #15812 - regression in action_type search
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 12:24:15 +00:00
snipe
364410a586
Merge pull request #15558 from maciej-poleszczyk/develop
...
Fixing #15064 - to not fail ldap sync on single data issue with ldap …
2024-11-14 11:06:18 +00:00
snipe
4e28650ca9
Specify table name in select
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 10:18:39 +00:00
spencerrlongg
8c6869fd34
note and rm dump and comment
2024-11-13 21:59:32 -06:00
spencerrlongg
7e7cbc4cc8
seems to work just fine now, needs translations
2024-11-13 21:54:25 -06:00
spencerrlongg
25163d1756
working except for null 🤔
2024-11-13 21:46:23 -06:00
spencerrlongg
3982201d0e
this should work in theory - local is screwy though
2024-11-13 21:38:09 -06:00
Marcus Moore
92f33c08f7
Merge branch 'develop' into saving_custom_report_template
2024-11-13 14:54:00 -08:00
Marcus Moore
e80a456e04
Remove duplicate method
2024-11-13 14:35:20 -08:00
Marcus Moore
c399d797b4
Add conditional for microsoft team integration version
2024-11-13 14:29:01 -08:00
Marcus Moore
ac3ae651b1
Remove incorrect typehint
2024-11-13 14:15:43 -08:00
