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

4527 commits

Author SHA1 Message Date
akemidx 6d3fa12f37 white texty for dropdown lists 2024-04-09 14:52:43 -04:00
Godfrey M 052f1eedd0 fixes signature canvas refresh on mobile 2024-04-09 10:30:33 -07:00
Godfrey M 858da800be attempting to lock screen orientation 2024-04-09 09:40:39 -07:00
snipe 90cf612ac7 Remove city as required field on location modal 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-08 10:50:52 +01:00
spencerrlongg 99d7155729 translation strings 2024-04-07 19:50:53 -05:00
akemidx f7f199d929 black hover bg for dark yellow theme 2024-04-04 15:51:46 -04:00
akemidx 5519fddb78 new clean branch for color change 2024-04-04 15:50:30 -04:00
Godfrey M a9ed748fb2 adds audit dates to label options 2024-04-04 11:39:49 -07:00
steve@degga.net 83443ad2b5 Sometimes I should just slow down. 2024-04-04 11:36:21 -04:00
steve@degga.net 3fcc067481 Removes accidental changes on two lines 2024-04-04 10:27:44 -04:00
snipe dcba2bfd25
Merge pull request #14529 from mauro-miatello/develop 
Hide/Show encrypted values in hardware list
 2024-04-04 15:07:58 +01:00
steve@degga.net 3e564eaf19 fixed accidentally forgot update a call to the old dynamicWarrantyUrl() method in hardware/view.blade.php 2024-04-03 20:09:37 -04:00
Godfrey M 5afe024644 changed translation on asset acceptancen blade 2024-04-03 11:40:48 -07:00
Godfrey M df5cacf8a2 removed front end if statement 2024-04-03 11:06:05 -07:00
Godfrey M 5f7f4c9b91 aligns dropdown menu for user in nav 2024-04-03 10:41:50 -07:00
snipe 01852c7188
Merge pull request #14520 from Godmartinz/loading_overlap_bug 
fixes z-index of table load
 2024-04-03 13:07:14 +01:00
snipe 79c5697042 Fixed dev - take 2! 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-03 13:06:49 +01:00
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
steve@degga.net 83ce04dc8d Fixes syntax error. 2024-03-31 22:31:06 -04:00
steve@degga.net f7bbec6be4 Makes all manufacturer URLs dynamic, not just warranty lookup. 2024-03-31 22:18:44 -04:00
MrM 658ba092e2
Hide encrypted values in hardware list 
Encrypted values are now hidden also in hardware list, clicking on them show the decrypted value
 2024-03-31 18:55:58 +02:00
MrM b221d99e7b
Encrypted values enhancement 
Show asterisks instead of the value, respecting the length of the field
 2024-03-31 12:27:35 +02:00
snipe df4e6a0023 Fixed typo in Polish 
I will fix this in CrowdIn shortly

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 12:47:43 +00:00
Godfrey M a450530c74 fixes z-index of table load 2024-03-28 11:44:55 -07:00
snipe 57010b4c23
Merge pull request #14500 from Godmartinz/add-accessory-signature-to-print-all 
Added signature to user print report for Accessories and Consumables
 2024-03-27 19:02:59 +00:00
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00:00
snipe 7782e5cc93 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 18:59:28 +00: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
Godfrey M 84cc88831d adds signature for components 2024-03-26 12:18:10 -07:00
Godfrey M f4f9b165a7 moves signature check inside of td 2024-03-26 11:24:34 -07:00
Godfrey M 3222d4c8df adds signature check 2024-03-26 09:18:34 -07:00
Godfrey M 3173ead2e7 adds accessory signature to user print report 2024-03-26 09:11:54 -07:00
Godfrey M 040f826c52 removes encrypted fields as a selectable option for labels 2024-03-26 08:57:18 -07:00
snipe f450cafe3e Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:29:25 +00:00
snipe a4e5ae0938 Removed duplicates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:20:27 +00:00
snipe 77dacfcc30 Show if deleted supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:19:29 +00:00
snipe 0d9b6eaf71 Added supplier details to license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:18:04 +00:00
snipe 9df84e235c Check for config variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:54:40 +00:00
snipe 566ba4783e Fixed #14483 - adds deeplinking to search/sort/pagination 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:50:01 +00:00
snipe 31a57cdf14 Fixed #14482 - bad method call on restore from view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:18:59 +00:00
snipe 7ebbef25e7 Standardize button styling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:18:36 +00:00
spencerrlongg 5cf1a6c300 new validator for radio buttons 2024-03-25 21:03:13 -05:00
Marcus Moore bd506820b7
Display error message 2024-03-25 17:59:39 -07:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
snipe c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox 
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
 2024-03-21 12:55:25 +00:00
