DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15780 commits 102 branches 268 tags 288 MiB
Commit graph

3826 commits

Author SHA1 Message Date
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
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 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
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
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 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 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
Florent Bervas b804791ff6 feature: extend search capabilities to other assets attributes 2024-08-05 12:26:29 +00:00
snipe a0bd8b6049 Fixed #15205 - adds copy to asset tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-02 20:56:31 +01:00
snipe f44abd0b28 Fixed button label
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-07-31 21:43:09 +01:00
Godfrey M b60e22bcb4 adds closing brackets to signature pad 2024-07-31 11:10:33 -07:00
akemidx 8d1fa362f7 restoring code 2024-07-31 07:13:42 -04:00
akemidx fccfce2ae8 first thought
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
2024-07-30 19:27:37 -04:00
Godfrey M eb6f330e67 adds status to check in and out 2024-07-30 09:38:39 -07:00
snipe 4eccb5ffc6
Merge pull request #15185 from arne-kroeger/feat/accesspories-checkout-to-location-or-asset 
Added #14979: add checkout to location and assets functionality to accessories
 2024-07-29 18:50:48 +01:00
snipe 1c1101aeac Use the pwd_secure_min value (plus 5) for generated password 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 14:26:18 +01:00
snipe bc18fac97e Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 10:11:11 +01:00
arne-kroeger b18baf74d2 added options to checkout accessoires to locations and assets 
Added #14979: add checkout functionality to accessoires
 2024-07-29 10:54:53 +02:00
snipe 28c7355697 Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-29 09:52:38 +01:00
snipe c3a296c19f Added qr code back 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-27 10:12:13 +01:00
snipe fc8bb82a02 Made dropdown wider 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:18 +01:00
snipe 5dea3f4495 Added blade component to checkin/checkout pages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:47:33 +01:00
snipe 759ab78f80 Added more redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 11:27:36 +01:00
snipe 243ab51def Fixed back button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:40:48 +01:00
snipe 73a80a5fbc Use blade component for redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 21:35:13 +01:00
snipe 62655be2d0 Fixed BYOD label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 18:41:37 +01:00
snipe 24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113 
Registered custom anonymous blade component directory
 2024-07-25 16:08:01 +01:00
snipe 9b422e5c97 Baremetrics BMPay breaks with CSP turned [sc-25011] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 21:42:20 +01:00
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
Godfrey M f05d8281f3 fixes alignment for error msg 2024-07-24 12:06:56 -07:00
Godfrey M 99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe 466ab1e3c0 Removed the banner since we already warn 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:40:24 +01:00
snipe 95a0f3dbe5 Cleaned up UI on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:26:55 +01:00
snipe 6f8ccd4e10 Fixes #15103 - Added EOL and audit into to user profile assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:54:33 +01:00
Marcus Moore 869c06f454
Register anonymous blade component namespace 2024-07-23 15:41:58 -07:00
snipe 20868b9ede Load the english file again in case BS table doesn’t have a translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:30:42 +01:00
snipe e08acb851c Removed env part, just check for the remote user login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:18:33 +01:00
snipe bbad84c6cc Hides the “Disable Other Login Mechanisms” option via env 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:13:59 +01:00
snipe 38affea3f3 More updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:57:10 +01:00
snipe 2bfee0c29a Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:21:11 +01:00
snipe c08bd8f88b Nicer consumables layout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:11:45 +01:00
snipe ffd2687734 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:46 +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 fc86eefeac Show existing images on user edit page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:27:28 +01:00
snipe 8b05ef6db4 Updated url checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:48:03 +01:00
snipe c50ab1af67
Merge branch 'develop' into develop 2024-07-19 19:00:56 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe 4465aef991
Merge pull request #15114 from snipe/checkout_multiple_accessories 
Checkout multiple of an accessory in one checkout
 2024-07-18 17:38:19 +01:00
snipe ee589ca112
Merge pull request #15088 from mauro-miatello/develop 
Added EULAs in print user's assets
 2024-07-18 09:09:34 +01:00
