DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-20 19:05:55 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
16464 commits 53 branches 269 tags 314 MiB
Commit graph

125 commits

Author SHA1 Message Date
Godfrey M 001ccf1ce9 adds translation string instead of hardcoded message 2025-01-09 14:47:07 -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
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
akemidx 700647c53f setting created 2024-10-02 18:15:52 -04:00
Godfrey M 44447b85c9 Merge branch 'develop' into barcode_settings_hide 2024-09-26 11:27:05 -07:00
Brady Wetherington b6340532d7 Improve the error and success messages and linking 2024-09-24 17:15:39 +01:00
Brady Wetherington c71411465a First pass at better-handling those annoying Rollbars we keep getting 2024-09-24 15:17:35 +01:00
snipe 836893cba5 Added id to report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:35:00 +01:00
Godfrey M bbb9babf27 one more finger 2024-09-17 16:40:18 -07:00
Godfrey M e5daf35f65 fat finger fix 2024-09-17 16:39:55 -07:00
Godfrey M 87c72953b2 udpated translation 2024-09-17 16:37:17 -07:00
Marcus Moore 8bba11e1bb
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	resources/views/partials/forms/edit/category-select.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	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/status-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-09-17 15:26:35 -07:00
snipe 9e957baeb5 Fixed check for outside assets on user update validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 15:46:45 +01:00
snipe 98323185de Null and warn if editing asset to a non-deployabe state 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 16:43:33 +01:00
snipe b64ed254e0 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 13:49:09 +01:00
snipe c197644ba7
Merge pull request #15284 from spencerrlongg/bug/sc-26584 
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
 2024-08-29 11:38:15 +01:00
snipe 5581950fee Corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 11:17:17 +01:00
snipe ec0b9b198f
Merge pull request #15296 from uberbrady/expose_restore_sanitize 
Expose the 'sanitize' system for backup restores to the web GUI
 2024-08-22 12:43:07 +01:00
snipe 64bed01a91
Merge pull request #15327 from snipe/update_button_style 
Update icons to use blade components, standardize button colors and format
 2024-08-20 10:13:43 +01:00
Marcus Moore fa765667f2
Merge branch 'develop' into livewire-importer-improvements 2024-08-19 14:41:58 -07:00
snipe 34cd4b6244 Added links to apple/google maps 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:15:36 +01:00
snipe 229d8b9bf5 Added location restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:19:59 +01:00
snipe 856c57cb12 Corrected some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 12:39:59 +01:00
snipe de29c1d8a0
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days 
Added #15312: Add checkin due in days setting
 2024-08-16 10:21:36 +01:00
Marcus Moore 94d8a547b8
Merge branch 'develop' into livewire-importer-improvements 2024-08-15 13:47:49 -07:00