snipe 945e8b402f Only offer the 2FA reset if the user already has 2FA set up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:52:51 +00: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
snipe f2a5eac256 Tightened up 2FA text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:05 +00:00
snipe de18e449a6
Merge pull request #14464 from snipe/features/toggle_all_columns 
Added "toggle all" to column selector
 2024-03-20 21:26:23 +00:00
snipe 1f586d3102 Removed data-show-columns-toggle-all data attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:25:16 +00:00
snipe e5d01170d2 Fixed locale, added showColumnsToggleAll and minimumCountColumns 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:24:59 +00:00
snipe a0a5480c97 Added default location to print all assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 18:55:47 +00:00
snipe 3b66912742 Fixed #14460 - added support for avif 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:25:02 +00:00
snipe 278a25c63b Added toggle all to column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:14:41 +00:00
snipe 0d124bb5a1 Fixed indent 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:08:35 +00:00
snipe 3d306aacc5 Fixed mismatched HTML tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 11:52:51 +00:00
snipe ddf81ba135 Wider country dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 11:00:06 +00:00
snipe c7083488b2
Merge pull request #14447 from snipe/feature/sc-25020_better_print_view 
Add additional options to print all assigned view
 2024-03-19 15:01:50 +00:00
snipe 4b4d383509 Removed - it’s for another PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-19 15:00:26 +00:00
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
snipe 21e23baa37 Fixed ternary 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 21:28:46 +00:00
snipe fcd130ae15 Layout improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 21:17:46 +00: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
Godfrey M 0fd99d410e adds a text field and jquery to show/hide text field 2024-03-18 09:36:09 -07:00
snipe 002fd4ce30 Nicer formatting for signoff 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:44:51 +00:00
snipe 7b4ecb275f Use trans choice for language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:29:01 +00:00
snipe 2df5d3a8ff Fixed column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:06:08 +00:00
snipe d0d4d14787 Make sure the category is still valid before displaying on view assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 12:29:00 +00:00
snipe 0e2aaebda4
Merge pull request #14406 from mauro-miatello/develop 
Hide/Show ecnrypted values when click on the lock icon
 2024-03-18 12:19:54 +00:00
snipe 85123b3e66 Rework print page 
Still seeing a weird error tho, not done yet

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-13 12:36:17 +00:00
Godfrey M bf0bd06f20 put important back 2024-03-11 15:56:53 -07:00
Godfrey M f07b0b6bd7 removed important 2024-03-11 15:54:59 -07:00
Godfrey M 717b26c834 fixes z-index of date-picker 2024-03-11 15:53:59 -07:00
snipe b049bb1d5c Check for null on select 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:55:49 +00:00
snipe c5c6b3bbc6 Starting the revised print page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:23:25 +00:00
snipe 3f5cc2507d Used updated_at instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:39:49 +00:00
MrM 8abd359b5b
Script to hide / show encrypted values in web ui 
added a function to show/hide encrypted values with a simple trick because ClipboardJS can't copy display:none element's value
 2024-03-10 15:18:54 +01:00
MrM 9359809b4f
Hide / Show encrypted values in web ui 
added a span element to hide encrypted values
 2024-03-10 15:09:46 +01:00
snipe 28ec0b8ebb Removed debugging console lines 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 17:19:31 +00:00
snipe 7eed9f8542 Added Somali 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:06:21 +00:00
snipe b9aeded957 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:01:34 +00:00
Marcus Moore f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
snipe 4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug 
Default label setup with custom fields
 2024-03-07 10:33:43 +00:00
Godfrey M feb78d00cf conditionally shows label fields if on old label engine only 2024-03-06 11:25:49 -08:00
spencerrlongg a251e61d73 rm commented code and add comment 2024-03-05 13:40:44 -06:00
spencerrlongg af06b1cd06 hide encryption option for checkbox and radio 2024-03-05 13:37:30 -06:00
Brady Wetherington 5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00: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
Godfrey M 95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
snipe 10ac2c830f Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:17:02 +00:00
akemidx eb0657c953
Merge branch 'develop' into bug/sc-24812 2024-02-28 17:22:16 -05:00
snipe 3da47cdacd Removed header for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 15:03:34 +00:00
snipe 658dda916c Changed operator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 15:01:00 +00:00
snipe 1ce9df7998 New translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:27 +00:00
snipe a0cbf66c81 Only show tabs if there are requestable assets/models 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:20 +00:00
snipe ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728 
Added `min_amt` functionality to licenses
 2024-02-28 11:26:25 +00:00
snipe 92eff653f1 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:26:03 +00:00
snipe 1e66985a78
Merge pull request #14344 from snipe/features/added_created_by_to_groups 
Added created_by to groups table
 2024-02-28 11:19:52 +00:00
