DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15221 commits 101 branches 268 tags 320 MiB
Commit graph

4669 commits

Author SHA1 Message Date
Godfrey M 9858b0f37f fixes info tab for users and assets 2024-08-20 14:23:55 -07:00
snipe 5fdeb9c413
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20 
Updated languages
 2024-08-20 19:42:08 +01:00
Marcus Moore eca6b03f44
Allow id to be rendered 2024-08-20 11:08:53 -07:00
Marcus Moore bbdbec7197
Rely on $attributes behavior rendering passed attributes 2024-08-20 11:00:39 -07: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
snipe f6319e11e7 Added fa-fw to sidebar elements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-20 10:11:27 +01:00
snipe 5d9f988df3 Added fw class to topnav icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-20 10:01:49 +01:00
snipe f8c72fb0ac
Merge pull request #15112 from marcusmoore/livewire-importer-improvements 
Improved handling attempted access of deleted files in importer
 2024-08-20 09:57:03 +01:00
Marcus Moore fa765667f2
Merge branch 'develop' into livewire-importer-improvements 2024-08-19 14:41:58 -07:00
Marcus Moore 434bdcd6d4
Add missing parentheses to conditional 2024-08-19 14:31:47 -07:00
snipe be5f3f38f8 Settings pages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:48:12 +01:00
snipe 08c3a25b39 Little more padding 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 14:16:57 +01: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 d89c8682be Reversed location button ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:46:31 +01:00
snipe 6f024849e9 Few more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:39:24 +01:00
snipe e048f0955f More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:27:21 +01:00
snipe 479b2b4fd3 More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:23:08 +01:00
snipe 8d52fa51b1 Fixed suppliers buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:20:06 +01:00
snipe 229d8b9bf5 Added location restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 13:19:59 +01:00
snipe eb8d43a804 Updated buttons on models 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 12:32:44 +01:00
snipe b4b6f7a35f Added css-consumable to overrides for table headers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:21 +01:00
snipe 0bc995b87f Updated more icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-19 11:58:05 +01:00
snipe 00bc9ac806 Fixed spacing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 22:39:14 +01:00
snipe f200960a57 Aaaand more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 22:26:57 +01:00
snipe c700127f1a Updated user view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 22:09:00 +01:00
snipe ae2f9571b4 And still more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 21:57:37 +01:00
snipe a77dcad336 More links 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 20:30:53 +01:00
snipe d2e889e927 Still more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 19:21:59 +01:00
snipe 803bdb457c Added calendar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:48:19 +01:00
snipe 7c9b1f6e38 Added the plus icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:39:22 +01:00
snipe d545537a43 More icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:34:13 +01:00
snipe 4d8904938d Added calendar icon for datepickers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:24:26 +01:00
snipe 0c09f2b2c0 Moar icon replacement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 18:13:49 +01:00
snipe bffba02511 Updated icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 17:26:44 +01:00
snipe da71f031f5 Use icon in hardware view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:48:24 +01:00
snipe d2e585baa7 Added icon blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 15:47:45 +01:00
snipe 4253acad4c Prevent passing an array as login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-18 04:51:36 +01:00
snipe 559f0d2f90 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 22:53:21 +01:00
snipe 7658f7c41d First shot 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 20:29:53 +01:00
snipe ad6d09b6ad Removed default label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 16:43:51 +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 90584ab803 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-08-16 11:11:00 +01:00
snipe 184f54a6cd Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 11:10:57 +01:00
snipe f24031b974
Merge pull request #15206 from Godmartinz/dashboard_box_alignment 
Fixed dashboard box overflow
 2024-08-16 11:10:40 +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