Marcus Moore cfca1514c0
Swap file_id for activeFileId 2024-07-17 16:22:44 -07:00
snipe 05e278d08b Added qty to email 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 20:58:21 +01:00
snipe c21821a864 Added new form fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 20:58:12 +01:00
snipe 239824681d
Merge pull request #15075 from akemidx/checkintranslation 
FIXED: Missing Translation on a Tooltip
 2024-07-17 18:16:02 +01:00
Marcus Moore eba494ad8c
Make $activeFile a computed property 2024-07-16 17:03:42 -07:00
Marcus Moore 7e89b58746
Move files to computed property 2024-07-16 16:08:42 -07:00
Marcus Moore b7744105a0
Migrate import type to component 2024-07-16 14:20:41 -07:00
snipe 65dcb2a9bd
Merge pull request #15085 from snipe/small_tweaks_to_oauth_page 
Small layout tweaks to oauth page
 2024-07-16 21:36:17 +01:00
Marcus Moore 69263f0e5b
Migrate header row to component 2024-07-16 13:30:29 -07:00
snipe d53a032402 More consistent UI for indented checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:07:03 +01:00
snipe bb00edda4e Added basic jquery validation translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 20:54:48 +01:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07: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 e6f2c457a8 Handle localization better, clearer indenting on addresses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:01:50 +01:00
snipe 4a9bd95ed3 Added language support for select2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 18:40:10 +01:00
snipe eb9e276ba7 Fixed #15094 - wrong translation string for model on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 17:14:13 +01:00
MrM e49c96a35e
Added EULAs in print user's assets 
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
 2024-07-14 19:10:33 +02:00
snipe 2d1aeca949 Re-use existing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:24:56 +01:00
snipe e06e4db4b7 Small layout tweaks to oauth page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:16:03 +01:00
akemidx ad818cf886 missing translation 2024-07-11 17:13:47 -04: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 78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets 
Fixed inconsistent attributes order in Print All Assigned report
 2024-07-11 17:30:41 +01:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +01:00
snipe 23f1489b2b Added history tab 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:46:49 +01:00
snipe 58bc84436c Fixed incorrect jquery validation class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:23:05 +01:00
snipe 2415408a50 Prevent ludicrious amount of min_qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:41 +01:00
snipe 67d6f7119d Prevent a ludicrous amount of consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:04 +01:00
snipe d9a114090b Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:33 +01:00
snipe e123eeea9e Added error message if category type is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:00:20 +01:00
Florent Bervas d9a53460ff Fix design inconsistency between assets and assigned assets in Print All Assigned report 2024-07-11 09:41:58 +00:00
snipe 8be44f9cf2 Check for time until depreciated 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 10:07:58 +01:00
snipe 71a5d07698 Fixes #15056 - only try to load avatars if one exists or default is set 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-10 08:56:14 +01:00
Godfrey M 624632d0ca removed push and endpush 2024-07-09 11:41:31 -07:00
snipe f4ffbcf76e Fixed wonky layout on accessory files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:38:50 +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 09cc9b92d1 Fixed #15050 - erroneous deleted remark 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:13:07 +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 4c19b4d831 Added aria-hidden="true" to error icon for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 17:39:38 +01:00
snipe 86c0a3ecad Added localization for bootstrap-tables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:12: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 3f20e29901 Moved gthe settings for remote loading to the branding section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:55:47 +01:00
snipe 44bcc157e5 Updated icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:46 +01:00
snipe e372527d13 Added default_avatar to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:22:36 +01:00
snipe 96be1e1275 Removed duplicate locale directive 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 02:14:10 +01:00
snipe 708d7b5fc5 Use icons for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:43:44 +01:00
snipe 62b5a159a9 Added files column 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:31:09 +01:00
snipe a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge 
Fixed #15005 - Improvements  on user merge
 2024-07-03 23:19:50 +01:00