snipe b5603fbfe9 Added min amt to license blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:09:07 +00:00
snipe a0423a9cc3 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:56 +00:00
snipe 767cf96010 Added min_amt to form 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:33 +00:00
snipe 3ccc55a78f Added license min amt formatter for BS table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:06:50 +00:00
snipe 0bd27d61b0 Added created_by to groups table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 08:15:59 +00:00
Godfrey M b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08:00
MrM 9475871edb
Fix multiple tooltip issue 
If there are multiple tooltips, they all report the message "copied" because there is no element selection. This fix resolves the issue.
 2024-02-25 14:48:05 +01:00
MrM b69364d5ff
Add copy of encrypted custom fields 
Encrypted custom fields may contain sensitive or important information, and it may be useful to have the ability to copy them.
 2024-02-25 14:47:06 +01:00
snipe a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
snipe 4a37632ef3 Check for valid supplier in license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 10:48:53 +00:00
snipe e494a2670f
Merge pull request #14321 from akemidx/accessory_pdf_dl_link 
Adding in PDF download to Accesories/Asset/License Histories
 2024-02-23 08:18:55 +00:00
Godfrey M 550f9e2afa removes visibility checkmarks for certain fields when in new label engine 2024-02-22 16:19:28 -08:00
Godfrey M c0215baca5 minor changes 2024-02-22 11:41:04 -08:00
Godfrey M c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
snipe e8ad8a7448 Added email, phone icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 14:48:01 +00:00
akemidx 0f3be4fdf8 adding in eula pdf dl link. mimics activity log 2024-02-21 17:45:10 -05:00
Brady Wetherington 8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10 
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
 2024-02-21 20:22:28 +00:00
snipe 71610fb20f
Merge pull request #14304 from snipe/feature/sc-24018 
Added ability to bulk delete locations
 2024-02-20 18:14:51 +00:00
snipe cb0f9024b1 Fixed gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:56:40 +00:00
snipe 1797480128 Few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:56 +00:00
snipe 9010b7acd0 Use isDeletable instead of asset count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:10 +00:00
snipe b57b68571e Added blade views 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:44:45 +00:00
snipe 1ca9420baa Fixed incorrect gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:44:29 +00:00
snipe 0383938536 API-ify the managed locations tab in user view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:44:20 +00:00
snipe 50b841d54d Added table data-dash attributes to make the checkbox stuff work 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:43:57 +00:00
snipe 8f71460fa1 Formatting changes only 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:43:27 +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 30f9acfcf3 Disallow uploads in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 16:11:17 +00:00
snipe db73f80058 Starting off 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-16 18:57:50 +00:00
snipe 00cea3eb3c Merge remote-tracking branch 'origin/develop' 2024-02-15 14:45:30 +00:00
snipe 6237f6192c Added fieldset button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:14:18 +00:00
snipe cc58d4c3ad Nicer form UI 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:08:06 +00:00
spencerrlongg d9c61fdb02 validation msg 2024-02-14 11:52:25 -06:00
snipe 50c910461a Merge remote-tracking branch 'origin/develop' 2024-02-14 11:36:28 +00:00
snipe 43bb8ae0a8 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:44 +00:00
snipe 1dfa1da0ee Disable the edit button if permission is not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:10 +00:00
snipe 56ba26eb45 Disallow editing of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:07 +00:00
snipe adb8be9345 Added bootstrap formatting to show deleted assets more clearly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:57:57 +00:00
akemidx 4093327b7f adding in Last Checkin Date to Hardware view and index 2024-02-13 16:52:12 -05:00
snipe 280e778749 Merge remote-tracking branch 'origin/develop' 2024-02-13 13:46:52 +00:00
MrM 6f0fe16b87
Update default.blade.php 
removed some repeated attributes
 2024-02-11 18:45:37 +01:00
snipe 84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe ca62481083 Added button and route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:23:13 +00:00
snipe 1c3306046c Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2024-02-08 23:14:54 +00:00
snipe a7af987322
Merge pull request #14229 from Godmartinz/select2-target-fix 
Fixed select inputs un-select2-ifying on mobile
 2024-02-08 23:04:55 +00:00
Godfrey M c4eaae923a removed vue comments since they do not apply anymore 2024-02-08 15:02:47 -08:00
snipe 3412b4dc5a Merge remote-tracking branch 'origin/develop' 2024-02-08 14:58:24 +00:00
snipe a3b96aff1f
Merge pull request #14233 from uberbrady/prevent_svg_injection_with_fake_extensions_rebased 
Fixes file upload XSS vulnerability [sc-24156]
 2024-02-08 14:56:59 +00:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
snipe 4a43ccfa92
Merge pull request #14228 from akemidx/bug/sc-23516 
Fixed: 404 Error on Importer When Uploading a .csv Under Certain Circumstance
 2024-02-08 13:43:07 +00:00
