DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16998 commits 59 branches 275 tags 321 MiB
Commit graph

147 commits

Author SHA1 Message Date
snipe 77add8abbc Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:39:07 +00:00
snipe 2bee4532ec Added qty error string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-23 13:21:58 +00:00
Brady Wetherington cbe04e8514 Add tooltips to custom fields display, especially for icons 2025-02-22 19:13:09 +00:00
snipe c727633e6b Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:11:42 +00:00
snipe 7db11dc12b
Merge pull request #16277 from Godmartinz/bulk_delete_asset_bug 
Fixes deletion of assigned assets through bulk delete
 2025-02-22 12:59:37 +00:00
snipe bde034593b Updateed string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:17:04 +00:00
snipe d1cc0fcfac Added ability to send user inventory via bulk UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:07:54 +00:00
Godfrey M a534b488b2 prevents deletion of assigned assets in bulk deletion 2025-02-19 10:09:02 -08:00
snipe 2f2b879d98 Language refinement 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 17:40:12 +00:00
snipe 1fe170e6a1
Merge pull request #16040 from Godmartinz/template_validate_error
Some checks failed
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Adds a null check to label templates, adds return types for validation methods
 2025-02-18 21:00:10 +00:00
snipe c0f0f43dd7
Merge pull request #16188 from Godmartinz/translations-for-labels-n-ldap 
Adds translations to LDAP  and Label settings pages
 2025-02-18 19:56:14 +00:00
snipe 6de08f46fd Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:26:36 +00:00
snipe 3554270366 Updated LDAP sync text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:25:40 +00:00
Godfrey M c3310a0772 adds translations to LDAP settings page 2025-02-05 10:38:16 -08:00
Godfrey M cbf9239d86 adds channel not found warning 2025-02-04 11:21:56 -08:00
Godfrey M 0eb34cb979 adds period to translation 2025-01-16 13:24:32 -08:00
snipe a7543b407f Added a few more words 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:07:22 +00:00
snipe 98b1ba1e39 Moved keywords in lang file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:04:48 +00:00
Nebel 9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
Godfrey M 001ccf1ce9 adds translation string instead of hardcoded message 2025-01-09 14:47:07 -08:00
Godfrey M 0118504cd3 adds redirect to render and save if template is null 2025-01-08 15:32:23 -08:00
Godfrey M 94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -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 d49bfb562a
Merge branch 'develop' into testing/license-checkin 2024-12-19 22:29:31 +00:00
Marcus Moore 699476da90
Scaffold and implement some license checkin tests 2024-12-12 17:33:34 -08:00
Godfrey M 833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08: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 a7dae10a82 fixing line 2024-11-26 15:06:25 -05:00
akemidx 2727210c78 requested changes from pr 2024-11-26 15:04:54 -05:00
NebelKreis 66d6b01307 Feature: Added translations for label generation API endpoint 2024-11-19 14:16:06 +01:00
Marcus Moore 53de97db4e
Merge branch 'develop' into saving_custom_report_template 2024-11-12 10:36:07 -08:00
snipe 47b2cdb846 Allow user to specify null for calculation or explicit on bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-10 18:04:13 +00:00
Marcus Moore 8873137ed0
Scaffold updating template name 2024-11-06 12:29:31 -08:00
Marcus Moore ad99b8b456
Use generic ID translation 2024-11-06 10:37:31 -08:00
NebelKreis 52e4414bc5 Feature: Added asset ID option to 2D barcode in label generation 2024-11-05 13:41:34 +01:00
NebelKreis f96b7c5056 Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations 2024-11-05 13:40:33 +01:00
Marcus Moore e7cb4a75eb
Show accessory checkout id in user accessory table 2024-11-04 15:56:53 -08:00
Marcus Moore 5f83cb6a14
Use route model binding 2024-10-31 12:34:06 -07:00
Marcus Moore 45e98e0282
Merge branch 'develop' into saving_custom_report_template 2024-10-29 15:20:52 -07:00
Marcus Moore ee00699cb3
Remove unused strings 2024-10-28 13:07:29 -07:00
Marcus Moore b45749af16
Update translation strings 2024-10-28 13:06:19 -07:00
Marcus Moore 54dec8d30d
Add translations 2024-10-28 12:56:42 -07:00
snipe dfc63641dc
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Fix multi create partial failure (fixes: [RB-18591])
 2024-10-24 11:40:50 +01:00
Marcus Moore 8a06f4ad82
Improve label 2024-10-23 15:21:02 -07:00
Marcus Moore a20e03fce9
Merge branch 'develop' into saving_custom_report_template 2024-10-21 17:13:15 -07:00
akemidx 5cb940c2ee Merge branch 'refs/heads/upstream/dev' into feature/sc-26415 2024-10-16 18:32:36 -04:00
Brady Wetherington 6b7af802af Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar 2024-10-16 22:02:45 +01:00
Marcus Moore 5306e1cd15
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/supplier-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-10-15 12:32:01 -07:00
snipe 4361a10818 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:30 +01:00
akemidx f45b836010 backend form validation. +cleanup 2024-10-02 18:15:53 -04:00