snipe f9172594b2 Clearer time example display 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 10:14:43 +01:00
Marcus Moore 94d8a547b8
Merge branch 'develop' into livewire-importer-improvements 2024-08-15 13:47:49 -07:00
Marcus Moore 43b109fac0
Use cached values for textarea and radio input 2024-08-15 13:20:22 -07:00
Marcus Moore 75c1e7658f
Improve method name 2024-08-15 10:43:41 -07:00
Marcus Moore e7c9c799bb
Add wire:keys 2024-08-15 10:40:23 -07:00
Marcus Moore 6ab976f353
Use cached values for text input 2024-08-15 10:32:33 -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 6216b4fc0d Use native browser control for required in addition to the css effect 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 11:35:56 +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 10dc1f1368 Re-pull the accessory checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:51:49 +01:00
snipe 8f7bce7aad Re-added UI for checkout to non-users for accessories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:44:27 +01:00
snipe 381003eeab Cleaned up asset tag field on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:27:31 +01:00
snipe d268f25f16 Make asset tag required 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:16:57 +01: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
spencerrlongg afaf53cdfc failing ui test 2024-08-14 18:14:21 -05:00
spencerrlongg a70b94e707 Merge branch 'refs/heads/develop' into bug/sc-26584 2024-08-14 11:36:19 -05:00
Brady Wetherington 008bf036b5 Got rid of weird namespace declaration and commented-out data-toggle line 2024-08-14 16:09:34 +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 0f1e5181a6 Nicer input layout for bulk edit name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-14 10:09:14 +01:00
snipe 371afde52d Bulk edit asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-14 09:52:25 +01:00
Marcus Moore 038e86954b
Improve property name 2024-08-13 17:30:53 -07:00
Marcus Moore f6c1642bf2
Use computed fields in CustomFieldSetDefaultValuesForModel component 2024-08-13 17:01:35 -07:00
spencerrlongg 120cfd13c5 translation 2024-08-13 14:07:40 -05:00
snipe e9fc455a30
Merge pull request #15192 from Godmartinz/status_labels_check_emails 
Added status labels to confirmation emails
 2024-08-13 18:24:15 +01:00
Godfrey M 8af4126de1 removed indent from blades 2024-08-13 10:21:33 -07:00
Godfrey M 5d1c48c071 fixes alignment, and box issue with pie chart 2024-08-13 10:11:49 -07:00
snipe 3044af9410
Merge pull request #15280 from snipe/bug/sc-23294 
Fixed select2 “x” color on multi-select and border color
 2024-08-13 16:46:56 +01:00
snipe 4f0f0af83b Make the border radius match the rest of the site 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-13 16:46:26 +01:00
snipe 198afee946 Fixed select2 “x” color on mult-select and border color 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-13 16:42:23 +01:00
snipe def0af652d
Merge pull request #15279 from TelecomsSansFrontieres/fix_missing-translate-item-assets 
Fix: add missing admin/hardware/table.name key
 2024-08-13 16:35:25 +01:00
Florent Bervas 20e4ba0590 lang: relocated translation key to existing item in general 2024-08-13 15:07:54 +00:00
snipe 389a06aac5 Hide UI elements from print view on assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-13 15:40:51 +01:00
snipe 277a0fd16a Make selected tab bold 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-13 14:19:41 +01:00
snipe 1b2094f4e2 Added tooltips to top nav shortcuts 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-13 13:49:13 +01:00
snipe 3f2139349e Allow better fallthrough on image 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 16:30:21 +01:00
snipe 225ab47b8e Simplified logic 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 16:23:09 +01:00
snipe 4c350bd5a3 Remove the regular logo fallback, make image capped by height 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 16:21:58 +01:00
snipe e7fb29fced Fixed copy area for serial 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 15:58:30 +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
snipe 5c6c655cdc Added sounds to quickscan checkin
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-10 19:37:18 +01:00
snipe 1c229a8e08 Made notes field sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:00:11 +01:00
snipe f3331b5045 Removed pound symbol from order number on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 16:17:07 +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
snipe b4d51599ee Added sound effects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:38:50 +01:00
snipe ef183f256c
Merge pull request #15242 from Godmartinz/shortcut_option
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 
Fixed shortcuts to be optional now
 2024-08-07 18:56:27 +01:00
Godfrey M 3a96e501cc use old school input 2024-08-07 10:54:06 -07:00
Godfrey M 6b1784f2ee makes shortcuts optional 2024-08-07 10:47:16 -07:00
snipe 0dc7e8b8dc Temp removed other selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 18:04:52 +01:00
Godfrey M 46a6a84ecb adds migration and translations 2024-08-06 11:07:39 -07:00
snipe b83d148b37
Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag
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 
Feature: Extend search capabilities to other assets attributes
 2024-08-05 15:38:51 +01:00