Godfrey M cfe2277a64 forgot to remove comment line 2024-02-06 13:05:04 -08:00
akemidx e776c2cffa formatting the button tag 2024-02-06 15:51:04 -05:00
Godfrey M ca59bc3c9c removes if statement that prevents select2-ifying inputs 2024-02-06 12:46:17 -08:00
akemidx 575362f4dc adding in line to null out the active file on click of button 2024-02-06 15:38:07 -05:00
snipe f0139c5e41 Merge remote-tracking branch 'origin/develop' 2024-02-06 18:25:19 +00:00
snipe 5f8ac66036
Merge pull request #14223 from Godmartinz/user-bulk-edit 
Fixed Select2 functionality in User bulk check-in Delete User
 2024-02-06 18:22:46 +00:00
Godfrey M 5aa34695a1 z 2024-02-05 16:41:29 -08:00
snipe 383e3829e5 Merge remote-tracking branch 'origin/develop' 2024-02-05 19:04:40 +00:00
snipe 4c967a43a7 Removed loading of assets for label count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:56:51 +00:00
snipe deca842eb0 Merge remote-tracking branch 'origin/develop' 2024-02-05 18:35:56 +00:00
snipe 3806cec10e Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:28:05 +00:00
snipe a800fa07f9 Removed duplicate string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:27:58 +00:00
snipe 32c360f032 Re-added UI for load_remote 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:23:52 +00:00
snipe 25f1445afc Merge branch 'master' of https://github.com/snipe/snipe-it 2024-02-05 17:26:54 +00:00
snipe 8316db9702
Merge pull request #13805 from gitgrimbo/more_line_based_markdown 
Use parseEscapedMarkedownInline for more views
 2024-02-05 17:19:41 +00:00
snipe 650aa25659
Merge pull request #14191 from Godmartinz/googlechat_webhook 
Added support for Google Chat notifications
 2024-02-05 17:10:54 +00:00
snipe e6fdeb0e8a Removed initial check for assets, licenses, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 15:30:18 +00:00
Godfrey M f452204d62 applies a conditional to have the the integration test button function properly 2024-01-31 10:47:25 -08:00
Godfrey M 2406d2cfdb adds google notifs to license seats check in and out 2024-01-30 13:14:24 -08:00
Godfrey M 87bce0c097 adds google notifs for asset check in and out 2024-01-30 12:38:17 -08:00
Brady Wetherington 8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10 
A lot of changes here, but hopefully this works?
 2024-01-29 22:12:58 +00:00
Godfrey M dfa33f651a webhook test works 2024-01-29 12:58:09 -08:00
spencerrlongg 1248260df3 i don't think the output needs to separately escaped, the entire statement is already wrapped in {{}} 2024-01-26 12:33:35 -06:00
spencerrlongg 2b0dd8851c probably needs more testing... but should work 2024-01-26 11:47:09 -06:00
snipe ad2e0cc7f3 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-26 15:17:59 +00:00
snipe ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook 
Added support for Microsoft Teams Notifications
 2024-01-25 08:27:17 +00:00
Marcus Moore f5dafc477a
Avoid unnecessary model hydration on asset model show page 2024-01-24 16:14:51 -08:00
Godfrey M c65b32bcdb removed translation fixed via method 2024-01-24 14:49:42 -08:00
snipe 57a8630e99
Merge pull request #14162 from snipe/bug/sc-24511 
Fixed #14114 - correctly sort related fields for labels
 2024-01-24 21:37:20 +00:00
snipe 5909654fd4
Merge pull request #14163 from Godmartinz/ldap_test_table_fix 
Added overflow scroll to ldap test table
 2024-01-24 20:18:08 +00:00
Godfrey M e175cdbfd7 adds table overflow scroll 2024-01-24 12:13:40 -08:00
snipe 5f8e63717d
Merge pull request #14058 from Godmartinz/ldap_test_table_fix 
Fixed Ldap sync test table and table data from overflowing
 2024-01-24 19:31:04 +00:00
snipe 2c7bbfa637 Added additional sort/order hidden fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:20 +00:00
snipe dd3b2da670 Updated variable names for clarity, remove the concat of order and sort 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:08:47 +00:00
Godfrey M 00f07ac2ce add translations, brush up code 2024-01-24 10:38:06 -08:00
snipe 8ca4c51186 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 15:29:39 +00:00
snipe f73a55f9ab Fixed english and attribute placeholder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:58:06 +00:00
snipe e6f94cfebf Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:47:54 +00:00
snipe c54eb22754 Moved URL string to general 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:46:52 +00:00
snipe 661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations 
Adds translations for Label example
 2024-01-24 13:36:40 +00:00
snipe 49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501 
Improved radio button values in custom report form
 2024-01-24 13:22:48 +00:00
