DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
13086 commits 101 branches 268 tags 288 MiB
Commit graph

3252 commits

Author SHA1 Message Date
snipe 658dda916c Changed operator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 15:01:00 +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 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
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 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 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
snipe 50c910461a Merge remote-tracking branch 'origin/develop' 2024-02-14 11:36:28 +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
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 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 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 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
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
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
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
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
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
spencerrlongg 41e0275c95 htmlentities() 2024-01-03 12:42:36 -06:00
snipe 493ffc10c1 Defaulted to en-US on quickstart 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:16:00 +00:00
Godfrey M 4b071745fa prevents tables and table data from overflowing 2023-12-19 09:49:40 -08:00
Godfrey M c0dba95426 testing ldap test table fix 2023-12-19 09:32:26 -08: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
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