snipe 0071596274 Added upload count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:43 +01:00
spencerrlongg a6690493b0 resolved 2024-07-03 16:12:55 -05:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
snipe f22e99aec8
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades 
Use more modern reference for input text
 2024-07-02 08:43:34 +01:00
Marcus Moore 3a8f825de5
Link user table counts to section in user show 2024-07-01 14:06:05 -07:00
Marcus Moore d481850d4c
Add @can around Edit Your Profile button on view assets page 2024-07-01 10:11:27 -07:00
snipe d687b20467 Use more modern reference for input text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 15:05:47 +01:00
snipe 54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 
Updated Livewire to v3
 2024-06-27 13:21:52 +01:00
snipe f23a221750
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms 
WIP - First start at switching to regular html labels
 2024-06-27 13:12:29 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe 4d55765e28 Added checkbox to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:53 +01:00
snipe aa5fe52e89 Added gate in blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:56 +01:00
snipe f47bc5ea7d Updated hardware checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 19:40:52 +01:00
snipe 427615f627 Fiest start at switching to regular html labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 18:24:23 +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 6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit 
Added some  style changes in label field selector for the `DefaultLabel` template
 2024-06-20 13:51:49 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe 941582ac2a Properly scope archived based on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:27:11 +01:00
Marcus Moore a3dea99bbb
Fix category edit form component 2024-06-17 14:24:16 -07:00
Marcus Moore fc351a1896
Remove .live from oauth clients 2024-06-17 13:03:27 -07:00
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -07: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 891a0a0965 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-06-17 13:05:31 +01:00
snipe 50f0797850 Added aria hidden to icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:05:27 +01:00
snipe d9cc3c3ec7 Removed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:52:23 +01:00
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
snipe cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +01:00
snipe 7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users 2024-06-12 11:27:26 +01:00
snipe f8ab9f62f6
Merge pull request #14842 from Godmartinz/adjust-preview-window 
Fixed label preview window position
 2024-06-07 18:09:56 +01:00
Godfrey M 77e6058e4c remembers chosen label 2024-06-06 13:55:15 -07:00
Godfrey M 4a60026162 moves preview down by field definitions 2024-06-06 13:42:06 -07:00
Godfrey M 3621292a0e removes unnecessary height 2024-06-06 13:28:05 -07:00
Godfrey M 6df1c36011 oops 2024-06-06 13:24:02 -07:00
Godfrey M 44dae22a3c adjust label preview window 2024-06-06 13:18:19 -07:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 20:40:45 +01:00
Marcus Moore 60c7efae3c
Remove commented code 2024-06-05 11:48:10 -07:00
snipe e054fc1ef1 Removed noisy import debugging, made nicer output 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe f4d530b4b1 Removed filename column since it’s never worked 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 9d56617caf Moved expected checkin date on view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 832ceeba56 Fixed missing endpush 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 09:57:10 +01:00
Marcus Moore b2a0e7958b
Inject alpine on label engine page 2024-06-04 17:03:36 -07:00
Marcus Moore ef91c8123e
Remove unneeded re-render of select2 2024-06-04 15:49:57 -07:00
Marcus Moore 296cf3e34b
Update OauthClients component 2024-06-04 15:37:41 -07:00
Godfrey M 6202f6157a fix select2 behavior 2024-06-04 08:41:00 -07:00
snipe a15ed6eaee Wrap disabled <a> links in a span for tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:29 +01:00
snipe 1d97d95c10 UI and styling tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:34 +01:00
snipe 4a1b1675cb Use storage helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:09 +01:00
snipe 8c5249ba4b Disable buttons on view page if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:53 +01:00
snipe b936591240 Warn and disable on checkout if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:34 +01:00
snipe 76e664d647 Warn and disable the checkout button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:18 +01:00
snipe 0253c2a756 Lauout tweaks, warn and disable button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:57 +01:00
Marcus Moore 1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	app/Livewire/LoginForm.php
#	package.json
#	resources/views/livewire/login-form.blade.php
 2024-05-30 16:56:50 -07:00