Godfrey M 7c529df49b adds consumable checkout ms notification 2024-01-23 11:21:20 -08:00
Godfrey M e969f8808c adds licenses ms notifications 2024-01-23 11:10:04 -08:00
Godfrey M 5a46ef5d5b adds Accessory Check in out Notifcations, 2024-01-22 15:30:15 -08:00
snipe aceb072a1b Updated URL for apple manufacturer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-18 11:49:30 +00:00
Godfrey M ce02e43ab2 fixed integration link, added some conditionals 2024-01-17 16:30:27 -08:00
Godfrey M 9f2af40ef2 adds MS teams integration test 2024-01-17 13:41:45 -08:00
Godfrey M 93ef8317e8 added payload, new MS webhook test method 2024-01-17 11:49:31 -08:00
Marcus Moore 8aa5cf530b
Improve radio button values in custom report form 2024-01-16 12:33:16 -08:00
Godfrey M 6be8c063a9 added moar translations 2024-01-16 12:05:09 -08:00
Godfrey M 74dc17b4b9 adds translations for Label example 2024-01-16 10:47:45 -08:00
snipe 66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation 
Fixed [FD-39640]: preserve sort order when generating asset labels
 2024-01-11 21:46:01 +00:00
snipe f610afb1b8
Merge pull request #14121 from Godmartinz/checkout_bug_fix 
Fixed multiple click checkouts for consumables, accessories and components
 2024-01-11 11:15:48 +00:00
Godfrey M 1f7f9717c5 fixes checkout bug 2024-01-10 11:35:32 -08:00
MrM 9d16eacad5
Added license expiration date in "view asset" 
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
 2024-01-09 18:30:51 +01:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
Brady Wetherington f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
snipe 7c5d29ccd9 Move Google Login prompt higher, made it bigger 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 14:56:34 +00:00
snipe 432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link 
fixed `departmentNameLinkFormatter` url
 2024-01-04 22:40:24 +00:00
Godfrey M a110b5fcca ugh 2024-01-04 12:37:53 -08:00
Godfrey M 1f1e58eb1e remove unintentional change 2024-01-04 12:36:57 -08:00
Godfrey M 32b34ca9b9 departmentNameLinkFormatter had a bad url 2024-01-04 12:33:33 -08:00
snipe 50eb257cec Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:12:29 +00:00
spencerrlongg 41e0275c95 htmlentities() 2024-01-03 12:42:36 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe eead7b49e3 Fixed language code 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:07:11 +00:00
snipe 493ffc10c1 Defaulted to en-US on quickstart 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:16:00 +00:00
snipe 98e6f7e14c Updated form marco with new locale codes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 18:12:02 +00:00
snipe 02f24d3332 WTF 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:57:17 +00:00
Godfrey M 4b071745fa prevents tables and table data from overflowing 2023-12-19 09:49:40 -08:00
snipe 6801caaa0d Added backl vendors directory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:49:10 +00:00
snipe b9a877d92d Fixed donked dir tree 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:42:39 +00:00
Godfrey M c0dba95426 testing ldap test table fix 2023-12-19 09:32:26 -08:00
snipe 026ea41dee Use correct language codes, updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:23:16 +00:00
snipe 1063dcfb7b
Merge pull request #13994 from Godmartinz/add_license_to_info_for_activation 
Added licensed to name and email in user profile license view
 2023-12-19 13:16:34 +00:00
Marcus Moore 7cf4baa92a
Remove unused vendor less from resources directory 2023-12-18 17:58:47 -08:00
Marcus Moore 6c3dfdfe6d
Remove unused vendor css files 2023-12-18 17:48:52 -08:00
snipe e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577 
Added Status Label names to Asset history/ Action log
 2023-12-18 22:41:02 +00:00
Marcus Moore 149d159c05
Remove unused bootstrap resources 2023-12-18 11:49:52 -08:00
Marcus Moore c0ad16f497
Remove unused vendor js files 2023-12-18 11:48:28 -08:00
snipe e71080ef37 Make action date sortable on asset history view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:41:15 +00:00
snipe 14c70ee6c4 Removed BS th classes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:37:47 +00:00
snipe 8fc470c978 Added fields to activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:44 +00:00
snipe f5f136b9b5 Added fields to history views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:31 +00:00
snipe 93c7108eda Added action source to translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:49 +00:00
snipe 70250191ed
Merge pull request #14026 from snipe/bug/sc-23599 
Fixed checkbox/radio button display on models edit for default fields
 2023-12-13 14:00:27 +00:00
snipe 337d863330 Missed closing label on radio buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 13:52:31 +00:00
snipe ac96bad4a1
Merge pull request #14014 from Godmartinz/requested_assets_table_missing_header 
added a missing table header on requested table for checkout
 2023-12-13 12:57:20 +00:00
