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
17076 commits 59 branches 275 tags 321 MiB
Commit graph

275 commits

Author SHA1 Message Date
snipe 76301bc30d Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 20:05:03 +01:00
snipe 231bc1e2de Updated blade selectors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 18:31:34 +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 22bc088f6f Added start_date and end_date to user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-27 07:21:19 +01:00
snipe 3fe891a05b Removed a few more commas
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-26 10:25:27 +01:00
snipe f4c5b712f4 Removed colons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-26 10:24:07 +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 305dc049a4 Added asterisk help text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 11:01:28 +01:00
snipe 3ac0702094 Fixed #15344 - make select2 for countries freeform-ish 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 10:13:22 +01:00
snipe 26b3c62ab8 Cleaned up category title 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-21 10:29:51 +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 5066eb58f4 Added asset model import to importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-17 02:31:03 +01:00
snipe 559f0d2f90 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:53:21 +01:00
snipe 43b338d612 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 16:15:58 +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
snipe dd458dfa7f Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 12:21:06 +01:00
snipe b917489f00 Corrected string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 12:10:41 +01:00
snipe 4356cb7b9b Added confetti option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 11:32:42 +01:00
Glukose1 d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
snipe 01c69c8f8f Allow optional status label on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:08:48 +01:00
Brady Wetherington cc5ad456e6 Expose the 'sanitize' system for backup restores to the web GUI 2024-08-14 15:59:21 +01:00
spencerrlongg 120cfd13c5 translation 2024-08-13 14:07:40 -05:00
snipe ce5be8ac24
Merge pull request #15100 from Godmartinz/depreciation_percentage
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Added Depreciation Percentage as an option
 2024-08-12 10:10:25 +01:00
Marcus Moore 6521c02526
Merge branch 'develop' into livewire-importer-improvements 
# Conflicts:
#	resources/views/livewire/importer.blade.php
 2024-08-07 15:20:39 -07:00
snipe a99ec062e6 Added checkbox for preferences 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:49:07 +01:00
Godfrey M 46a6a84ecb adds migration and translations 2024-08-06 11:07:39 -07:00
Spencer Long fd7082c30f
Merge branch 'develop' into bug/sc-23936 2024-07-29 14:00:00 -05:00
snipe aab29fbb6b Use translated string for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 16:47:40 +01:00
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
Godfrey M 950fff31ed fix conflicts 2024-07-24 12:12:04 -07:00
Godfrey M d5c9fa823e adds translations 2024-07-24 11:39:33 -07:00
snipe 7858c72b98 Fixed string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 20:45:12 +01:00
snipe 900c19b76d
Merge pull request #15143 from snipe/fixes/no-NO-language 
Switch to nb-NO from no-NO for Norwegian
 2024-07-23 18:25:27 +01:00
snipe 593554daed Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 18:14:19 +01:00
snipe fecd877e8b Migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:35:06 +01:00
snipe ba6d8ae8c7 Switch to nb-NO from no-NO 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:15:44 +01:00
snipe cea31c5b11 Added more generic buttons with variables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:53:01 +01:00
snipe c08bd8f88b Nicer consumables layout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:11:45 +01:00
snipe c4e7448d31 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:56 +01:00
snipe be17ef4047 Added option to restore from default demo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:06 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe d56252c6b3 Added more back :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 05:10:45 +01:00
snipe 44b950cb8e Added back in missing validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 05:07:50 +01:00
snipe 0ef58a9aef Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:42 +01:00
Marcus Moore 81bffccf01
Use better error message 2024-07-17 16:28:26 -07:00
snipe 16ae23dbeb Updated validation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:00 +01:00
snipe a3b2912e89 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:16:23 +01:00
snipe 7f412ec3f5 Missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:14:41 +01:00
snipe 94e881e5f0 Cleared up language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:11:03 +01:00
snipe 70d95877d8 Translations for license checkout errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:02:58 +01:00
snipe bb00edda4e Added basic jquery validation translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 20:54:48 +01:00
snipe 4895023f3b Translate import button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:56:02 +01:00
snipe 0ed637f0ce Translate importer header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:41:47 +01:00
snipe 45bf428092 Translated “seat” for license seat view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:04:51 +01:00
snipe 04f723327e Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:01:23 +01:00
snipe 5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command 
Adds a command to resend acceptance emails
 2024-07-11 20:37:04 +01:00
snipe da2b64c96d Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:24:08 +01:00
snipe 5597992d63 Fixed API key missing translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:17:46 +01:00
snipe 9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe f3bf74a540 Updated language files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:51:19 +01:00
snipe d834ef5104 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 21:52:37 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe 278bf3da13 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:38 +01:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
snipe bca6dd41d2 Added avif to translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-25 13:39:36 +01:00
snipe ce107dd688 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:39 +01:00
snipe ba4c51dd68 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:25 +01:00
snipe 294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string 
Additional translation strings
 2024-06-24 12:11:45 +01:00