Marcus Moore 1a1b891309
Remove unused Login Livewire component 2024-05-30 16:49:05 -07:00
Marcus Moore 2eaac3d381
Fix select2 re-renders 2024-05-30 16:20:04 -07:00
Marcus Moore f03249898a
Update id syntax in custom fields component 2024-05-30 16:12:52 -07:00
Godfrey M 0ee441a976 adds hidden as well 2024-05-30 11:19:06 -07:00
Godfrey M cf8de3baa9 fix checkin option from appearing 2024-05-30 11:11:35 -07: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
Marcus Moore e80b80f5d1
Remove manual livewire tags 2024-05-29 16:04:05 -07:00
Marcus Moore 9e35441281
Importer fixes 2024-05-29 15:50:42 -07:00
Godfrey M e28ad50bec fixes the color change 2024-05-29 15:34:08 -07:00
Marcus Moore 7d95e7765d
Add a few .prevents 2024-05-29 14:13:29 -07:00
Marcus Moore 8d924b60d7
Replace references to @this in importer 2024-05-29 13:51:57 -07:00
Marcus Moore 34595c266d
Update script tag 2024-05-29 13:16:30 -07:00
Marcus Moore 638ae9bdd5
Use new id method 2024-05-29 13:15:59 -07:00
Godfrey M 713ce7836f add some css in label field selector 2024-05-29 13:07:33 -07:00
Marcus Moore 43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00
Marcus Moore 73e3ac7dd8
Migrate to $dispatch 2024-05-29 12:18:31 -07:00
Marcus Moore 45419586fe
Migrate away from wire:model.prevent 2024-05-29 12:11:33 -07:00
Marcus Moore d8a480b2a8
Migrate to wire:model.blur 2024-05-29 12:11:02 -07:00
Marcus Moore 29d87246a2
Migrate away from wire:model.defer 2024-05-29 12:10:46 -07:00
Marcus Moore 58e638d3cb
Migrate to wire:model.live 2024-05-29 12:08:25 -07:00
snipe 12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout 
Bulk Consumable Checkout
 2024-05-29 19:42:25 +01:00
snipe 7bbee053c6 Updated fa icon call 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 19:19:45 +01:00
snipe 369c819a27
Merge pull request #14754 from Godmartinz/footer_user_bug 
Removed extra div from User Details.
 2024-05-29 11:29:02 +01:00
snipe a5d0a21757 Fixed string path 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 00:26:33 +01:00
snipe df882bbcbc Pass item’s currency if set by location 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 10:24:10 +01:00
snipe b3fe10baa8
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets 2024-05-25 11:19:43 +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
snipe 3a2900621c Changed icon, added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:20:52 +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
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
Godfrey M c4d96f6ea3 removed extra div 2024-05-22 12:35:32 -07:00
snipe c9f7847fb3
Merge pull request #14745 from snipe/fixes/self_api_endpoint 
Refactor group syncing on user edit API endpoint
 2024-05-22 12:43:22 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
Godfrey M 9f02be0823 removed extra div 2024-05-21 10:15:18 -07:00
Godfrey M b5553af8ed rename variable 2024-05-21 10:11:53 -07:00
Godfrey M 4d6f4303f5 fixed partial up 2024-05-21 10:11:01 -07:00
Godfrey M 8a0afae90f fixed query, fixed no email logic, needs new markdown 2024-05-21 09:42:00 -07:00
snipe a7ccf0efff Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 09:56:51 +01:00
Godfrey M db9c435ae0 removed extra div tags 2024-05-20 10:48:57 -07:00
Godfrey M 280c03dcad remove license checkout changes 2024-05-20 10:25:59 -07:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe 6a6272ace3 Translate no records found message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:47 +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 30f738646e
Merge pull request #14700 from marcusmoore/chore/sc-25471 
Updated alpine to the latest version (3.13.10)
 2024-05-15 19:59:51 +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 ab8b40745e Added next audit date to create/edit asset screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 16ec47573b Added help text to bulk edit blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 556d0b44a3 Added asset 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00