Marcus Moore
|
1995e1399e
|
Start recording ip, user agent, and source
|
2025-02-18 16:04:53 -08:00 |
|
|
Marcus Moore
|
79d1147f20
|
Add validation
|
2025-02-18 15:46:52 -08:00 |
|
|
Marcus Moore
|
53c084c6c0
|
WIP: begin to store notes
|
2025-02-18 15:43:58 -08:00 |
|
|
Marcus Moore
|
25215fd3c9
|
WIP: begin migrating notes to ui controller
|
2025-02-18 15:20:06 -08:00 |
|
snipe
|
1fe170e6a1
|
Merge pull request #16040 from Godmartinz/template_validate_error
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
Adds a null check to label templates, adds return types for validation methods
|
2025-02-18 21:00:10 +00:00 |
|
|
snipe
|
329fbf6a7c
|
Scope results by location ID
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-18 19:01:16 +00:00 |
|
|
snipe
|
48ab94c15b
|
Fixed query duplication for AssetsForShow scope
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-18 16:18:12 +00:00 |
|
|
snipe
|
7553ec3e27
|
Fixed equals
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-17 10:44:58 +00:00 |
|
|
snipe
|
c8f82cbc2b
|
Merge pull request #16250 from uberbrady/improve_tls_client_side_file_caching
Instead of saving TLS cache-files on save, cache them when used
|
2025-02-13 15:46:22 +00:00 |
|
Brady Wetherington
|
b7bd56daf7
|
Instead of saving TLS cache-files on save, cache them when used
|
2025-02-13 15:09:28 +00:00 |
|
|
snipe
|
d3210c6d40
|
Return flat JSON instead of transformed data
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-13 14:16:32 +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
|
c420670ebb
|
Small fixes to accessories files handling
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-10 22:26:00 +00:00 |
|
Godfrey M
|
ddc22b4d6b
|
adds a check to see that qr code type is not none
|
2025-02-03 10:38:49 -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
|
0d7304eb8b
|
Use transformer for model files
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-20 20:20:35 +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
|
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
|
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 |
|
|
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
|
3ac0877418
|
remove try/catch, add rules for template
|
2025-01-14 09:50:43 -08: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
|
587449ef97
|
Merge pull request #15981 from akemidx/bug/sc-27551
|
2025-01-13 17:35:58 +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
|
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 |
|
|
Marcus Moore
|
48dd3252cb
|
Fix parameter order
|
2025-01-07 11:47:16 -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 |
|
|
snipe
|
b38f9ad33c
|
Updated return types
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-26 10:18:00 +00: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
|
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
|
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 |
|
akemidx
|
c3b5a92a48
|
added builder
|
2024-12-17 17:11:52 -05: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
|
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
|
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
|
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 |
|
|
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
|
cc8f72c3f9
|
Merge pull request #15914 from Godmartinz/send_reminder_emails
|
2024-12-09 19:23:13 +00:00 |
|
|
snipe
|
0149ed75fd
|
Merge pull request #15565 from spencerrlongg/bug/sc-25921
|
2024-12-09 17:00:10 +00: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
|
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 |
|
|
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
|
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 |
|
|
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
|
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 |
|
|
Marcus Moore
|
f932a4fc76
|
Always run validation on checkin
|
2024-11-20 12:25:06 -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 |
|
|
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 |
|
|
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
|
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
|
4e28650ca9
|
Specify table name in select
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-14 10:18:39 +00:00 |
|
|
Marcus Moore
|
92f33c08f7
|
Merge branch 'develop' into saving_custom_report_template
|
2024-11-13 14:54:00 -08:00 |
|
|
snipe
|
73383c688e
|
Merge pull request #15782 from Toreg87/fixes/indentation_userscontroller
Fix Indentation in UsersController
|
2024-11-13 21:21:40 +00:00 |
|
|
snipe
|
4a18946dd7
|
Added created by to imports
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-13 18:42:27 +00:00 |
|
|
snipe
|
d3602c0595
|
Allow sorting on admin name in API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-13 18:23:26 +00:00 |
|
|
snipe
|
48713cbddf
|
Added additional helper files to assetmodel importer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-12 22:40:00 +00:00 |
|
|
Marcus Moore
|
53de97db4e
|
Merge branch 'develop' into saving_custom_report_template
|
2024-11-12 10:36:07 -08:00 |
|