snipe 9a0db72eb4 More strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:40:38 +01:00
snipe e11a42cf68 Re-use login string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:32:00 +01:00
snipe 114769c2d9 Made requestable items more generic in translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:26:45 +01:00
snipe 9594596b8a Fixed another hard-coded string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:22:27 +01:00
snipe 69cf697aa3 Added 2fa translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:20:52 +01:00
snipe 30c1e1e86a Merge remote-tracking branch 'origin/develop' 2024-06-20 14:32:46 +01:00
snipe 9e9c37c1e8 Fixed weird linebreaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:09:11 +01:00
snipe c8835bf5db Merge remote-tracking branch 'origin/develop' 2024-06-20 13:40:37 +01:00
snipe bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
snipe 430808e180 Merge remote-tracking branch 'origin/develop' 2024-06-17 15:52:13 +01:00
snipe 27063d5bae Fix weird layout in admin oauth [sc-25673] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 15:44:07 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe 877adb082c Fixed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 16:40:52 +01:00
snipe cff382605c Fixed some missing strings and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:01:04 +01:00
snipe 694e3b7f3a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 00:42:16 +01:00
snipe 3005565bba Slight tweak to language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:12 +01:00
snipe d27613f55c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:41 +01:00
snipe aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset 
Added Redirect options to asset check in/out
 2024-05-30 14:14:04 +01:00
snipe a46e2ebfd8 Small tweaks to user export, user view translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:59:00 +01:00
snipe f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset 2024-05-30 13:38:11 +01:00
snipe dc5e15f919 Added translation for external link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 11:02:07 +01:00
snipe ad7b291062 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:55:48 +01:00
snipe b54c1caa74 Improved translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:43:28 +01:00
snipe c3cf123189 Better translation for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:39:47 +01:00
Godfrey M 442903ea5e trying to get link to work, fixed up markup and url 2024-05-23 16:08:18 -07:00
Godfrey M d3ab152d30 adds reminder notification constructor and updates markdown 2024-05-23 12:47:02 -07:00
snipe 6a6272ace3 Translate no records found message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:47 +01:00
snipe bcb747f886 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:37 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
snipe 71b5bf2eef Added visual on the hardware view screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 0734d5b0b6 Added help text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe f158a369a4 Added/updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
Godfrey M 15cc4345ab adds dynamic redirects to Assets 2024-05-14 13:25:52 -07:00
snipe 1117f4289d Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:55:10 +01:00
snipe 8356b57fb4 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:34 +01:00
snipe 2888dd6fd8 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:37 +01:00
snipe 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
Marcus Moore ac8aab0043
Add default "select an option" to data source options 2024-04-22 12:22:10 -07:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
snipe c21142605d Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:47:56 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe 570944a48b Updated translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:38:52 +01:00
snipe 5829b02323 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:38:47 +01:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
spencerrlongg 99d7155729 translation strings 2024-04-07 19:50:53 -05:00
Godfrey M bc66c0f223 removes jquery and updates translation 2024-03-27 11:56:47 -07:00
snipe ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation 
Added validation around `pwd_secure_complexity`
 2024-03-26 20:05:04 +00:00
Marcus Moore b5b8777c94
Extract translation string 2024-03-26 12:23:57 -07:00
snipe 850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343 
Add new validator for custom field checkboxes and fix asset model default updates
 2024-03-26 19:22:29 +00:00
spencerrlongg 5cf1a6c300 new validator for radio buttons 2024-03-25 21:03:13 -05:00
snipe 1ffbdee156 Updated 2FA text to not be google authenticator specific 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:30 +00:00
snipe bd2812cac1 Added new string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:12 +00:00
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
Godfrey M 8b52d5da85 fixed typos, reordered jquery, fixed migrations 2024-03-18 12:36:54 -07:00
Godfrey M 57f5d4a570 deleted_msg saves to db 2024-03-18 10:45:47 -07:00
Godfrey M 4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
snipe 7b4ecb275f Use trans choice for language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:29:01 +00:00
snipe 7eed9f8542 Added Somali 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:06:21 +00:00
Marcus Moore f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
Godfrey M 6c3a668400 checks to see if a user has an email before sending them a reminder email. 2024-03-05 10:30:24 -08:00
snipe 1ce9df7998 New translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:27 +00:00
snipe a0423a9cc3 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:56 +00:00
snipe a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
snipe e8ad8a7448 Added email, phone icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 14:48:01 +00:00
snipe 1797480128 Few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:56 +00:00
snipe d5324bce6a Added more generic bulk translations for trans_choice 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:43:07 +00:00
snipe 660f3ccba1 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:28 +00:00
snipe 6237f6192c Added fieldset button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:14:18 +00:00
spencerrlongg d9c61fdb02 validation msg 2024-02-14 11:52:25 -06:00
snipe 43bb8ae0a8 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:44 +00:00
snipe 3806cec10e Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:28:05 +00:00