Commit graph

6354 commits

Author SHA1 Message Date
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
Some checks are pending
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
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
Some checks are pending
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
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
Some checks failed
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
Some checks are pending
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
Some checks are pending
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