snipe 3834221589 Fixed radio button display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:30:08 +00:00
snipe 016ca1adc1 Fixed HTML for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:27:50 +00:00
spencerrlongg 255d9427b6 make edit a button 2023-12-12 15:41:29 -06:00
spencerrlongg d29f4489de fix 2023-12-12 14:09:12 -06:00
spencerrlongg b89116eb55 submit on enter for edit 2023-12-12 13:33:51 -06:00
spencerrlongg 9430e9c8e2 autofocus, package-lock.json 2023-12-12 13:28:04 -06:00
snipe 631dd58de1 Added model name and number to quickscan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 04:23:04 +00:00
snipe 41f1c5c1e3 Smaller icon size for activity reports, other action icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:58:20 +00:00
spencerrlongg b01d53a247 one more 2023-12-11 18:43:46 -06:00
snipe 65dae836c6 Set default sorting on backups to latest first 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:35:08 +00:00
snipe 456e6979f0 Updated import icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:12:06 +00:00
spencerrlongg 65cbba3c2e completely kill vue 2023-12-11 18:09:22 -06:00
Godfrey M 5eb08d9568 added a missing table header for checkout 2023-12-11 11:14:55 -08:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
spencerrlongg f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
spencerrlongg 04069bab82 remove comment 2023-12-05 20:50:07 -06:00
spencerrlongg 3106035ef9 delete, comment 2023-12-05 20:41:34 -06:00
spencerrlongg 18720b3302 safety stuff 2023-12-05 20:36:59 -06:00
spencerrlongg 12e546e63a everything working, cleanup 2023-12-05 20:22:20 -06:00
spencerrlongg c28936fefb almost there... problem with update button 2023-12-05 17:39:35 -06:00
spencerrlongg 080d196138 buttons work now after style tags removed 2023-12-05 16:41:25 -06:00
spencerrlongg d3967b37cd this is a start, buttons not working? 2023-12-05 14:52:14 -06:00
Godfrey M 49342a4542 added status names to asset history 2023-12-05 11:50:43 -08:00
Godfrey M a95f0b8862 remove column sizes 2023-12-05 11:07:52 -08:00
Godfrey M 15af64a355 fixed the bootstrap column sizes 2023-12-05 10:07:58 -08:00
snipe 0089ea2321
Merge pull request #13882 from marcusmoore/fixes/jquery-validation 
Fix client side validation in the v7 branch
 2023-12-05 17:26:48 +00:00
snipe 3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907 
Convert Vue Personal Access Tokens to Livewire
 2023-12-05 16:45:16 +00:00
spencerrlongg 6ca5fb6b20 remove token scope html 2023-12-05 09:44:03 -06:00
snipe 7258af20fc Added help text to RTD location field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-05 14:40:49 +00:00
Marcus Moore a3b0273445
Remove comment 2023-12-04 15:21:04 -08:00
Godfrey M 0e9e31f68b adds info needed for license self activation 2023-12-04 11:12:30 -08:00
Godfrey M 4fd43799b4 missed one view 2023-12-04 10:56:03 -08:00
Godfrey M fdaa44654d changes the table header Serial to Product Key 2023-11-30 10:46:18 -08:00
snipe 42109dc1eb
Merge pull request #13976 from Godmartinz/sc-24144_final 
Fixed black dark theme, contrast issues etc
 2023-11-30 16:23:13 +00:00
Godfrey M 4a19f23e7c fixes for black dark theme 2023-11-29 11:30:02 -08:00
snipe 189c90e9e5
Merge pull request #13954 from Godmartinz/feature/sc-23756 
Fixed user total asset cost to appear conditionally
 2023-11-29 09:40:39 +00:00
snipe c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix 
Fixed status and model in bulk edit
 2023-11-29 09:40:03 +00:00
akemidx 2a54797dce permission level proof of formatting 2023-11-28 17:58:37 -05:00
akemidx 63065bab5d adding in icons for clarity, since there are two places called settings 2023-11-28 17:51:43 -05:00
akemidx 108658520d translating no group message on user edit page 2023-11-28 17:15:51 -05:00
Godfrey M 9e59550b79 removes the row instead of just the optional values 2023-11-28 10:08:32 -08:00
snipe 601ebcc1e6 Removed table header contraint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:00:42 +00:00
snipe 2247be77d8 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:56:20 +00:00
snipe 187d3abeb4 Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:15:07 +00:00
snipe fa1176ce14 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:12 +00:00
snipe 4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe c997ae44c2 FAFO troubleshooting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
Godfrey M 45e9d0597a makes user total asset cost appear conditionally 2023-11-27 11:36:47 -08:00
snipe dbb6002f9f Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-27 14:43:16 +00:00
snipe 776c91934b Updated dir name for Khmer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-27 14:39:13 +00:00
Brady Wetherington 6210716199 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-27 13:04:39 +00:00
snipe 77ab5eb875
Merge pull request #13909 from akemidx/bug/sc-23999 
Hiding Order Column in Custom Fieldsets
 2023-11-24 19:10:42 +00:00
