DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
15089 commits 95 branches 267 tags 294 MiB
Commit graph

994 commits

Author SHA1 Message Date
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
r-xyz 4ec361c718
Add AssetModel files endpoints to API 2024-08-21 19:49:51 +02:00
snipe 26b3c62ab8 Cleaned up category title 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-21 10:29:51 +01:00
snipe 6c450d1338 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-20 18:18:17 +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 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
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 5b8529bc83 Fixed pluralization 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 19:16:08 +01: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 2a0697022e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 17:47:22 +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