snipe 9607567b75 Check for the array key in $activeFile->first_row 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-24 10:08:35 +00:00
snipe 978bbeccc5 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:09 +00:00
snipe accfbc1b99 Show number of remaining seats and category in form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:03 +00:00
snipe 88cc234cbd Higher contrast for green dark skin 
Applies #13915 to develop

Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:28:43 +00:00
snipe ad6b286e10 Added default location to view-assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:39 +00:00
snipe 7f94b7df32 Removed refresh from asset view table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:24 +00:00
snipe c6178bd619 Added translation for success password save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:59:59 +00:00
snipe 3929c8f260 Nicer alert layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:57:54 +00:00
snipe 0e51a0935d Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:41:12 +00:00
snipe ffc1266d0e UI fix - don’t show the trash can icon on things that can be restored 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:41:06 +00:00
snipe fb125af0df Tweaked language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:09:50 +00:00
snipe 0ae91d305d Add the two_column_unique_undeleted translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:03 +00:00
akemidx e5a4214b8b hiding all order stuff 2023-11-20 20:32:14 -05:00
snipe fe2cfa0d38 Redirect if category is missing or invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:28:44 +00:00
spencerrlongg 17bf8d0124 fix string 2023-11-16 11:31:00 -06:00
spencerrlongg c3e02286d3 i can't blame this on livewire - animations or something? 2023-11-16 11:24:54 -06:00
spencerrlongg a9d82bf157 enter working 2023-11-16 10:54:32 -06:00
spencerrlongg e097df912e a little cleanup 2023-11-15 22:35:20 -06:00
spencerrlongg 477bb6165f rm log 2023-11-15 20:45:04 -06:00
Spencer Long 19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907 2023-11-15 20:37:15 -06:00
spencerrlongg 12dcf76da9 more cleanup 2023-11-15 20:33:44 -06:00
spencerrlongg 36aac328e4 delete vue component 2023-11-15 20:32:22 -06:00
spencerrlongg 9cf81c7ad4 cleanup, validation 2023-11-15 20:29:14 -06:00
spencerrlongg 6c6417e595 ok, maybe i do like livewire 2023-11-15 20:19:03 -06:00
spencerrlongg efa8ba5965 nice, just need frontend work now 2023-11-15 17:24:54 -06:00
spencerrlongg fd02385c22 deleted components i've already rebuilt in livewire 2023-11-15 17:14:09 -06:00
spencerrlongg 713b21de14 note 2023-11-15 16:56:08 -06:00
spencerrlongg 9b31ae3146 create mostly working 2023-11-15 16:51:09 -06:00
spencerrlongg 4cb0012872 cleanup 2023-11-15 16:33:16 -06:00
spencerrlongg eaa68327f7 SINGLE QUOTES 2023-11-15 16:27:01 -06:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
Marcus Moore 68ef618028
Run validation on blur 2023-11-14 16:30:29 -08:00
Marcus Moore 3ecdafa685
Add class to error placement check 2023-11-14 16:12:47 -08:00
Marcus Moore 20ae9dea19
Fix placement of error message 2023-11-14 15:55:15 -08:00
Marcus Moore 08e4ea384e
Update additional partials for validation 2023-11-14 12:23:46 -08:00
Marcus Moore fe0f9743d3
Update additional partials for validation 2023-11-14 12:07:37 -08:00
spencerrlongg 9f303cc116 playing around with livewire 2023-11-14 11:50:27 -06:00
spencerrlongg e504b20235 couple small changes 2023-11-14 11:01:38 -06:00
snipe 9316ecb8d6 CLarified upload error text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 16:14:39 +00:00
Brady Wetherington f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
Marcus Moore 1a26ea0911
Update a couple more fields for new validation 2023-11-13 19:18:04 -08:00
Marcus Moore 7098ab6509
Match styling of existing error messages 2023-11-13 18:54:51 -08:00
Marcus Moore 0d3589ca24
Update create asset page to use new validation library 2023-11-13 18:17:39 -08:00
Marcus Moore f02ff62a08
Install jquery-validation package 2023-11-13 18:15:18 -08:00
spencerrlongg fbfc817c5f just some cleanup 2023-11-13 19:47:03 -06:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
spencerrlongg 5615fc09e6 add view modal 2023-11-08 16:55:29 -06:00
spencerrlongg d68f1e4cfa initial display work done 2023-11-08 16:48:20 -06:00
spencerrlongg 7f4b2d6e42 modal and initial stuff working 2023-11-08 16:10:09 -06:00
snipe a24d21e683 Added new unescaped alert box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:41:05 +00:00
snipe 3f8b63e053 Add linked text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:02 +00:00
snipe 26311e46b8 Fixed URL to favicon on default blade (used in 404 messages) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 11:38:48 +00:00
snipe b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication 
clarifies an address column under locations
 2023-11-08 08:59:07 +00:00
snipe bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922 
New Translation Strings for Custom Asset Export
 2023-11-08 08:57:20 +00:00
snipe cf42eca198
Merge pull request #13814 from ntbutler-nbcs/feature-location-history 
Added #13754 - asset history tab to locations view
 2023-11-08 08:55:07 +00:00
spencerrlongg 93101d36b8 removed refresh button on client tables 2023-11-07 15:07:24 -06:00
snipe d0cc42a068 Added employee number to user merge screeb 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 20:09:11 +00:00
Godfrey M 3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
snipe e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900 
Fixed datetime displayed on license edit for fields that should be date
 2023-10-31 16:59:12 +00:00
snipe 22996895d8 Check for valid model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 16:04:19 +00:00
snipe 28641493ca Check that the category exists 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:58:59 +00:00
snipe aa2a25dc19 Display the form errors correctly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:49 +00:00
snipe 3495652827 Added checkboxes to intentionally remove field values in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:52:53 +00:00
snipe 209627e2cc Force format if dates are given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:25:00 +00:00
Nathan Butler 79f380cbe7 Added asset history tab to locations view 2023-10-31 10:28:54 +11:00
Godfrey M 97953ae082 add missing translation string 2023-10-30 12:17:55 -07:00
snipe 8c46f4ef69 Added min_amt value to model detaul page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 13:19:59 +00:00
gitgrimbo d556f0d275 Use parseEscapedMarkedownInline for more views 2023-10-27 15:37:56 +01:00
spencerrlongg 90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
snipe aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets 
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
 2023-10-26 15:56:47 +01:00
snipe 1ce95b6eac Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:27 +01:00
snipe 64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements 2023-10-26 13:36:18 +01:00
snipe ff72c4fbaa Added nicer formatting for fields in log meta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:17:28 +01:00
snipe 7042260871 More style polishing on custom fields in bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:23:11 +01:00
snipe 77d141d19c Don’t check the delete expected checkin by detault 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 03:56:02 +01:00
snipe 522aa96fcc Changed error variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:36:18 +01:00
snipe 4b6b36c639 Removed semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:14 +01:00
snipe 4a759f0a20 Added fingerprint icon for unique 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:01 +01:00
snipe 7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880 
Added optional custom fields to requestable assets page
 2023-10-25 20:57:54 +01:00
snipe da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572 
added an option to bulk edit location & fixed location bug
 2023-10-25 20:57:18 +01:00
snipe 0feb56d931 Removed period 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:39:15 +01:00
snipe a0cae77278 Fixed weird layout quirk on smaller screens 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:21:07 +01:00
snipe 0f97c0601b Nicer show/hide if encrypted, warn if already encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:11:06 +01:00
snipe 3916bac95f Added warning translation for encrypted fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:10:46 +01:00
snipe 6264d90459 Removed ending period for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:45:11 +01:00
snipe 57d3b2d2ef Check for encryption 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:44:10 +01:00
snipe a202bf81fa Removed column widths, check for encryption and showable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:44:02 +01:00
snipe 43da292d60 Used short translation for sr-only text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:43:34 +01:00
snipe eb82bc290d Clarified translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:42:07 +01:00
snipe 3c6b79e807 Added new fields to blades 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:28:55 +01:00
snipe 3a37b80251 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:21:58 +01:00
snipe e7ef7f04f0 Removed periods for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:21:48 +01:00
snipe 8c93e79397
Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key 
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
 2023-10-25 07:47:48 +01:00
Ivan Nieto Vivanco f2f3931fa9 Formatting correctly 2023-10-24 11:26:37 -06:00
snipe 944520bc5d Fixed notification formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:02:16 +01:00
snipe aae289e150 Added missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:02:07 +01:00
Ivan Nieto Vivanco 0c5d54dfde Create the language string to show in the importer GUI indicating the file is empty 2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco 49f6eef9df Places a text indicating that the file is empty and display it as an info text 2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco 8f8e5cb723 Adds condition to only process CSV if is not empty 2023-10-23 21:47:10 -06:00
Robert-Azelis 309f30f630
Update view.blade.php 
display marker if date of EOL is expired and show real EOL rate as diff between purchase date and eol date
 2023-10-22 18:38:59 +02:00
Robert-Azelis 04a867d12b
Update eol_date.blade.php 
read EOL date from database instead calculate on the base model EOL rate
 2023-10-22 18:32:20 +02:00
Robert-Azelis 7571d45d44
[Improvement[ Dashboard 
If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.  
In other way if multicompanies option is disabled then locations are displayed.
 2023-10-22 17:41:33 +02:00
Godfrey M e0a4387b10 clarifies an address column under locations 2023-10-19 10:01:08 -07:00