DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15628 commits 96 branches 267 tags 296 MiB
Commit graph

3791 commits

Author SHA1 Message Date
snipe e451ca1a5c Stray semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 17:37:53 -08:00
snipe 3e111fca6e Cleanup some small UI bugaboos (padding, etc) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 17:13:40 -08:00
snipe df64e0e291
Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks 
Fixes slack settings submit button availability
 2023-02-15 16:28:57 -08:00
snipe 51c9a7d4f8
Merge pull request #12521 from akemidx/weird_checkout_text 
Fixed awkward checkout text in checkedout side panel
 2023-02-15 16:28:05 -08:00
akemidx d8d713426d indent? 2023-02-15 19:24:20 -05:00
akemidx 7dd789d5c0 translate no assets at checkout 2023-02-15 19:22:13 -05:00
Godfrey M 2d8c8e8f48 removes lazy loading 2023-02-15 16:16:14 -08:00
Godfrey M 7b510d5f2b greys out submit button conditionally 2023-02-15 15:46:05 -08:00
snipe d4634e83c9 Nicer padding, removed unused ids 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:45:18 -08:00
snipe 6c3ffa7918 Removed unused CSS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:39:24 -08:00
snipe 2d0bd2b292 Make spinner actually spin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:06:40 -08:00
akemidx b96f2f738d fixed weird phrasing in asset checkout screen 2023-02-15 16:47:48 -05:00
snipe ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs 
Adds Livewire slack inputs
 2023-02-15 13:27:07 -08:00
Godfrey M 793cf4823b missing things like mr magoo 2023-02-14 14:35:54 -08:00
Godfrey M c0d8ff1676 simplified to an else instead of elseif 2023-02-14 14:21:24 -08:00
Godfrey M 0cd558593d adds the red x icon to a false deployable status 2023-02-14 10:34:36 -08:00
Godfrey M d03e042eda adds a red icon next to broken- not fixable status label 2023-02-14 09:55:48 -08:00
snipe 2bbbc8158b
Merge pull request #12477 from akemidx/apple_warranty_link 
Added functionality to Apple Warranty link
 2023-02-13 13:02:33 -08:00
snipe 2f5b4c8e1b
Merge pull request #12498 from akemidx/layout_trans 
Translations for the layout setup
 2023-02-13 13:01:58 -08:00
Ivan Nieto Vivanco f0bf16d784 Fix more uneven tags 2023-02-12 12:01:40 -06:00
Ivan Nieto Vivanco 9a68a747a0 Fix uneven tags 2023-02-12 11:59:56 -06:00
Ivan Nieto Vivanco 81cc9f3700 Adds images to emailed user inventory report 2023-02-12 08:23:50 -06:00
akemidx 5714824aa7 translations for the layout setup 2023-02-09 17:24:34 -05:00
snipe e79818967d
Merge pull request #12490 from akemidx/manufacturer_marker 
Removed "required" marker for manufacturer on asset models (since it is not actually required)
 2023-02-09 12:43:14 -08:00
akemidx 32ed70259e sweedish chef fixes up your typos 2023-02-09 15:39:10 -05:00
akemidx 1a651b33fc manufacturer marker removal 2023-02-08 17:31:39 -05:00
snipe a4a3c03a7c
Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report 
Fixed #12064 Mail-Template missing translation strings
 2023-02-08 10:02:19 -08:00
snipe 16fcc6dc44 Fixed UI bug where download button was missing for non-images 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 18:40:00 -08:00
Ivan Nieto Vivanco 49b6a1cc53 Adds translation strings to theinventory report sent to users 2023-02-07 18:29:19 -06:00
akemidx 75f3cb3079 fixing external if statement 2023-02-07 19:02:12 -05:00
akemidx c0074baa26 functionality to Apple Warranty link 2023-02-07 17:27:39 -05:00
Marcus Moore 45e8e9bbed
Move company name to better location 2023-02-06 12:21:09 -08:00
Marcus Moore 78343ddb7c
Add asset's company name to checkout page 2023-02-06 10:58:10 -08:00
Godfrey M 74c64c1fc5 adds validation to the update hook, removes typos and deadlines 2023-02-06 09:40:57 -08:00
snipe dc414d3552 Updated model restore route 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 23:38:59 -08:00
snipe bbf6e5e69e
Merge pull request #12421 from akemidx/hardware_blades_translations 
Fixed: translations added for the hardware blades
 2023-02-02 13:02:46 -08:00
akemidx 37ce68af5b once again fixing an apostrophe 2023-02-02 15:54:05 -05:00
akemidx 29851c626f
Merge branch 'develop' into user_setup_translation 2023-02-02 14:34:09 -05:00
snipe 7344bbdd7f Added checkout/checkin note to user history 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 11:26:33 -08:00
snipe 78dca7fd32 Handle missing userfiles more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 10:49:36 -08:00
akemidx 69c38bf686 translations on the User Creation page 2023-02-01 20:32:16 -05:00
Godfrey M 3a86547ef5 fixes messages for integration test, removes slack request file, rehouses ajax method 2023-02-01 16:51:05 -08:00
snipe d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe 2da4578aa5
Merge branch 'develop' into slack_message 2023-02-01 13:43:09 -08:00
snipe 1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name 
Fixed #12418 - added ability to edit custom field names via GUI
 2023-02-01 13:39:39 -08:00
snipe 4a6250a08c
Merge pull request #12409 from akemidx/component_checkin_limit 
Fixed: Checkin limit string translation for components
 2023-02-01 13:37:56 -08:00
akemidx 0ffd40a217 fixing syntax 2023-02-01 16:30:07 -05:00
akemidx 33d819fd41 fixing pr 2023-02-01 16:13:53 -05:00
akemidx 90c1bfe03d fixing pr 2023-02-01 16:12:39 -05:00
akemidx 4d9d73483f fixing pr 2023-02-01 16:09:19 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
akemidx a8643e5d35 cleaning up/adding variable 2023-02-01 15:55:16 -05:00
Godfrey M f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
snipe f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe de1141491a Replaced help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-31 19:41:42 -08:00
Brady Wetherington 02ca5248b1 Don't append username to the user's name if it's already there 2023-01-31 17:44:09 -08:00
Godfrey M 1e0c58c3cf saves data correctly now 2023-01-31 11:32:05 -08:00
Ivan Nieto Vivanco a7a578bf51 Added head only logo to be used as default in apple-touch-icon 2023-01-31 00:13:44 -06:00
Godfrey M fc044528b8 validation is working, success message appears, database is not updating 2023-01-30 16:10:02 -08:00
akemidx 214a1af61a apostrophe updates 2023-01-30 16:54:23 -05:00
snipe a16604285c Normalize the fieldset form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:07 -08:00
snipe 37f5cfa8ce Added edit button for fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:02:53 -08:00
Godfrey M a63ea560ae adds submit button, getting setAttribute error 2023-01-26 15:17:08 -08:00
akemidx 79d9cff22a translations added for the hardware blades 2023-01-26 16:26:31 -05:00
Godfrey M a69cb6204a adds rest of inputs, and corrects Data binding 2023-01-25 16:22:34 -08:00
Godfrey M 2e22eeade5 adds one input 2023-01-25 14:29:20 -08:00
akemidx 53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe 4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00
Brady Wetherington b00333c9f5 Merge remote-tracking branch 'upstream/develop' into develop 2023-01-24 17:36:39 -08:00
Brady Wetherington c9f0f5fe8b Change Accessories report to use server-side pagination from URL 2023-01-24 17:35:44 -08:00
akemidx 3ba79600fb checkin limit for the components checkin 2023-01-24 18:17:49 -05:00
akemidx cafe8f3074 notification for slack message 2023-01-24 16:20:20 -05:00
akemidx 596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
Godfrey M 0f8ee22053 Creates Slack Setting Form 2023-01-24 09:25:05 -08:00
snipe 7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
akemidx 25996cbe03 translating the quick info printed out on accept x eula blades 2023-01-23 16:18:21 -05:00
snipe 4104d7260f Include new eol date picker blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:31 -08:00
snipe 3587017591 Updated EOL date in view blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:19 -08:00
snipe 8040d08e8c Removed formatter from EOL date 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:54:37 -08:00
snipe abad579306 Added eol date picker 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:45:33 -08:00
snipe 72295c093a Add CSS to the div to correct the weird indenting - fixes #12388 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:24:23 -08:00
snipe 2dc1182582 Don’t offer the delete option if there is no avatar currently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:26 -08:00
snipe 93ad0d02b9 Use fieldname for aria labels too 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:02 -08:00
snipe 3674f46ce0 Added arial labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 16:42:44 -08:00
snipe cfa342c81a Updated HTML for “standard” image edit/delete 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 16:23:04 -08:00
snipe 563a252d18 Updated checkboxed with missing minimal class for iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:57:52 -08:00
snipe 2bdf3d3f44 Missed a few strong HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:44:10 -08:00
snipe 56090bc645 Re-ordered notes to be more consistent, fixed missing iCheck class 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:38:35 -08:00
snipe fd73bee850 Fixed hardcoded string and added new checkout count to accessory view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:38:05 -08:00
Marcus Moore 0fa956403c
Fix row divider overflow 2023-01-19 14:16:28 -08:00
Ivan Nieto Vivanco f045008237 Add index to deleteFile() call, so it knows what element delete 2023-01-19 13:04:49 -06:00
snipe fa9116b184
Merge pull request #12369 from snipe/features/add_byod_to_assets 
Added BYOD to assets
 2023-01-18 16:09:45 -08:00
Marcus Moore c089f6eff2
Reference the accessory instance instead of the model 2023-01-18 13:48:01 -08:00
Marcus Moore e506ed7950
Remove extra quote 2023-01-18 13:42:09 -08:00
Marcus Moore 07744ca7bd
Reference the consumable instance instead of the model 2023-01-18 13:41:58 -08:00
snipe 0c39c7a53d Updated blades to add byod as a “status” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:25:46 -08:00
snipe fce620b54f Added byod to blades 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:11:02 -08:00
Marcus Moore ca1198ceb2
Constrain the bottom bar to the content window 2023-01-18 12:55:20 -08:00
Marcus Moore b31e000165
Have Info and History tables in accessory show page span entire width of row 2023-01-18 12:54:52 -08:00
Godfrey M 7ce230fadc missed a few renames 2023-01-18 08:57:59 -08:00
Marcus Moore 5282ca47b3
Allow users with consumables.files ability to upload files for consumables 2023-01-17 17:16:50 -08:00
Marcus Moore 1f12137245
Close divs in correct location 2023-01-17 17:09:55 -08:00
Marcus Moore 6c89f08193
Register the accessories.files ability and allow users with the ability to upload files for accessories 2023-01-17 16:59:50 -08:00
Marcus Moore 1fef992fa8
Allow users with components.files ability to upload files for components 2023-01-17 15:58:11 -08:00
snipe f50b622eb8 Disallow editing of category type once created, added help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:15:40 -08:00
snipe 62bf7b1bce Merge remote-tracking branch 'origin/develop' 2023-01-10 01:56:27 -08:00
snipe c5c37fa95f Fixed copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 01:54:26 -08:00
snipe 9dc016aecc Fixed issue where assets sidenav would collapse if custom status label is selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 01:31:00 -08:00
snipe e67bd5a275 Merge remote-tracking branch 'origin/develop' 2023-01-09 16:00:33 -08:00
snipe 8d35583634
Merge pull request #12324 from snipe/features/add_username_to_asset_list 
Added username to display in asset listings
 2023-01-09 16:00:01 -08:00
snipe b39a9e0fe1 Merge remote-tracking branch 'origin/develop' 2023-01-09 15:54:04 -08:00
Brady Wetherington cbffd105a2 Fix LDAP default group feature 2023-01-09 15:23:19 -08:00
snipe a57315aed5 Added username to display in asset listings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 12:58:58 -08:00
snipe 91d0c383df Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:47:55 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:42:26 -08:00
snipe 4d0fc99773 Merge remote-tracking branch 'origin/develop' 2023-01-05 14:19:51 -08:00
snipe ace73acba1
Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment 
Fixed: page-break and padding at the end of document for labels
 2023-01-05 09:59:35 -08:00
Godfrey M 301c4fda6e fixes conflicts 2023-01-05 09:55:25 -08:00
snipe 6d3c5e0659
Merge pull request #12264 from Godmartinz/gh12253_display_notes_accessories 
Added: notes to the accessories tab for user detail view
 2022-12-21 19:04:11 -08:00
snipe a6c7471bf5 Merge remote-tracking branch 'origin/develop' 2022-12-20 15:11:36 -08:00
Brady Wetherington 75a757d6f5 There was a bug with select-all where some bits didn't quite work 2022-12-20 14:57:58 -08:00
Godfrey M e791e6592a adds notes to the accessories tab under users 2022-12-20 10:37:19 -08:00
Godfrey M 38575e93e8 fixes the rules for adding page-break and padding at the end of document 2022-12-20 09:45:41 -08:00
snipe d0c5ba70f6
Merge pull request #12242 from inietov/features/add_purchase_cost_column 
Added `purchase_cost` to user's default view [sc-19680]
 2022-12-15 12:42:29 -08:00
Ivan Nieto Vivanco d9a21cce00 Add other items' purchase_cost columns to the same permission 2022-12-15 14:12:05 -06:00
snipe 3e7975b2c3
Merge pull request #12250 from akemidx/grey_out_pw_reset_button 
Fixed: Grey out pw reset button for consistency
 2022-12-15 11:25:53 -08:00
akemidx d870bc3b02 nested if loop 2022-12-15 14:19:51 -05:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
Godfrey M 2e228ccb0b redid a few things. should be good now :) 2022-12-15 10:45:42 -08:00
Ivan Nieto Vivanco b142f8e012 Add the permission to show purchase cost column to non-admin sessions 2022-12-14 23:00:35 -06:00
snipe b89979fbec 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
 2022-12-14 17:06:26 -08:00
snipe 8043b86786 Upgraded font awesome to 6.2.1 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-14 16:41:56 -08:00
akemidx b114ffd2c3 Grey out button pw reset button for consistency 
When user has no email in their profile, the box is greyed out for
consistency accross all buttons on the user profile
 2022-12-14 14:48:59 -05:00
snipe fabefa61b0
Merge pull request #12243 from akemidx/new_grey_out_when_no_assets 
Created method in users.php for adding up all assigned to user and pr…
 2022-12-13 14:00:48 -08:00
akemidx f3e57d7dc0 fixing PR 2022-12-13 16:00:59 -05:00
snipe 389ec3a3cb
Merge pull request #12247 from Godmartinz/gh12225_serial_added_to_components 
adds serial to components tab of assets
 2022-12-13 12:57:50 -08:00
Godfrey M 6a72c344b7 removed the cuddlers 2022-12-13 12:32:30 -08:00
Godfrey M 4442b446b9 adds serial to components tab of assets 2022-12-13 10:30:37 -08:00
snipe c432fb9d70
Merge pull request #12181 from Godmartinz/gh12163_asset_age 
Adds asset age to asset index and asset view pages
 2022-12-13 10:28:17 -08:00
akemi 07ae91b00f Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned. 2022-12-12 15:47:53 -05:00
Ivan Nieto Vivanco 450ad3dcec Added the column purchase_cost to user's default view 2022-12-12 14:17:08 -06:00
snipe 163b3f6c0b Merge remote-tracking branch 'origin/develop' 2022-12-08 14:37:35 -08:00
snipe 743264fd0e Merge remote-tracking branch 'origin/develop' 2022-12-07 16:23:50 -08:00
Godfrey M ec854ddc1d adjusts the margin and padding for img barcode in labels 2022-12-07 14:52:23 -08:00
snipe 43acd3b488 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-07 13:11:17 -08:00
snipe 97731cd7c8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/mix-manifest.json
 2022-12-05 16:34:34 -08:00
Ivan Nieto Vivanco 8d36971c8b Properly select 'CUSTOM REGEX' from the select list if the format declares onee 2022-11-30 16:21:23 -06:00
snipe 9c205f63ae Merge remote-tracking branch 'origin/develop' 2022-11-28 19:21:19 -08:00
snipe e21d0729c1 Add jobh title to header in print assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:19:42 -08:00
snipe c46dc99e86 Merge remote-tracking branch 'origin/develop' 2022-11-28 17:20:57 -08:00
snipe 8de59d117f Added serial number to emailed inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 17:14:38 -08:00
snipe d5e702ac74 Merge remote-tracking branch 'origin/develop' 2022-11-28 14:12:38 -08:00
snipe 6113afe36e
Merge pull request #12125 from inietov/fixes/email_issues 
Fixed #11699 and #12065 Email issues
 2022-11-28 14:09:42 -08:00
snipe 305df42f92
Merge pull request #12167 from inietov/features/no_submit_until_status_selected 
Fixed #11980 Submit button deactivated in Users' Bulk Checkin if no status selected
 2022-11-28 13:17:33 -08:00
Godfrey M 078e7281cd adds asset age to asset view 2022-11-28 10:45:58 -08:00
Ivan Nieto Vivanco b1985a08c4 Checks the status before activate the submit button on users bulk-checkin 2022-11-23 17:45:59 -06:00
Ivan Nieto Vivanco 9bafe795b0 Corrected the view when editing custom fields values 2022-11-23 16:34:29 -06:00
Ivan Nieto Vivanco feeb1c7ac8 Corrected the view when editing custom fields values 2022-11-23 12:21:07 -06:00
snipe 27898e660c Inherit the background color, since the field isn’t actually technically readonly 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-22 08:54:48 -08:00
Aaron 7c854c0a5c
Fix restore icon in table view 
Signed-off-by: Aaron <admin@datahoarder.dev>
 2022-11-19 10:45:10 +01:00
snipe f0c5560c1b
Merge pull request #12141 from Godmartinz/adds_serial_number_to_history 
Added `serial` column to the user history page
 2022-11-17 21:15:26 +00:00
Godfrey M 0a9fd0b867 adds serial to activity report page 2022-11-17 13:09:06 -08:00
Godfrey M 5c94ca1403 removes dead space 2022-11-17 13:06:07 -08:00
Godfrey M 86bc409d3a adds serial column to the action logs 2022-11-17 12:57:53 -08:00
Instead of looking elsewhere, it is better to come here together 9056d48775
Fixed: 12095 2022-11-16 18:16:45 +08:00
Godfrey M 8a0517fb5d removes data dump 2022-11-15 15:59:47 -08:00
Godfrey M 90828e3a87 fixes variable name 2022-11-15 15:51:52 -08:00
Godfrey M 45636b8114 adds should_autoassign boolean to users table 2022-11-15 15:42:57 -08:00
snipe 60d7128a5e Replace error suppression with better logic 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:41:57 +00:00
Ivan Nieto Vivanco f0ecab7bb1 Fix typo in variable (ah-hyuck!) 2022-11-15 11:00:40 -06:00
Ivan Nieto Vivanco 7cc8b39863 Checks if settings let URL's be shown in email notifications 2022-11-15 10:55:54 -06:00
Ivan Nieto Vivanco cd2997b674 Determine if email_logo or logo setting needs to be used in the Forgot Password email 2022-11-15 08:08:26 -06:00
snipe 8122236944
Merge pull request #12096 from snipe/features/add_custom_field_option_to_view_assets 
Added custom field option to view assets
 2022-11-14 22:45:26 +00:00
snipe 602c2698d2 Fixed broken table header tag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:06:23 +00:00
snipe d4ac7530b6 Removed download button for files that don’t exist on the server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:04:06 +00:00
snipe 4aded5e117 FIxed 500 error if model files are missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:01:33 +00:00
snipe 077d343f01 Prevent 500 if license file is missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 17:42:40 +00:00
Cram42 60ef5686ab Add "Pop Out" button for preview 2022-11-12 19:02:38 +08:00
Cram42 af0872dc23 Fix form refresh after bootstrap-table 2022-11-11 14:23:38 +08:00
Cram42 30a7a31724 Move label preview to alpine component 2022-11-11 14:23:02 +08:00
Cram42 67d021e457 Add alpinejs to deferred scripts 2022-11-11 11:25:41 +08:00
snipe ae95ee49f1 Hide the option if the field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:56:50 +00:00
snipe 2ac558494d Set column width instead of letting BS tables guess 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:21:07 +00:00
snipe ede16ad2c2 Removed unused block 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:35 +00:00
snipe 7a5fcfb87a Loop through fields array 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:59 +00:00
Cram42 7108156072 Fix button disabling 2022-11-10 19:24:02 +08:00
Cram42 a4b93d4bbd Create Field Definitions helper control 2022-11-10 19:20:18 +08:00
snipe 097821b818 Slight revamping of column layouts and also added new general.display_in_user_view column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:28:19 +00:00
snipe 2e56c9b521 Added new general.display_in_user_view field to form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:59 +00:00
snipe 236684ec92 Fixed model file image path/variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:12:49 -07:00
snipe 7cb1ca8754 Fixed image path to show preview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:51:48 -07:00
Cram42 fd9616683c Label preview auto-refresh 2022-11-03 10:20:12 +08:00
Cram42 f5fac50e91 Add preview pane 2022-11-02 19:31:34 +08:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 71a7176a6e Updated component blade 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:57 -07:00
snipe 2106b64da6 Fixed some layout issues 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:06:49 -07:00
Cram42 cde2ba7720 Fix: Oops 2022-11-02 09:51:02 +08:00
snipe fa79a6c15f Skip storage:: facade on missing images 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 18:19:13 -07:00
snipe 761da534f3 Updated consumables UI to allow uploads and display files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:53:08 -07:00
Cram42 6b2fe582ca Merge branch 'feature-label2' into develop 2022-11-01 20:12:28 +08:00
Cram42 6de48b4dc8 Implement settings for labels 2022-11-01 20:00:53 +08:00
snipe a930661150 Check for valid category 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-31 12:16:39 -07:00
snipe c233d7fb1c Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 10:51:06 -07:00
snipe dea0fcefbd Reflect color in sidenav if one is given 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 10:48:42 -07:00
snipe e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe b503b672ba
Merge pull request #11951 from Godmartinz/AccessKey_shortcuts 
adds shortcuts for listing, creating, and saving
 2022-10-25 15:53:57 -07:00
snipe 85a85082b7 Changed button icon for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 16:59:19 -07:00
snipe 515b14a001 Updated JS to better handle input IDs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:21:09 -07:00
snipe 4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
snipe 23e613f903 Fixed kit parse error on model edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-18 15:00:33 -07:00
snipe 2543fa6b98 Fixed user icon for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:04:42 -07:00
snipe 7c34652da0 Fixed incorrect icons for mobile view on location tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:02:27 -07:00
snipe fb228d6ded Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:57:10 -07:00
snipe eb9f17122e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:21:09 -07:00
snipe e7ae7742b0
Merge pull request #11949 from nh314/Remove-required-mark 
Remove required mark
 2022-10-12 10:55:49 -07:00
snipe 06803092c5
Merge pull request #11952 from snipe/features/clearer_activated_helptext 
Added clearer LDAP activated helptext
 2022-10-12 10:52:56 -07:00
Ivan Nieto Vivanco ab0c5bcd9d Add precision parameter to the diffForHumans() Carbon function to report 2022-10-12 12:16:13 -05:00
snipe ad8a2387f0 Updated help text to be more clear 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:38:37 -07:00
Godfrey M 4fa01350c3 adds shortcuts for listing, creating, and saving 2022-10-11 12:00:15 -07:00
Phan Nguyen d3161fad02
Remove required mark 
Because it actually not required by model.
 2022-10-11 15:49:56 +07:00
Ivan Nieto Vivanco f1edbc9810 Send item variable that the datepicker needs 2022-10-06 09:15:00 -05:00
snipe ca937667b4 Indented divs per @uberbrady 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:21:39 -07:00
snipe 3605aa8f5a Added clear button to generic datepicker and made it wider 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:59:06 -07:00
snipe 0817308822 Added start/end to edit/view screens 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:49 -07:00
snipe 18663c2599
Merge pull request #11925 from inietov/fixes/checkbox_customfields_comma_issues 
Fixed #11710 - Validation of checkbox data with multiple values
 2022-10-05 16:48:32 -07:00
Ivan Nieto Vivanco 5b8e0b3af1 Use a regex (gulp) to admit ',' (comma) and ', '(comma plus space) as customfields checkbox value delimiter 2022-10-05 18:40:07 -05:00
snipe 97b9f96030 Added nag alert for unaccepted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 16:16:21 -07:00
snipe 891b5b2882 Added routes, language 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 15:45:25 -07:00
snipe 3469e49470 First UI overhaul 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-03 21:28:22 -07:00
Brady Wetherington 0424308863 Modified dashboard tooltips to add percentage as well as count 2022-09-29 13:46:56 -07:00
Brady Wetherington 420c216973 Added counts to Dashboard Pie Chart legends and tooltips 2022-09-29 13:20:58 -07:00
snipe 70c766e8b3 Added setting to choose dashboard type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 04:16:46 -07:00
snipe 0b2ce7be07 Fixed #11521 - switch to using status meta from status label name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 03:48:58 -07:00
snipe c194c8a0c8
Merge pull request #11764 from BasO12/master 
Added notes to audit mail notification
 2022-09-27 14:43:50 -07:00
snipe 9d93c72534 Use BS datepicker’s built in clear button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-26 14:34:35 -07:00
Ivan Nieto Vivanco 23cf556a8b Adds cursor:pointer to indicate a clickable link 2022-09-20 22:24:52 -05:00
Ivan Nieto Vivanco f75917d34d Add a link used to clear the purchase date input 2022-09-20 17:53:55 -05:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
snipe 62ad3fad1c Remove DL button if file doesn’t exist 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:11:27 -07:00
snipe eb1e287c15 Better handle missing files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:08:13 -07:00
snipe 1885e73704 Ignore warning icon if no purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:42:47 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:39:47 -07:00
Ivan Nieto Vivanco 9b2eda2d70 Save and show the default values properly on custom fields of type checkbox 2022-09-15 11:52:49 -05:00
Ivan Nieto Vivanco 20220764bb Add possible values for custom fields of type checkbox 2022-09-15 11:18:54 -05:00
snipe 72feaee6c0 Added Applecare lookup link if manufacturer is apple 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 19:43:48 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
snipe 93428e1ed4 Increased colspan for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-31 13:34:27 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -07:00
Godfrey M 70ac8af9c4 . 2022-08-31 09:53:20 -07:00
BasO12 61e1650542
Add files via upload 2022-08-31 13:08:09 +02:00
BasO12 ab54ac9408
Add files via upload 2022-08-31 13:07:05 +02:00
snipe dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance 
Send notifications when Acceptance Assets actions occur [sc-9917]
 2022-08-30 12:14:58 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
snipe 9cf5f30c77 Set safeMode to true and use helper for all parsedown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-29 11:26:47 -07:00
David Sferruzza f60ea9581d
Fixed #11742: display correct file sizes when using S3(-like) storage 2022-08-28 12:07:14 +02:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
snipe 36ab794adc Added signature field to user history 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 18:05:43 -07:00
snipe a5fd9ebbb1 Added style to readonly datetime picker field 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 17:10:15 -07:00
Ivan Nieto Vivanco 581cae94ab Add readonly property to datepickers 2022-08-24 18:21:54 -05:00
snipe af34fc207c Suppress error output if file doesn’t exist on server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 13:47:56 -07:00
Godfrey M 2994c3613a adds clearfix to settings page 2022-08-22 10:46:15 -07:00
snipe 368bd5da3f Adds the category in the side info on Models > View 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-14 14:01:58 -07:00
snipe 7b3be076b4 Make location field the same width 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:38:34 -07:00
snipe 2c68ec927a Use trans_choice for string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:30:59 -07:00
snipe a0ba33ed7c Added checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:25:22 -07:00
Ivan Nieto Vivanco a33ca39237 Figure out declined notifications 2022-08-11 16:00:21 -05:00
Ivan Nieto Vivanco d2c486bb1e Create the mail template for the acceptance 2022-08-11 15:28:30 -05:00
snipe acd666fdf5 Added notes to user consumables tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:34:07 -07:00
snipe 8de7e9a2ab Use route name in case the user biffs the checkout twice 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:17:52 -07:00
snipe dd0260c3be Use old note on validation failure 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:29 -07:00
snipe fb3d7bf82e Made button wider 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:07:58 -07:00
snipe 0d9eccb7eb Addeed note field 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:12 -07:00
snipe 637604dfaf Fixed #8928 - add URL and ID to custom asset report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:51:47 -07:00
Brad Coudriet 77a1fcb1fc There was actually a missing p tag too 2022-08-09 06:36:53 -04:00
Brad Coudriet 0cf0598936 Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly 2022-08-09 06:32:03 -04:00
snipe 5a1b8bc4b6 Fixed icheck checkbox class 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:19 -07:00
snipe 975b4dee2f Added deleted header 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:17 -07:00
snipe 9ae7c66b77 Fixed indenting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:50:21 -07:00
snipe 77ab4ac1b5 Fixed labels on radio buttons in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:48:41 -07:00
snipe da1c1dbdd9 Added warning icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:19:08 -07:00
snipe 56b6904564 Added time difference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:13:02 -07:00
snipe 10e64deafe Updated method name in mail 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:12:44 -07:00
snipe 0a9bd07f20 Disallow checkout if qty = 0 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 12:27:58 -07:00
snipe 8027039754 Hide requested assets if the user cannot see requestable items 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 11:48:45 -07:00
snipe 031b7998c9
Merge pull request #11603 from inietov/fixes/actions_on_licenses 
Use apropiate string for license actions
 2022-08-02 10:40:20 -07:00
Ivan Nieto Vivanco 13053b85ef Remove Actions button and pass the correct variable to the routes 2022-08-02 12:37:27 -05:00
snipe e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports 
Adds options to include Deleted assets to custom asset reports
 2022-08-02 10:33:57 -07:00
Godfrey M ff080a2d8f replace checkboxes with radiobuttons 2022-08-02 10:27:55 -07:00
Ivan Nieto Vivanco a63d00bb5c Use apropiate string for license actions 2022-08-02 11:55:11 -05:00
snipe e07532dd1b Applied master fix to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:55:28 -07:00
snipe 4133ac6ef0 Applied date formatter to Current Date output on location print assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:47:29 -07:00
snipe 4834c33861 Missed a named route 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:43:54 -07:00
snipe e79a819724 Fixed inconsistency in naming 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 17:45:39 -07:00
snipe af7ccf3beb Handle logout route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:17:40 -07:00
snipe 3e48f436af Handled user route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:13:30 -07:00
snipe 5e488bd81f Handle components route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:10:39 -07:00
snipe 53ff28d2b0 Handle consumables route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:07:56 -07:00
snipe 4a4636bd03 Handle accessories route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:06:28 -07:00
snipe 744d0d299e Handle model route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:03:45 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
Godfrey M 842dafefec adds options to include Deleted assets to custom asset reports 2022-08-01 14:52:12 -07:00
snipe a51b446a10
Merge pull request #11578 from snipe/fixes/conditionally_add_nbsp 
Switched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty
 2022-08-01 14:07:50 -07:00
snipe 8b30992a11 Added bulk edit to company view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 14:06:18 -07:00
snipe 33de45d8fb Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-29 00:57:20 -07:00
snipe a1fe2a8d58 Fixed translation reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 18:01:55 -07:00
snipe 458d61fafe Front-end updates for checkin without delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:39 -07:00
snipe f0a9de72b1 Use icheckbox formatting on BOM and archived checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 12:12:22 -07:00
snipe 58499c2322 Fixed #11508 - font size in alert menu 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 17:09:17 -07:00
snipe 0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include 
adds a checkbox to exclude archived assets from custom reports
 2022-07-12 12:59:18 -07:00
mikeroq 5efe45226d Fixes Email List of All Assigned being "successful" when the user has no email 
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
 2022-07-11 20:02:10 -05:00
snipe 8114d01799 Only show sig file if there is a value for accepted sig 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 14:46:45 -07:00
Godfrey M 75844c5942 adds a checkbox to exclude archived assets from custom reports 2022-07-11 09:56:58 -07:00
mikeroq 397e89cbed Fixes modal showing entire model data instead of just the name 2022-07-09 14:09:40 -05:00
snipe 723454b04d Changed model file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 16:17:35 -07:00
snipe bae9792f01 Missed two 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:36:09 -07:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:22:08 -07:00
snipe bfc8c18675
Merge pull request #11451 from mikeroq/fixes/populate_custom_fields_from_asset_model_create 
Fixes custom fields not populating when creating asset from asset model page
 2022-07-05 17:31:08 -07:00
mikeroq 2781bd02b5 Add TODO to indicate future refactoring. 2022-07-05 18:02:37 -05:00
snipe afab167e8c Fixed restore button in listings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-02 13:08:46 -07:00
snipe af14ee0d47
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working 
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
 2022-07-02 13:07:29 -07:00
Mike Roquemore 07ac4087a3 Remove link from alert since there is already a restore button on the side 2022-07-02 14:34:22 -05:00
Mike Roquemore 123963c14c Modify genericActionsFormatter restore link to be a button instead since it's in a form. 
Changed user restore route to POST
 2022-07-02 14:34:22 -05:00
Mike Roquemore 1b45170ca3 Adds check if request has model_id, if so call fetchCustomFields on document ready 2022-07-01 20:15:11 -05:00
snipe b910db0617 Fixed #11393 - reject acceptance if no file is present 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:01:58 -07:00
snipe 46d055cf74 Fixed weird extra padding on crown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:17:53 -07:00
Godfrey M fc636ea888 removed redundant header 2022-06-29 12:01:56 -07:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php
 2022-06-29 04:58:13 -07:00
snipe be9e6fe847 Another typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:33 -07:00
snipe b0e13611f7 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:08 -07:00
snipe f3075facb4 Added delete button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:25:22 -07:00
snipe ed95adb45c Show model files on hardware page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:17:46 -07:00
snipe 95d4f7c62e Added models router to BS tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:56:18 -07:00
snipe c90ed9f25f Allow models uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:50:07 -07:00
snipe 7f664a7971 Layout changes for file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 12:32:12 -07:00
snipe 4a3f56acf2 Removed old cooke stuff 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:35:54 -07:00
snipe e33a4c2ef2 Added disclosure arrows to use screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:35:44 -07:00
Brady Wetherington 34b4499178 Remember the state of the disclosure triangles in Assets 2022-06-27 12:57:19 -07:00
snipe 8f900fb4e1 More UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 12:15:11 -07:00
snipe 9355689dd4 Nicer output for custom fields error 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 11:52:51 -07:00
snipe 0909feaa6b Few more UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 11:01:19 -07:00
snipe 7f18180105 Fixed toggle 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 10:26:37 -07:00
snipe 08525a3c20 Few more changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 09:43:32 -07:00
snipe d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset 
Fixes #8155 -  improve the workflow during asset creation
 2022-06-24 18:53:07 -07:00
snipe 8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating 
Adds validation to custom fields' default values
 2022-06-24 18:11:16 -07:00
snipe be0f0fc421
Merge pull request #11388 from snipe/features/disable_purge_in_env 
Disallow purge backup deletion by default and, enable via .env
 2022-06-24 16:12:00 -07:00
Brady Wetherington 3b3f1a817e Typo of 'general' was in the migration blade a few places 2022-06-24 16:00:15 -07:00
snipe 75d19d815d Still show the purge button even if not allowed to avoid confusion 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:59:40 -07:00
snipe fce4f0dc0e Disable delete button if not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:49:07 -07:00
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe ce2362459c Layout tweak for search and back placement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:30:52 -07:00
snipe 4e568bec8a Moves the settings search box higher 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:25:30 -07:00
snipe 86d2c2b153 Small naming changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:11:59 -07:00
snipe f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users 
Added created_by to users
 2022-06-23 18:48:42 -07:00
snipe 62ab867051 Fixed url param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:43:10 -07:00
snipe 3e559044b2 Changed method and scope names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:41:13 -07:00
snipe 1c25057e42
Merge pull request #11379 from Godmartinz/license_acceptance_eula 
adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf
 2022-06-23 18:26:19 -07:00
snipe 590630e4e0
Merge pull request #11386 from snipe/fixes/default_skin_settings_colors 
Small fixes to default blue
 2022-06-23 18:23:45 -07:00
snipe 35365882ac Used new settings_button class in settings index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:28 -07:00
snipe 6b8abb1511 Fixed missing archived tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:32:39 -07:00
snipe e63183649a Show admin in user view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:17:48 -07:00
snipe 1a4579b770 Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 16:00:27 -07:00
snipe 398c77bfdc Use new scope for additional tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 15:37:39 -07:00
snipe d45d322b54 Use scoped query for asset count 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 13:43:23 -07:00
Godfrey M b0897a1fc9 adds acceptance for consumables and components 2022-06-23 11:52:35 -07:00
snipe e2b1494511 Reordered and added xlsx to export list 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 11:18:59 -07:00
Godfrey M df76e6eacf adds eula blade for licenses and fixes assigned_to for dom_pdf 2022-06-23 11:15:15 -07:00
Ivan Nieto Vivanco 7e10abe605 Fix the date control in custom fields' default values form to show the selected date 2022-06-22 21:47:08 -05:00
Ivan Nieto Vivanco afdf93ca63 Adds controls for custom fields of type date in the default value form 2022-06-22 21:37:11 -05:00
snipe f0f37df76e Added missing postal code from user view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 12:18:57 -07:00
snipe 89c234b1c2
Merge pull request #11358 from snipe/fixes/missing_token_lang 
Fixed missing password.token string and checked for user existing before attempting to send reset email
 2022-06-22 11:15:08 -07:00
snipe a7a61a3620 Fixed #11351 - add link on asset view to order number 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:07:54 -07:00
snipe d67afc3bd0
Merge pull request #11359 from uberbrady/dont_show_images_on_checkin_email_if_not_requested 
Fixes issue where asset images were showing up in checkin emails
 2022-06-21 19:34:22 -07:00
Brady Wetherington 1156eea8af Fixes issue where asset images were showing up in checkin emails 2022-06-21 19:11:16 -07:00
snipe 68150d11b7 Make logo clickable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 16:13:52 -07:00
snipe a111482217 Use number_format on badges 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 14:59:06 -07:00
snipe b3605fa141 Merge remote-tracking branch 'origin/develop' 2022-06-15 11:39:16 -07:00
snipe 677e5a8cf1 Added tab badges to company detail view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 11:37:44 -07:00
snipe 872600a7a7 Link company on license page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 11:37:26 -07:00
snipe 5fe1078013 Squashed commit of the following: 
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:50 2022 -0700

    Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables

    Added fullscreen option to tables

commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:41 2022 -0700

    Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header

    Tweaked CSS for smaller padlock

commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:49:00 2022 -0700

    Added fullscreen option to tables

    Signed-off-by: snipe <snipe@snipe.net>

commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:43:12 2022 -0700

    Tweaked CSS for smaller padlock

    Signed-off-by: snipe <snipe@snipe.net>

Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:54:18 -07:00
snipe 6059e9e119 Added fullscreen option to tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:49:00 -07:00
snipe f16a4b6aef Removed footer from show category 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:16:14 -07:00
snipe 693043e645
Merge pull request #11313 from snipe/fixes/nicer_suppliers_mfgs_ui 
Nicer suppliers and manufacturers UI
 2022-06-14 17:14:53 -07:00
snipe cc6a2f2d49 Use the Deja Vu font to be able to support cyrllic, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:23:30 -07:00
snipe bfec0059c5 Improved manufacturers UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:10:36 -07:00
snipe aea9dd1de5 Improved suplpiers UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:06:56 -07:00
snipe f1a63f25e7 Partialize and add data atributes to statuslabel bulk 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:50:26 -07:00
snipe 88dfdb7538 Fixed bug in uncheck 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:50:10 -07:00
snipe 9072f7c6c9 Added click-to-select to tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:49:50 -07:00
snipe e8973f08b5 Added a back button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:47:35 -07:00
snipe dd9c9520fb Correctly filter by category_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:42:21 -07:00
snipe aec033d8d2 Use better phrasing for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:33:37 -07:00
snipe 5496b62b33 Split categories into two tabs if the type = asset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:30:50 -07:00
snipe e393e2eb4b Fixed issue in BS tables where uncheck-all then checking a few would not uncheck properly 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:30:35 -07:00
snipe 10781a6e4b Use new bulk edit partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:29:17 -07:00
snipe 5a86004081 Created new models bulk edit partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:29:08 -07:00
snipe 20a0c4e3b5
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields 
Fixes #8143 Date localization not working on custom fields
 2022-06-13 19:47:20 -07:00
snipe bcb9804be8 Added a little more context to mail template 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:44:18 -07:00
snipe 5e59fa2598 Default to $snipeSettings->site_name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:29:46 -07:00
snipe 93e4d23143 Changed font-awesome leading class 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 18:36:13 -07:00
Godfrey M c8bc0eff11 fixes translation references in the users ldap blade 2022-06-08 09:52:55 -07:00
snipe 063893c109 Added new JS data attributes for assets in manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-08 04:18:05 -07:00
Ivan Nieto Vivanco d2fc27e21d Add formatted date to EOL field in asset detailed view 2022-06-07 18:22:09 -05:00
Ivan Nieto Vivanco 740f27198f Evaluate if a custom field is a Date to present it with the correct format 2022-06-07 18:00:46 -05:00
snipe f7449921e9
Merge pull request #11253 from snipe/features/nicer_locations_ui 
Nicer locations UI
 2022-06-06 10:23:04 -07:00
snipe 01348187c8 Fixed #11224 - only show menu options if the user is allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 22:41:53 -07:00
snipe b26a4ad333 Added missing headers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:35:57 -07:00
snipe 89f45d3d05 Removed extra console logs and unused variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:16:29 -07:00
snipe e83a062eda Use translation string for model editing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:11:50 -07:00
snipe 1ea667e709 Update views with additional data fields 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:56 -07:00
snipe 5326ebd136 Removed toolbar div we weren’t using 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:45 -07:00
snipe 4db9892f8c Use partial in overdue audit screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:12 -07:00
snipe 880828379e Update bulki partials with new values 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:51 -07:00
snipe 9b54077409 Additional tweaks to BS tables partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:19 -07:00
snipe 9f478b51e2 Additional JS tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 20:13:51 -07:00
snipe 7c77e03c5a Initial rework of locations display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 18:08:15 -07:00
snipe 985e683896 Small display improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 16:59:53 -07:00
snipe 7ca617f077
Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap 
Added explicit “Example:” text in placeholders
 2022-06-03 13:28:40 -07:00
snipe 8f5ac5fb55 Removed quotes around filter query 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 13:01:53 -07:00
snipe 36f714e414 Updated Asset Model gate to correctly display the button on view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 12:52:53 -07:00
snipe 1c4864a3cc Added explicit “Example:” text in placeholders 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 11:25:18 -07:00
snipe 4e03ebe284 Don’t use the formatted date for diff days in audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-02 16:30:26 -07:00
snipe 7577fc61e4
Merge pull request #11235 from Godmartinz/gh_5644-checkout_history_for_accessories 
fixed issue with misplaced div
 2022-06-01 17:03:23 -07:00
Godfrey M d302675056 fixed a div placement 2022-06-01 16:58:29 -07:00
Godfrey M 5316f41eba fixed a div placement 2022-06-01 16:56:01 -07:00
snipe fa6c463d46
Merge pull request #11046 from Godmartinz/gh_5644-checkout_history_for_accessories 
Added history tab to accessories
 2022-06-01 12:46:38 -07:00
snipe 1dbc1f4aa2 Fixed #11232 - missing closing div 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-01 10:26:26 -07:00
Achmad Fienan Rahardianto fe65de1207 implements cookie to maintain display preference 2022-06-01 11:54:05 +07:00
Ivan Nieto Vivanco 3e44f39f4d Set the new File column as not visible by default 2022-05-25 19:19:25 -05:00
Ivan Nieto Vivanco f208869aff Add column to show filenames in Activity Report if the log action is 'uploaded' 2022-05-25 18:50:32 -05:00
snipe d8a8e03bf6 Nicer styling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 14:39:01 -07:00
snipe a243823e5e
Merge pull request #11190 from inietov/fixes/requested_assets_models_workflow 
Adjust requested assets and models workflow a little bit.
 2022-05-24 14:31:40 -07:00
Ivan Nieto Vivanco a4cf601c98 Remove extra tag and other stylistic changes 2022-05-24 16:27:55 -05:00
Ivan Nieto Vivanco 1e3c0d597e Use @can view directive instead of @if superadmin 2022-05-24 15:53:26 -05:00
snipe 91822d2e45 Use shorter helper config method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:26:29 -07:00
snipe 67616dbcf4 Updated language strings from activated to able to login 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:12:02 -07:00
snipe 4839985f38 Added forced space after admin/superadmin badge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 12:59:36 -07:00
Ivan Nieto Vivanco aa841a4674 Check permission before show links or not in requestable asset models view 2022-05-24 14:40:32 -05:00
Ivan Nieto Vivanco 6d1de73cad Fixes some html structure in the requested assets view 2022-05-24 14:06:05 -05:00
Ivan Nieto Vivanco 0a6626891e Add links to requestable Models' name 2022-05-24 13:36:13 -05:00
snipe 64eafb062e Fixed bug where username wasn’t showing for regular users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 10:48:02 -07:00
snipe e34ea32a5e Fixed translation styring reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-23 20:15:22 -07:00
snipe 8333089278
Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs 
Accept asset/accessory improvements and fixes
 2022-05-23 12:59:01 -07:00
snipe 70344cc02e
Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow 
Fixed #11129 - settings treeview won't stay active.
 2022-05-23 12:55:11 -07:00
Godfrey M 4adb990a5d removed line breaks and deadspace 2022-05-23 09:37:20 -07:00
Godfrey M 160a147a58 removed line breaks and deadspace 2022-05-23 09:35:19 -07:00
snipe bd384d3f10 Small formatting fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe f439970e7a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe a37a576ee5 FIxed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 2bd0679a81 A few more tweaks to PDFs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8c64e7359a Added signature column, removed stored_eula_file column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 14495cd1da Nicer PDF display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8449b5ca1e
Merge pull request #11160 from uberbrady/improve_default_custom_field_value_on_asset_create 
Fixed: #11098 - Smartly overwrite fields with default values for custom fields
 2022-05-18 16:12:12 -07:00
Brady Wetherington e4b24e17f3 Improve comments because the logic is complicated and unintuitive 2022-05-18 16:06:39 -07:00
Brady Wetherington 981741062b Try to intelligently overwrite fields with default values for custom field 2022-05-18 15:51:32 -07:00
snipe 891009dc67 Nicer formatting for buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:35:57 -07:00
Godfrey M ab23e04c65 re-adds Request::is to setting categories 2022-05-18 14:33:41 -07:00
Godfrey M 877b1bd0a3 re-adds Request::is to setting categories 2022-05-18 14:31:03 -07:00
Godfrey M eaeb74c576 readded comment 2022-05-18 13:13:38 -07:00
Godfrey M 23891054dc removed dead space and unused namespace 2022-05-18 13:11:20 -07:00
Godfrey M cfc4c58da3 fixes the Settings Tree menu to remain active when opened 2022-05-18 13:06:06 -07:00
Godfrey M 07679aa376 settings treeview won't stay active. still experimenting with potential solutions 2022-05-18 08:40:37 -07:00
snipe 4078e4e323 Added spinner onClick for file upload button on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 02:40:32 -07:00
snipe ceffbb950f Fixed #11120 - custom fields not showing when textarea is present as field type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 00:47:22 -07:00
snipe 0f9559c1ff Fixed #11124 - updated maintenance page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:01:37 -07:00
Travers Carter 1fc0adf7b7 Fixed #11126: don't entitise custom CSS on the labels view 2022-05-18 00:16:18 +10:00
snipe a973c0626e
Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups 
We inadvertently used the wrong label for one of the headers
 2022-05-16 17:02:31 -07:00
Brady Wetherington 213d990e47 We inadvertently used the wrong label for one of the headers on the backups page 2022-05-16 17:00:22 -07:00
snipe 925529923a Fixed #11112 - use correct formatter for locations on dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 16:50:47 -07:00
snipe ed8e82a606 Removed sr-only class for now - not sure why it’s interfering with the submit button JS 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 11:02:02 -07:00
snipe 91fb27ee00 Adds encrypted status to custom fields overview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:20:04 -07:00
snipe 5f1f6baee9 Fixed unrelated typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:19:12 -07:00
snipe 3fe0e04d52 Fix roite for people file deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 08:25:22 -07:00
snipe 3a31104b5c Fixed #11052 - add file sizes to upload displays 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 19:33:14 -07:00
Brady Wetherington b6284e6651 Fix 'cancel' button in two-factor screen 2022-05-13 14:49:37 -07:00
snipe d8a4509b22 Fix logout on 2fa 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 14:36:20 -07:00
snipe eccc5e7cf0 Make logout a post on 2FA cancel 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 13:35:13 -07:00
snipe b36bfad0ca Set maxlength on password confirmation form element 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 05:27:47 -07:00
snipe 93454decec Fixed broken quotes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 05:14:53 -07:00
snipe deb2d958d8 Sets maxlength of user fields to 191 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 04:54:12 -07:00
snipe 714f6d80f2
Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape 
Bootstrap tables export as landscape
 2022-05-12 09:28:47 -07:00
Godfrey M 83d0743ab8 saves bootstrap pdf tables in landscape 2022-05-12 09:18:44 -07:00
snipe 91cc08d3fb
Merge pull request #11050 from uberbrady/fix_encrypted_textareas 
Make sure to decrypt Textareas as well as input type=text
 2022-05-11 19:03:02 -07:00
Godfrey M 8ebe64e630 fixes final visual issue 2022-05-11 12:13:36 -07:00
Brady Wetherington e3696ff84c Make sure to decrypt Textareas as well as input type=text 2022-05-10 18:39:03 -07:00
snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
 2022-05-10 17:26:26 -07:00
Godfrey M c07a244bab fixes 1/2 visual issues, adds history tab to accessories 2022-05-10 11:20:42 -07:00
snipe 304cd75af5 Fixed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:20:44 -07:00
snipe 59a0f4722b Use partial for asset bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:20:35 -07:00
snipe 418a797e7e Use partial for asset bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:20:29 -07:00
snipe 0c20543c49 Remove conflicting toolbar call in model listing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:15:58 -07:00
snipe fe98e505fe Use the new partial for bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:15:31 -07:00
snipe 78a9c16761 Minor formatting improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:15:10 -07:00
snipe c4bf0045c8 Fixed stray < tag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:14:55 -07:00
snipe c64f34ebcc Check the "do not change” radio button by default 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:14:31 -07:00
snipe cf0548bd1f Create a new partial for asset bulk actions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:11:52 -07:00
snipe caef98d36d Patched #11025 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 02:06:12 -07:00
snipe fba731ac1c Missed a few hard coded english strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 02:01:17 -07:00
snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
 2022-05-06 01:52:43 -07:00
snipe 39ee825ba2 Fixed html lang specification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 01:32:20 -07:00
snipe c0e9393092 Fixed #10890 - use translation strings in user asset printout 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 01:30:58 -07:00
snipe 3a415b2fce Use full app_url in favicon paths 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 00:19:32 -07:00
snipe 5370c2ca42
Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all 
[Fix] changes the query for the accept signature on print blade
 2022-05-05 13:32:37 -07:00
snipe 953b3a8d6e
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8 
Merge master into develop for RC 6.0.0-8
 2022-05-05 10:53:17 -07:00
Johnson Yi 281c6df7b3 Customize login page when REQUIRE_SAML is enabled 2022-04-29 15:35:40 +00:00
snipe edab4e1371 Uses str_slug for filename for JS export (like we do elsewhere) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 21:55:26 +01:00
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
 2022-04-28 17:49:06 +01:00
Achmad Fienan Rahardianto dafe353050 Implements #8155 to improve the workflow during asset creation 
- adding 2 options to hide optional information
 2022-04-23 14:41:38 +07:00
Godfrey M 380cb38b7d changes the query for the accept signature on print blade 2022-04-14 17:17:28 -07:00
Brady Wetherington 4db7cb0e21 This disables the display of HTML content during exports, without enabling XSS attacks 2022-04-07 16:37:32 +01:00
Brady Wetherington 5a776af091 This disables the display of HTML content during exports, without enabling XSS attacks 2022-04-07 16:27:06 +01:00
snipe 01342ca266 Fixed activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 22:58:25 +01:00
Brady Wetherington 6756dd193e SCIM integration using the 're-do-the routes' approach, which seems like a dead-end 
Cleaning up routes to match laravel-scim-server's recommended implementation

Some actually *working* changes for SCIM support?!

Whoops, forgot my route file

Fix public SCIM routes

Removed Ziggy, removed old generated file, yanked Ziggy references

Resolves the first set of comments for SCIM

Ensure all /api routes have baseUrl prepended

Fix the parent:: call to be, uh, actually correct :P

Clarify the route-ordering, as it is quite tricky

This gets it so that users can actually be saved..

Work around the lack of callbacks with some inheritance

Mapped a bunch more fields from SCIM into Snipe-IT's user table

More baseUrl shenanigans since we yanked Ziggy :/

Properly map job title and work with some other necessary attributes

Map more fields...

Finalized basic mapping for core and enterprise namespaces

Latest tuned settings for SCIM config to work with Azure (and others)
 2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco 2d213a9c77 Make the report take the dates of pivot table instead of asset log 2022-04-05 12:57:49 -05:00
snipe 08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view 
Fixes #10898 (invalid consumable date time info in user view)
 2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto 231a34ace3 FIX: #10898 (invalid consumable date time info in user view) 2022-04-05 15:31:27 +07:00
snipe 8ccf148799 Fixed #10881 - bad merge with bootstrap-tables changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 22:57:00 +01:00
snipe b2056816c9 Use the same string for both radio buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:45:55 +01:00
snipe a937bd34f6 Merge master back down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:28:43 +01:00
snipe 7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets 
Fix #10810 unaccepted assets
 2022-03-29 12:10:37 +01:00
snipe b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync 
This looks good, thanks!
 2022-03-29 12:06:01 +01:00
Brady Wetherington e50ad8a442 Don't crash JS when there are no data-export-options (as is true in Dashboard) 2022-03-27 07:18:12 +01:00
Godfrey Martinez fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 2022-03-22 10:10:56 -07:00
snipe 729b23c0cf
Merge pull request #10857 from uberbrady/fix_bs_tables_export_options 
Fix bs tables export options
 2022-03-22 17:03:18 +00:00
Brady Wetherington af9f3d5e1e Clean up the bootstrap table export options 2022-03-22 16:05:08 +00:00
Brady Wetherington 00ca30a205 WIP: fix bootstrap table export options 2022-03-22 15:12:11 +00:00
Ivan Nieto Vivanco 7571c0b850 Add support for boolean type customfields 2022-03-21 18:48:42 -06:00
Godfrey M 4956eb0410 WIP: needs to be tested. adds ldap_manager field to ldap sync 2022-03-21 11:15:39 -07:00
Godfrey M 220df9710e adds most of the fields for an accessory eula agreement pdf 2022-03-21 09:18:29 -07:00
snipe 760b78b584 Fixed #10819 - use full url for label barcodes 
I don’t know when/why this would really be necessary, since it would be weird to call /hardware/123/label, but this fixes the broken barcodes

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-21 13:57:18 +00:00
snipe 42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving 
Fixes Customfields with boolean format not saving [ch-9973]
 2022-03-19 22:10:54 +00:00
Ivan Nieto Vivanco 6ed9ed0e79 Add field type boolean to custom fields list all 2022-03-16 17:21:05 -06:00
Godfrey M b2e78e3382 formats most of the pdf blade 2022-03-16 15:53:32 -07:00
Godfrey M 5fcc3c39f3 routes eula agreements for download correctly to the asset history 2022-03-16 11:56:56 -07:00
snipe 9db8bd782d Merging master down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:02:07 +00:00
Godfrey M 6386fa1c5e clean up 2022-03-16 09:54:10 -07:00
snipe 781b426018 Fixed #10826 - parse error on translation string for print all assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 08:50:47 -07:00
Godfrey M b2f7262cd2 adds table structure for asset history 2022-03-14 19:38:36 -07:00
Dampfklon 29e1d657e3 fix missed rename 2022-03-11 21:33:25 +01:00
Godfrey M e1a6a2afc6 adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet 2022-03-10 12:15:50 -08:00
Ivan Nieto Vivanco 86bd90c564 Show icons in the asset view for boolean customfields 2022-03-09 21:46:19 -06:00
snipe c817daa4da
Merge pull request #10767 from uberbrady/fix_double_request_datatable 
One attempt to fix the 'datatable double-request' problem.
 2022-03-08 20:34:15 -08:00
Godfrey M 59c583ac74 adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI 2022-03-08 16:42:27 -08:00
Ivan Nieto Vivanco 657cfddd3c Add a condition to show customfields as the user wants in localization settings 2022-03-08 18:28:13 -06:00
Ivan Nieto Vivanco 2410b1a146 Add a condition to show customfields as the user wants in localization settings 2022-03-08 18:25:15 -06:00
snipe def570db4b Finer grain for > 200 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 18:51:49 -08:00
snipe fcb81b9505 Use the max_results env value in the paginator 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 18:39:39 -08:00
Brady Wetherington 8d49d35463 Remove another data-toggle="table" - possibly the last one 2022-03-07 12:52:57 -08:00
Brady Wetherington 6f3e9033c2 One attempt to fix the 'datatable double-request' problem. 2022-03-07 12:52:57 -08:00
snipe 9a358087ec Add remote user to bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 06:47:23 -08:00
snipe 06a05e6340 Added remote to view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 05:37:28 -08:00
snipe 43c1949092 Add remote option to user 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 05:35:26 -08:00
snipe a9069e65e5 Don’t show groups in menu if there are none yet 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 04:39:39 -08:00
snipe 1400c610a1 Use correct button translation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 04:22:44 -08:00
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
 2022-03-03 21:59:38 -08:00
snipe 5266b2c71f Added notes field to view blades 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:30:27 -08:00
snipe dc1e0ecdb7
Merge pull request #10739 from insert-waffle/fixes/prevent_double_values_email 
Feature: Prevent showing of double values in a checkin or checkout email
 2022-03-02 14:28:22 -08:00
Jens Maes 9b88f650d2 Prevents showing double values 
- If the asset name and tag are the same, the tag does not get shown in an email.
- If the model name is the same as the model number (when importing from LanSweeper for example), do not show the model number.
 2022-02-25 08:19:46 +01:00
Jens Maes 57e93e4e92 Fixes 10708: change size of fa-hdd to 2x 2022-02-24 11:05:40 +01:00
Jens Maes c0893c44a3 Fixes 10708: Removed line heigt from manufacturer list item. 2022-02-24 10:29:39 +01:00
snipe 42fcd29200 Fixed #10436 on master, applies #10449 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 21:06:54 -08:00
snipe dd5f812d88 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/FixDoubleEscape.php
#	app/Console/Commands/LdapSync.php
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/CompaniesController.php
#	app/Http/Controllers/Api/DepartmentsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Models/Loggable.php
#	app/Providers/AuthServiceProvider.php
#	config/version.php
#	database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
#	database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
#	package-lock.json
#	package.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
#	resources/views/hardware/view.blade.php
 2022-02-20 13:29:12 -08:00
Jens Maes e5f6b48115 🧑‍🔧 Added 2 breaks in message.blade.php 
The uploaded logo does not align properly, therefor I added 2 breaks which make sure the site title is BELOW the logo and not next to it.
 2022-02-18 10:27:12 +01:00
snipe 824eedf7c2 Added UI elements for is_unique 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-16 13:47:48 -08:00
Dampfklon 0d49fc3a2e remove unused route, controller functions and view 2022-02-13 12:10:19 +01:00
Dampfklon 43d92bec5b apply translation to view 
rearrange eula on top
small design fixes
 2022-02-13 12:02:20 +01:00
snipe 8b8e93d703 Fixed #10659 - wrong translation string reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 21:03:09 -08:00
snipe d406dc43c2 Check for valid user before trying to present the auditor name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 20:13:02 -08:00
snipe 2ce44bd4e6 Line break for easier debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 20:06:55 -08:00
snipe 6b25b53462
Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio 
Fixes #10299 Default Values do not allow Checkbox/Radio Buttons
 2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco 6d79c9f3e2 Save the default values for custom fields with same format than Assets do for actual values 2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco a36957dd77 Finish the implementation of custom fields default values for checkboxes 2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco 413e44be2f Add custom date to checkin actionlogs and show it in the history of the asset tab 2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco d71aa859fc Add custom date to checkin actionlogs and show it in the history of the asset tab 2022-02-08 11:43:24 -06:00
Godfrey M 5a70bba51b changed model for default currency requirement check 2022-02-07 09:51:35 -08:00
snipe 8add47739e
Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null 
Fixes: Column activated cannot be null [sc-18528]
 2022-02-02 12:21:31 -08:00
snipe c0cc90066f
Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop 
Fixes: Column activated cannot be null for develop [sc-18528]
 2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco fa2f8409f9 Add a casting to a truthy/falsy that needs to be integer 2022-02-02 14:09:23 -06:00
Ivan Nieto Vivanco eac8e0bdba Add a casting to a truthy/falsy that needs to be integer 2022-02-02 13:54:57 -06:00
snipe ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin 
Added #10454: Quick Scan Checkin
 2022-02-01 20:19:45 -08:00
snipe 5fded57ec6 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/ProfileController.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	app/Models/License.php
#	app/Providers/AppServiceProvider.php
#	app/Services/LdapAd.php
#	config/version.php
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/lang/ar/button.php
#	resources/lang/de/admin/companies/general.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/groups/titles.php
#	resources/lang/de/admin/hardware/form.php
#	resources/lang/de/admin/hardware/general.php
#	resources/lang/de/admin/hardware/message.php
#	resources/lang/de/admin/hardware/table.php
#	resources/lang/de/admin/kits/general.php
#	resources/lang/de/admin/locations/table.php
#	resources/lang/de/admin/reports/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/de/admin/users/general.php
#	resources/lang/de/general.php
#	resources/lang/de/mail.php
#	resources/lang/en/admin/asset_maintenances/message.php
#	resources/lang/en/admin/asset_maintenances/table.php
#	resources/lang/en/admin/companies/general.php
#	resources/lang/en/admin/companies/message.php
#	resources/lang/en/admin/custom_fields/general.php
#	resources/lang/en/admin/depreciations/general.php
#	resources/lang/en/admin/groups/titles.php
#	resources/lang/en/admin/hardware/form.php
#	resources/lang/en/admin/hardware/general.php
#	resources/lang/en/admin/hardware/table.php
#	resources/lang/en/admin/kits/general.php
#	resources/lang/en/admin/locations/table.php
#	resources/lang/en/admin/reports/general.php
#	resources/lang/en/admin/settings/general.php
#	resources/lang/en/admin/settings/message.php
#	resources/lang/en/admin/users/general.php
#	resources/lang/en/button.php
#	resources/lang/en/general.php
#	resources/lang/en/help.php
#	resources/lang/en/mail.php
#	resources/lang/en/passwords.php
#	resources/lang/hu/admin/hardware/general.php
#	resources/lang/hu/admin/hardware/table.php
#	resources/lang/hu/admin/locations/table.php
#	resources/lang/is/admin/locations/table.php
#	resources/lang/ko/admin/custom_fields/general.php
#	resources/lang/ko/general.php
#	resources/lang/nl/admin/hardware/general.php
#	resources/lang/nl/admin/hardware/message.php
#	resources/lang/nl/admin/hardware/table.php
#	resources/lang/nl/admin/locations/table.php
#	resources/lang/nl/admin/statuslabels/message.php
#	resources/lang/nl/admin/users/general.php
#	resources/lang/no/admin/companies/general.php
#	resources/lang/no/admin/custom_fields/general.php
#	resources/lang/no/admin/depreciations/general.php
#	resources/lang/no/admin/depreciations/table.php
#	resources/lang/no/admin/groups/titles.php
#	resources/lang/no/admin/hardware/form.php
#	resources/lang/no/admin/hardware/general.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/locations/table.php
#	resources/lang/no/admin/reports/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/admin/settings/message.php
#	resources/lang/no/admin/statuslabels/message.php
#	resources/lang/no/admin/users/general.php
#	resources/lang/no/button.php
#	resources/lang/no/general.php
#	resources/lang/no/mail.php
#	resources/lang/no/validation.php
#	resources/lang/pl/admin/companies/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/pl/admin/depreciations/general.php
#	resources/lang/pl/admin/depreciations/table.php
#	resources/lang/pl/admin/groups/titles.php
#	resources/lang/pl/admin/hardware/form.php
#	resources/lang/pl/admin/hardware/general.php
#	resources/lang/pl/admin/hardware/table.php
#	resources/lang/pl/admin/kits/general.php
#	resources/lang/pl/admin/locations/table.php
#	resources/lang/pl/admin/reports/general.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/admin/settings/message.php
#	resources/lang/pl/admin/users/general.php
#	resources/lang/pl/button.php
#	resources/lang/pl/general.php
#	resources/lang/pt-PT/admin/companies/general.php
#	resources/lang/pt-PT/admin/custom_fields/general.php
#	resources/lang/pt-PT/admin/depreciations/general.php
#	resources/lang/pt-PT/admin/depreciations/table.php
#	resources/lang/pt-PT/admin/groups/titles.php
#	resources/lang/pt-PT/admin/hardware/form.php
#	resources/lang/pt-PT/admin/hardware/general.php
#	resources/lang/pt-PT/general.php
#	resources/lang/pt-PT/help.php
#	resources/lang/pt-PT/validation.php
#	resources/lang/ro/admin/companies/general.php
#	resources/lang/ro/admin/custom_fields/general.php
#	resources/lang/ro/admin/groups/titles.php
#	resources/lang/ro/admin/hardware/form.php
#	resources/lang/ro/admin/hardware/general.php
#	resources/lang/ro/admin/hardware/message.php
#	resources/lang/ro/admin/hardware/table.php
#	resources/lang/ro/admin/locations/table.php
#	resources/lang/ro/admin/settings/message.php
#	resources/lang/ru/admin/companies/general.php
#	resources/lang/ru/admin/custom_fields/general.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/general.php
#	resources/lang/ru/validation.php
#	resources/lang/sk/admin/settings/general.php
#	resources/lang/sk/button.php
#	resources/lang/sk/general.php
#	resources/lang/tr/admin/hardware/form.php
#	resources/lang/tr/admin/hardware/table.php
#	resources/lang/tr/admin/kits/general.php
#	resources/lang/tr/admin/locations/table.php
#	resources/lang/tr/admin/reports/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/admin/settings/message.php
#	resources/lang/tr/admin/statuslabels/message.php
#	resources/lang/tr/admin/users/general.php
#	resources/lang/tr/button.php
#	resources/lang/tr/general.php
#	resources/lang/zh-CN/admin/companies/general.php
#	resources/lang/zh-CN/admin/custom_fields/general.php
#	resources/lang/zh-CN/admin/depreciations/general.php
#	resources/lang/zh-CN/admin/depreciations/table.php
#	resources/lang/zh-CN/admin/groups/titles.php
#	resources/lang/zh-CN/admin/hardware/form.php
#	resources/lang/zh-CN/admin/hardware/general.php
#	resources/lang/zh-CN/admin/hardware/message.php
#	resources/lang/zh-CN/admin/hardware/table.php
#	resources/lang/zh-CN/admin/kits/general.php
#	resources/lang/zh-CN/admin/locations/table.php
#	resources/lang/zh-CN/admin/reports/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/lang/zh-CN/admin/settings/message.php
#	resources/lang/zh-CN/admin/statuslabels/message.php
#	resources/lang/zh-CN/admin/users/general.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-CN/general.php
#	resources/lang/zh-CN/mail.php
#	resources/views/depreciations/edit.blade.php
 2022-02-01 18:53:05 -08:00
snipe 2815e0d36e Fixed audit email template (applies #10592 to master) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 17:27:32 -08:00
Brady Wetherington eaba560877 We had a markdown failure in the upcoming audits table, this fixes it. 2022-02-01 14:06:01 -08:00
Ivan Nieto Vivanco a87478d3ac Set the actual field we are evaluating as required (months) 2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco 34819ec5cf Fixes the appearance of some error messages 2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco 44349db597 Fixes the appearance of some error messages 2022-01-26 22:58:02 -06:00
Ivan Nieto Vivanco 7383ec7f1e Add an early return if the model id is not set (for new Asset Models) 2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco 9ae03f21dc Adds condition to only charge custom field's livewire when the model is updated 2022-01-15 12:14:34 -06:00
snipe 67ba8a6281 Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:18:39 -08:00
snipe 9368ddeaf0 Added badge count on requestable assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:17:54 -08:00
snipe f206d4ed4e Fixed double div in current purchase value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:26:56 -08:00
snipe 43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
 2022-01-12 20:51:33 -08:00
snipe df0da0f3bc Fixed escaped string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 11:20:31 -08:00
Alex Janes d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin 2022-01-11 16:40:20 -05:00
Alex Janes edef640d35
Merge branch 'develop' into features/lock_logins_to_saml 2022-01-11 09:05:14 -05:00
snipe d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings 
Added #10242: Improved localized strings
 2022-01-10 14:48:52 -08:00
snipe b98c97b00e
Merge pull request #10265 from uberbrady/remove_old_ldap 
Remove old ldap
 2022-01-10 14:34:34 -08:00
Wächtler, Yannick f906dbd81e Added missed translation strings, fixed the column width for the date selector (too small in certain languages) 2022-01-10 09:21:23 +01:00
Nuraeil 5bb2f6fa0f
Merge branch 'develop' into added-localized-strings 2022-01-09 17:40:54 +01:00
Wächtler, Yannick b77e7f88d4 fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix 2022-01-09 17:35:28 +01:00
snipe 0f5bb0e65d Localize bakcup restore strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-07 16:50:19 -08:00
Wächtler, Yannick c3ab4c7512 Fixed the tables not displaying the correct language 2022-01-06 14:29:10 +01:00
Wächtler, Yannick 04d649122b Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Nuraeil 271c364ef8
Merge pull request #9 from snipe/develop 
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
 2022-01-04 10:48:51 +01:00
Brady Wetherington 3c7f2e89ec Merge branch 'develop' into remove_old_ldap 
Had to re-do the composer install because the conflicts were too complicated.
 2022-01-03 12:56:58 -08:00
Alex Janes 5fe2083688 Adjusted the phrasing around auto-incrementing asset tags. 2021-12-31 16:33:30 -05:00
Alex Janes ea93f82bde added the notes field to allow users to quickly add notes to multiple checkins at once 2021-12-23 17:37:48 -05:00
Alex Janes b01a4468c7 refactored from bulkcheckin to quickscancheckin 2021-12-20 23:27:36 -05:00
snipe 48d3bfef03
Merge pull request #10421 from Robert-Azelis/patch-5 
Create new user account from asset form - additional fields
 2021-12-20 17:05:38 -08:00
Alex Janes 55b8d080b9 more lang changes 2021-12-20 19:39:06 -05:00
Alex Janes 3841c3560b changed a page title 2021-12-20 16:52:00 -05:00
Alex Janes 08cb8c354b more cleanup to fit formatting convention 2021-12-19 19:11:24 -05:00
Alex Janes 29da4f4325 Removed a bunch of redundant code I created from the API 2021-12-19 18:39:57 -05:00
Alex Janes bc4fe88ac0 First version of bulk checkin 2021-12-19 16:53:31 -05:00
Alex Janes ead142cdf7 Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR) 2021-12-18 12:00:07 -05:00
snipe 9b2dd6522f Switch GET to POST for asset request 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 20:36:08 -08:00
snipe 4ca2252e3b Switches GET to POST for request assset 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 20:32:29 -08:00
Wächtler, Yannick 2901525194 Merge branch 'snipe-develop' into added-localized-strings 2021-12-17 00:22:08 +01:00
Wächtler, Yannick 279fced877 merge 2021-12-17 00:14:36 +01:00
snipe 398180dc59 Small merge unmagling 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 14:38:04 -08:00
snipe c3d55ee27e Merge master down into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Models/Setting.php
#	config/version.php
#	resources/lang/af/button.php
#	resources/lang/ar/button.php
#	resources/lang/bg/button.php
#	resources/lang/cs/button.php
#	resources/lang/cy/button.php
#	resources/lang/da/button.php
#	resources/lang/de/button.php
#	resources/lang/el/button.php
#	resources/lang/en-GB/button.php
#	resources/lang/en-ID/button.php
#	resources/lang/es-CO/admin/groups/message.php
#	resources/lang/es-MX/button.php
#	resources/lang/et/admin/custom_fields/general.php
#	resources/lang/et/admin/hardware/table.php
#	resources/lang/et/admin/kits/general.php
#	resources/lang/et/admin/manufacturers/message.php
#	resources/lang/et/admin/models/general.php
#	resources/lang/et/admin/settings/general.php
#	resources/lang/et/button.php
#	resources/lang/et/mail.php
#	resources/lang/fa/button.php
#	resources/lang/fa/help.php
#	resources/lang/fi/button.php
#	resources/lang/fil/button.php
#	resources/lang/fr/button.php
#	resources/lang/ga-IE/button.php
#	resources/lang/he/button.php
#	resources/lang/hr/button.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/auth/message.php
#	resources/lang/hu/button.php
#	resources/lang/hu/mail.php
#	resources/lang/id/admin/hardware/table.php
#	resources/lang/id/button.php
#	resources/lang/it/button.php
#	resources/lang/iu/button.php
#	resources/lang/ja/button.php
#	resources/lang/ko/button.php
#	resources/lang/lt/button.php
#	resources/lang/lv/button.php
#	resources/lang/mi/button.php
#	resources/lang/mk/button.php
#	resources/lang/ml-IN/button.php
#	resources/lang/mn/button.php
#	resources/lang/ms/admin/hardware/table.php
#	resources/lang/ms/admin/kits/general.php
#	resources/lang/ms/admin/models/general.php
#	resources/lang/ms/admin/models/message.php
#	resources/lang/ms/admin/settings/general.php
#	resources/lang/ms/button.php
#	resources/lang/nl/button.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/auth/message.php
#	resources/lang/no/button.php
#	resources/lang/no/help.php
#	resources/lang/no/mail.php
#	resources/lang/pl/button.php
#	resources/lang/pt-BR/button.php
#	resources/lang/pt-PT/auth/message.php
#	resources/lang/pt-PT/button.php
#	resources/lang/pt-PT/mail.php
#	resources/lang/ro/button.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/help.php
#	resources/lang/sl/admin/custom_fields/general.php
#	resources/lang/sl/admin/hardware/table.php
#	resources/lang/sl/admin/kits/general.php
#	resources/lang/sl/admin/manufacturers/message.php
#	resources/lang/sl/admin/models/general.php
#	resources/lang/sl/admin/settings/general.php
#	resources/lang/sl/admin/users/general.php
#	resources/lang/sl/auth/message.php
#	resources/lang/sl/button.php
#	resources/lang/sl/help.php
#	resources/lang/sr-CS/button.php
#	resources/lang/ta/button.php
#	resources/lang/th/button.php
#	resources/lang/th/mail.php
#	resources/lang/tl/button.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/auth/message.php
#	resources/lang/tr/button.php
#	resources/lang/uk/button.php
#	resources/lang/ur-PK/button.php
#	resources/lang/vi/button.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-HK/button.php
#	resources/lang/zh-TW/admin/hardware/table.php
#	resources/lang/zh-TW/button.php
#	resources/lang/zu/button.php
#	resources/views/models/custom_fields_form.blade.php
#	resources/views/reports/custom.blade.php
#	resources/views/settings/slack.blade.php
 2021-12-16 14:26:24 -08:00
Nuraeil c3b7576d99
Merge pull request #7 from snipe/develop 
Develop
 2021-12-14 19:51:40 +01:00
Wächtler, Yannick 484b996879 fixed merge conflicts 2021-12-14 19:48:59 +01:00
snipe 52322806fa
Merge pull request #10434 from inietov/fixes/v6_components_error 
Fix route to checkout components from the details page
 2021-12-14 10:41:24 -08:00
Wächtler, Yannick 4397a12efc Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop 2021-12-14 19:37:27 +01:00
Ivan Nieto Vivanco d083f89f30 Delete extra character remaining from previous tests :( 2021-12-14 12:32:30 -06:00
Ivan Nieto Vivanco 2402f00a2e Fix route to checkout components from the details page 2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco c80aa2a289 Add title column to custom reports 2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco 0037cdb00c Add title column to custom reports 2021-12-13 20:27:23 -06:00
Robert-Azelis 01608d81ab
Update user.blade.php 
Create new user account from asset form - additional fields #10420
 2021-12-13 09:22:25 +01:00
snipe e1bf3b50f4 Added model number to accessory report 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-10 15:09:29 -08:00
snipe ff97b359ad Removed form request on ajax, cleaned up some other things 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 17:58:46 -08:00
snipe cde2bad297 Small mods to slack jquery 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 15:56:05 -08:00
snipe 6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk 
WIP - Fixing unit tests, switching to dusk
 2021-12-06 14:19:36 -08:00
snipe 0ba55e0eaf
Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase 
Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches m…
 2021-12-06 14:08:24 -08:00
snipe ebdbc20740 Adds stricter validation for slack endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-06 11:40:24 -08:00
Andrew Roth d1d3b84f77 Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item. 2021-12-06 13:06:23 -05:00
snipe cae62fd4c7
Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity 
Fixed #5676: Sum cost by quantity
 2021-12-02 12:13:04 -08:00
snipe d08c1787a1 First steps at getting dusk working 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:09:29 -08:00
Nuraeil d3972888dc
Merge pull request #6 from snipe/develop 
Develop
 2021-11-30 06:37:17 +01:00
snipe 3b68a6f1be
Merge pull request #10345 from leitwerk-ag/master 
Fixed #10344 and #9135: don't prepand fields with a whitespace in text based export formats
 2021-11-24 19:43:21 -08:00
snipe 4afd598df7
Merge pull request #10356 from bestlong/fix_modal_dialog_html_typo 
fix modal-title html tag unpaired.
 2021-11-24 19:39:58 -08:00
Shao Yu-Lung 55d05eeae3 fix modal-title html tag unpaired. 2021-11-24 10:28:10 +08:00
Ivan Nieto Vivanco d95d3dc282 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:21:46 -06:00
Ivan Nieto Vivanco 741eb28622 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:11:21 -06:00
Klaus J. Mueller a85fa14f9c fix #10344 and #9135 2021-11-22 17:58:26 +01:00
Matthew Nickson 9381ba2404
Merge branch 'develop' into sum_cost_by_quantity 2021-11-21 18:59:34 +00:00
Wächtler, Yannick 1b76185798 Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them 2021-11-19 15:32:13 +01:00
Wächtler, Yannick 9164daf5bc Added localized strings for admin/settings 2021-11-19 15:23:48 +01:00
Wächtler, Yannick 6917d59185 Added localized strings for reports 2021-11-19 12:39:19 +01:00
Wächtler, Yannick 04fec144a0 Added localization strings for partials, added file structure 2021-11-19 12:12:11 +01:00
Nuraeil 7084703b5a
Merge pull request #4 from snipe/develop 
Merge current develop into branch
 2021-11-18 21:30:45 +01:00
Wächtler, Yannick 5a2f8788a9 Fixed merge issue in view.blade.php and added translatable string 2021-11-16 19:34:20 +01:00
Wächtler, Yannick f2c3e51a83 Catching up to snipe-it/develop branch 2021-11-16 19:25:23 +01:00
Wächtler, Yannick 6feb39f6b9 Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop 2021-11-16 08:50:45 +01:00
snipe bbb0d1be17 Possible fix for asset model editing when no custom fieldset is associated 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 21:09:35 -08:00
snipe 65d1855b38 Display app_locked message on front-end 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:50:55 -08:00
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
snipe bc21875324 More refinements to the UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 18:15:38 -08:00
snipe 1a703bf78b Added logout clarification 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:59:52 -08:00
snipe 494c72d92b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:58:04 -08:00
snipe 69fe3c0299 Added some comments on the JS 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:57:15 -08:00
snipe e2702186a9 Slightly reworked UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:48:59 -08:00
snipe b069eec43a Fixed upload disabled button 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 16:01:22 -08:00
snipe f8cf65bbb3 Small layout fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 13:01:02 -08:00
snipe ec2a3b0f35 Updated label names 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:44:34 -08:00
snipe 230a568145 Added help text and more info in the modal 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:44:11 -08:00
snipe 856b9294f8 Improved BS tables on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:08:43 -08:00
snipe 8590e5d67e UNRELATED: fixed wrong html tag for license view badge count 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:08:15 -08:00
snipe fb21712a68 Added restore modal HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-09 19:38:40 -08:00
Brady Wetherington a58c5ce27f Better documentation, disable AdLdap2-based "Add domain" setting 2021-11-08 17:11:47 -08:00
snipe edf98cb795
Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required 
Turn custom fields required/optional/remove into POST requests
 2021-11-08 14:37:36 -08:00
snipe 38c36af6fc Changes logout to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-08 12:53:11 -08:00
snipe 0d811d067c Turn cusotm fields required/optional/remove into POST requests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-05 10:53:48 -07:00
Wächtler, Yannick 6b2801867d Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general 2021-11-04 20:15:23 +01:00
Wächtler, Yannick 63b30489df Added localized strings for notifications 2021-11-02 15:44:57 +01:00
Wächtler, Yannick 670b70c7e1 Added localized strings for models 2021-11-02 15:34:50 +01:00
Wächtler, Yannick c0891e6827 Added localized strings for modals 2021-11-02 15:27:13 +01:00
Wächtler, Yannick 30d30490a3 Added localized strings for locations 2021-11-02 15:14:54 +01:00
Wächtler, Yannick 4af6412da6 Added localized strings for licenses 2021-11-02 14:55:49 +01:00
Wächtler, Yannick 4fcd4a930f Added localized strings for layouts 2021-11-02 14:45:58 +01:00
Wächtler, Yannick 8bad9c5140 Added localized strings for kits 2021-11-02 14:25:21 +01:00
Wächtler, Yannick 26e056fb3c Added localized strings for improter, added en structure 2021-11-02 14:09:22 +01:00
Wächtler, Yannick c16ade2d87 Added localized strings for hardware 2021-11-02 14:02:48 +01:00
Wächtler, Yannick 167bf97d46 Added localized strings for groups 2021-11-02 12:03:41 +01:00
Wächtler, Yannick e825fa81aa Added localized strings for depreciations 2021-11-02 11:50:56 +01:00
Wächtler, Yannick a96c53784c Added localized strings for custom_fields 2021-11-02 11:27:53 +01:00
Wächtler, Yannick c11af0e222 Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php 2021-11-02 10:40:41 +01:00
Wächtler, Yannick 433d6fd3e0 Added localized strings for admin/companies 2021-11-02 10:23:15 +01:00
Wächtler, Yannick b784e63aa8 Added localized strings for account 2021-11-02 10:13:22 +01:00
Matthew Nickson 90ca66834b
Fixed sumFormatterQuantity if using 1.234,56 fomat 
Previously sumFormatterQuantity used the parseFloat to convert the
string purchase_cost to a floating point number. parseFloat does not
return the correct value when using the comma format. To fix this
sumFormatterQuantity now used the cleanFloat function to convert
purchase_cost to a float.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2021-10-30 22:48:45 +01:00
Brady Wetherington 31933a56fa Trying to get the login screen working 2021-10-28 18:18:11 -07:00
snipe 798f6d65de
Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self 
Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view
 2021-10-28 17:53:24 -07:00
snipe dc71f6ddc6
Merge pull request #9871 from jethron/patch-1 
Fixed: double slashes in branding logo URL path
 2021-10-28 17:36:43 -07:00
snipe 3ede7c7f18 Use icon and string for maintained value in license view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 17:26:03 -07:00
snipe 645529ba78
Merge pull request #9889 from ncareau/api-licenses 
Add licenses api parameters and fix a missing variable in license view.
 2021-10-28 17:20:09 -07:00
snipe 3951de1669
Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you 2021-10-28 17:13:37 -07:00
snipe 52ef9280ba Adds reqestable as model bulk edit field 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 15:15:54 -07:00
snipe 668e8a357c Fixed labels in profile form 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 12:57:27 -07:00
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
 2021-10-20 17:26:41 -07:00
snipe 365349fd91 Center custom fields email icon 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-18 18:39:46 -07:00
snipe bda23bb1e6 Fixes possible XSS on all-file-types export 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-15 11:50:52 -05:00
snipe 4095a3f8c4 Removed dupe bars 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-12 12:31:08 -07:00
snipe 892fc0004a Fixed misisng hamburger menu 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-12 12:09:46 -07:00
Matthew Nickson 8996c24d1f
Merge branch 'develop' into sum_cost_by_quantity 2021-10-10 13:01:44 +01:00
Dampfklon 4418ad2340 Enable display of deleted acceptances, strike deleted users, add date, enable sorting 2021-10-07 21:03:46 +02:00
Dampfklon 12ee06deb6 add Download All Button, change route analogue to activity report 2021-10-07 21:01:50 +02:00
Dampfklon ed99532c30 Unaccepted Assets Report Actions (send reminder, delete) added 
Unaccepted Assets Export fixed
 2021-10-07 20:53:02 +02:00
snipe 7848a3c3dc Use Storage:: facade for image preview for models 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 13:12:42 -07:00
snipe f306401e7e Fixed SVG XSS vuln 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:26:45 -07:00
Brady Wetherington bbeedc026d A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working. 2021-10-04 22:07:29 -07:00
Brady Wetherington d80604f2ac Most of the basics are working, but not done and lots of debug messages are about 
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
 2021-10-04 22:06:48 -07:00
snipe dc3af7cc74 Resolved conflicts 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 20:39:24 -07:00
snipe e491a93892 Removed restore link 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:56:56 -07:00
snipe b20c841a89 Fixed asset models restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:29:13 -07:00
snipe 8fe59f8383 Switch users restore over to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:22:38 -07:00
snipe 8bf09d9f89 Make form-based restore button on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:01:16 -07:00
snipe 3594ec9905 Handle bulk check and uncheck 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:58:16 -07:00
snipe 52caee2a9f Handle checking and unchecking for bulk actions 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:18:26 -07:00
snipe 52ea172e5d Fix ID array 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:18:07 -07:00
snipe 85b5f52cd8 Nicer mobile view for user view icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 23:04:30 -07:00
snipe 61f16f47a2 Use Helper alias 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 19:44:55 -07:00
Brady Wetherington ae466be153 Fix license output, tweak CleanFloat function to handle numbers over 1 million 2021-09-28 19:10:25 -07:00
Brady Wetherington f380da3f19 Try to ensure all currency output is formatted correctly. 2021-09-28 16:45:47 -07:00
snipe 9311f8694f Fixed incorrect icon for map marker 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 09:35:48 -07:00
NMC c680977791
Merge branch 'develop' into api-licenses 2021-09-27 15:02:51 -04:00
snipe 1657ba396f Added available license seat count to top tabs for licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-26 15:03:56 -07:00
snipe f0da1977fb Small visual improvements on consumables view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-26 14:32:51 -07:00
snipe 450da5661d Add additional info on accessories view page 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-26 03:59:04 -07:00
snipe a6632a7b9f Use new row striping on licenses detail page 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-26 03:58:53 -07:00
snipe 7e41c74cc3 Updated more fa icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-26 01:11:08 -07:00
snipe 65a6da5bd2 Added files tab back to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-25 22:59:02 -07:00
snipe a7b3f98e9f Updated angle icon with new font awesome 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-25 22:57:27 -07:00
snipe 8ee00d0f42 Changed paperflip to file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-25 22:57:06 -07:00
snipe 67d898e897 Updated map icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 14:30:36 -07:00
snipe a9b306f2d2 Backing out the ribbon - too finicky on mobile :( 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 14:30:29 -07:00
snipe e03d7b7016 More fa icon updates 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 13:07:02 -07:00
snipe 20e23c1248 Fixed 500 on wrong association 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 12:54:47 -07:00
snipe 5875cf1e9e Removed test code 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 12:33:34 -07:00
snipe decc771459 Starting to refactor the hardware page 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 12:05:48 -07:00
snipe 78fa6452ee Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 12:05:18 -07:00
snipe 2c141813f1 Better formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 11:51:52 -07:00
snipe 3317b5107a Added ribbon to show on user's photo that they are an admin 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 11:13:55 -07:00
snipe 0d1bd5b470 Updated more fa icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 11:13:34 -07:00
snipe 299ad681f7 More fa icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 07:21:30 -07:00
snipe b2dc92b088 And a few more missed icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 06:44:38 -07:00
snipe ad6f073c82 Few more icon updates 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 06:38:23 -07:00
snipe 8aba37522d More FA icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 06:18:22 -07:00
snipe dbe93d91cd Updated fontawesome icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 06:07:46 -07:00
snipe 4a8f06b0f1 Added badge counters to tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 04:12:22 -07:00
snipe 8937396a26 Added padding to the sidenav on mobile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 03:02:57 -07:00
snipe fd7c6179d5 Show the user's photo frst on mobile view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 03:02:47 -07:00
snipe 7f41bdf0b0 Use new striping on hardware page 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 02:17:57 -07:00
snipe 90c22caa4b Rework user page to no longer use tables for data layout 
This also fixes the weird display when lines break

Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 02:17:40 -07:00
snipe fedf51dda4 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 18:29:47 -07:00
snipe 0f40ba2b34 Check for admin rights before displaying admin permission options 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 19:31:49 -07:00
snipe 39a702397a Add user permissions message if the user is not an admin or better 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 19:05:02 -07:00
snipe 61cf9ec009 Small conflict handling bits 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 00:00:44 -07:00
snipe e27065fe16 Merge branch 'develop-v6-integration' into develop-v6-rc1 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/ResetDemoSettings.php
#	app/Helpers/Helper.php
#	app/Http/Controllers/Api/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/ComponentsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/DepreciationsController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Requests/ImageUploadRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Http/Transformers/DepreciationsTransformer.php
#	app/Listeners/CheckoutableListener.php
#	app/Models/Accessory.php
#	app/Models/Asset.php
#	app/Models/Company.php
#	app/Models/Ldap.php
#	app/Models/User.php
#	app/Presenters/AssetPresenter.php
#	app/Presenters/CategoryPresenter.php
#	composer.json
#	composer.lock
#	config/version.php
#	database/factories/AssetModelFactory.php
#	database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
#	database/seeds/AssetModelSeeder.php
#	package-lock.json
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-contrast.css
#	public/css/dist/skins/skin-contrast.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/js/vue.js
#	resources/lang/af/validation.php
#	resources/lang/ar/admin/settings/general.php
#	resources/lang/ar/validation.php
#	resources/lang/bg/admin/settings/general.php
#	resources/lang/bg/validation.php
#	resources/lang/cs/admin/settings/general.php
#	resources/lang/cs/validation.php
#	resources/lang/cy/help.php
#	resources/lang/cy/validation.php
#	resources/lang/da/admin/settings/general.php
#	resources/lang/da/validation.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/validation.php
#	resources/lang/el/validation.php
#	resources/lang/en-GB/admin/settings/general.php
#	resources/lang/en-GB/validation.php
#	resources/lang/en-ID/admin/hardware/table.php
#	resources/lang/en-ID/admin/settings/general.php
#	resources/lang/en-ID/validation.php
#	resources/lang/es-CO/admin/settings/general.php
#	resources/lang/es-CO/auth/message.php
#	resources/lang/es-CO/button.php
#	resources/lang/es-CO/help.php
#	resources/lang/es-CO/validation.php
#	resources/lang/es-ES/admin/settings/general.php
#	resources/lang/es-ES/auth/message.php
#	resources/lang/es-ES/button.php
#	resources/lang/es-ES/help.php
#	resources/lang/es-ES/validation.php
#	resources/lang/es-MX/admin/settings/general.php
#	resources/lang/es-MX/validation.php
#	resources/lang/es-VE/admin/settings/general.php
#	resources/lang/es-VE/auth/message.php
#	resources/lang/es-VE/button.php
#	resources/lang/es-VE/help.php
#	resources/lang/es-VE/validation.php
#	resources/lang/et/validation.php
#	resources/lang/fa/validation.php
#	resources/lang/fi/admin/settings/general.php
#	resources/lang/fi/validation.php
#	resources/lang/fil/validation.php
#	resources/lang/fr/admin/settings/general.php
#	resources/lang/fr/validation.php
#	resources/lang/ga-IE/validation.php
#	resources/lang/he/admin/settings/general.php
#	resources/lang/he/general.php
#	resources/lang/he/validation.php
#	resources/lang/hr/validation.php
#	resources/lang/hu/validation.php
#	resources/lang/id/validation.php
#	resources/lang/is/admin/categories/general.php
#	resources/lang/is/admin/companies/message.php
#	resources/lang/is/admin/companies/table.php
#	resources/lang/is/admin/components/general.php
#	resources/lang/is/admin/components/table.php
#	resources/lang/is/admin/consumables/table.php
#	resources/lang/is/admin/depreciations/general.php
#	resources/lang/is/admin/depreciations/message.php
#	resources/lang/is/admin/hardware/form.php
#	resources/lang/is/admin/hardware/general.php
#	resources/lang/is/admin/hardware/message.php
#	resources/lang/is/admin/hardware/table.php
#	resources/lang/is/admin/kits/general.php
#	resources/lang/is/admin/licenses/form.php
#	resources/lang/is/admin/licenses/general.php
#	resources/lang/is/admin/locations/table.php
#	resources/lang/is/admin/manufacturers/table.php
#	resources/lang/is/admin/reports/message.php
#	resources/lang/is/admin/settings/general.php
#	resources/lang/is/admin/settings/message.php
#	resources/lang/is/admin/statuslabels/message.php
#	resources/lang/is/admin/suppliers/message.php
#	resources/lang/is/admin/suppliers/table.php
#	resources/lang/is/admin/users/table.php
#	resources/lang/is/mail.php
#	resources/lang/is/validation.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/it/validation.php
#	resources/lang/iu/validation.php
#	resources/lang/ja/mail.php
#	resources/lang/ja/validation.php
#	resources/lang/ko/validation.php
#	resources/lang/lt/validation.php
#	resources/lang/lv/validation.php
#	resources/lang/mi/validation.php
#	resources/lang/mk/validation.php
#	resources/lang/ml-IN/validation.php
#	resources/lang/mn/validation.php
#	resources/lang/ms/validation.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/validation.php
#	resources/lang/no/validation.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/validation.php
#	resources/lang/pt-BR/admin/settings/general.php
#	resources/lang/pt-BR/mail.php
#	resources/lang/pt-BR/validation.php
#	resources/lang/pt-PT/validation.php
#	resources/lang/ro/validation.php
#	resources/lang/ru/validation.php
#	resources/lang/sl/validation.php
#	resources/lang/sr-CS/admin/settings/general.php
#	resources/lang/sr-CS/validation.php
#	resources/lang/sv-SE/admin/settings/general.php
#	resources/lang/sv-SE/auth/message.php
#	resources/lang/sv-SE/button.php
#	resources/lang/sv-SE/mail.php
#	resources/lang/sv-SE/validation.php
#	resources/lang/ta/validation.php
#	resources/lang/th/validation.php
#	resources/lang/tl/validation.php
#	resources/lang/tr/mail.php
#	resources/lang/tr/validation.php
#	resources/lang/uk/admin/accessories/table.php
#	resources/lang/uk/admin/asset_maintenances/message.php
#	resources/lang/uk/admin/asset_maintenances/table.php
#	resources/lang/uk/validation.php
#	resources/lang/ur-PK/validation.php
#	resources/lang/vi/admin/settings/general.php
#	resources/lang/vi/validation.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/lang/zh-CN/validation.php
#	resources/lang/zh-HK/validation.php
#	resources/lang/zh-TW/validation.php
#	resources/lang/zu/validation.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	routes/api.php
 2021-09-21 23:46:50 -07:00
snipe b4a90045e6 Added totals to depreciation report footer 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 21:52:18 -07:00
snipe 9b78b25372 Grr. 100 should be 1000 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 21:28:59 -07:00
snipe 7df4f98e19 Bump number per page up to 1000 
Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries.

Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 21:25:22 -07:00
Godfrey M 941cba73b9 removed deadspace and unnecessary css changes 2021-09-21 19:27:17 -07:00
Godfrey M 4a0c8de82a adds jquery eventlistner to monitor chart.js width and refresh accordingly 2021-09-21 19:13:09 -07:00
snipe 0d633ce618 Fixed issue where created_at date was not showing on uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-13 17:13:01 -07:00
snipe c6b26965a0 Check for valid category name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-13 15:47:13 -07:00
Ivan Nieto Vivanco 1ae665b645 Use the property 'archived' so if the 'name' one changes it doesn't fails 2021-09-13 16:45:05 -05:00
Ivan Nieto Vivanco 1b433920f1 Delete an extra semicolon 2021-09-13 16:24:12 -05:00
Ivan Nieto Vivanco 2b64af0d34 Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings 2021-09-13 16:17:34 -05:00
snipe cfaa6679af
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history 
Fixed #10026: Checkout date not saved in asset history
 2021-09-07 17:37:30 -07:00
snipe 387018c44e Updated depreciation report blade to use server-side API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-01 17:05:31 -07:00
Ivan Nieto Vivanco e621eaf456 Change date showed in the activity report view, the condition is now on action_date 2021-09-01 13:58:17 -05:00
snipe d5a7955e1d Fixed #10024 - use string for dashboard in side nav instead of hard coded 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-31 22:25:00 -07:00
snipe 7e2def7896
Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments 
Fixes: Can't update departments if Full Company Support is activated
 2021-08-30 19:40:59 -07:00
snipe 4abb9baa95 Merge remote-tracking branch 'origin/develop' 2021-08-24 15:29:41 -07:00
Godfrey M a407fe9312 removed more dead space 2021-08-24 15:07:56 -07:00
Godfrey M 53ddf5ae04 removed dead space 2021-08-24 15:07:18 -07:00
Godfrey M a197b730a1 fixed a layout issue with the month field in depreciations [ch17111] 2021-08-24 15:02:42 -07:00
Ivan Nieto Vivanco 830ba470dd Change the used function to only affect single and double quotes 2021-08-23 22:10:59 -05:00
Ivan Nieto Vivanco 80fb24e861 Fix issue caused for single and double quotes when used as listbox's values 2021-08-23 22:00:01 -05:00
snipe 70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs 
Add client side ldap certs
 2021-08-23 16:30:46 -07:00
snipe 4ec4e0f44e Merge remote-tracking branch 'origin/develop' 2021-08-19 12:09:48 -07:00
Brady Wetherington e28db2d221 Fix regression for NULL valued numbers in the summary calculation 2021-08-19 12:01:47 -07:00
snipe 24af2ab67a Merge remote-tracking branch 'origin/develop' 2021-08-18 14:31:53 -07:00
Brady Wetherington 4519f6e180 Fixed sum total calculation on Bootstrap Table pages 2021-08-18 14:13:31 -07:00
snipe 04fa5f2022 Merge remote-tracking branch 'origin/develop' 2021-08-18 01:05:25 -07:00
snipe 923d2a79ae Fixed weird layout on bulk audit [ch17146] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 01:05:09 -07:00
snipe f99602c039 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2021-08-18 00:47:33 -07:00
snipe 37f2c7beac Nicer bulk asset select width 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:44:16 -07:00
snipe b5bb74b8ca Merge remote-tracking branch 'origin/develop' 2021-08-17 22:01:23 -07:00
snipe cce808c784 Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] 
Duplicates d4e46ee41f but on v5

Signed-off-by: snipe <snipe@snipe.net>
 2021-08-17 21:59:33 -07:00
Brady Wetherington 4d4badf830 Got the client-side LDAP setup working well enough for sync! 2021-08-17 14:43:36 -07:00
Godfrey M cef0e424e1 adds a Floor value for depreciation models 2021-08-16 18:14:10 -07:00
snipe 29c584289f Merge remote-tracking branch 'origin/develop' 2021-08-14 14:09:31 -07:00
Godfrey M 01037cf9cb initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358] 2021-08-10 18:26:43 -07:00
Computroniks 8121d904e7
Licence cost calculation 
Licences use diffrent key to track quantity. sumFormatterQuantity has
been modified to detect which key to use.

Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2021-08-04 22:33:39 +01:00
Computroniks f994af16da
Added function to calculate cost based on quantity 
sumFormatterQuantity takes the same input as sumFormatter but instead
of calculating the specified columns total it calculates the total
purchase cost of an item based upon its quantity. Also updated affected
pressenters to use this formatter.

Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2021-08-04 22:09:50 +01:00
NMC 976957ddd4 Add Maintained filed in licenses view and api. + Expires in API 2021-08-01 14:30:16 -04:00
Ivan Nieto Vivanco 1b8156ac7f Add a hidden field to handle departments inside Full Company Support config 2021-07-29 13:28:57 -05:00
Jethro Nederhof d8fdd1b408
Fix branding logo URL path 
The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes.

E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg`

For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s.

Thanks for your work on Snipe-It, seems like a good system so far!
 2021-07-28 14:55:34 +10:00
Ivan Nieto Vivanco 35ffe8b902 Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view 2021-07-20 18:56:22 -05:00
snipe 4cfdaf89d8 Merge remote-tracking branch 'origin/develop' 2021-07-08 17:47:08 -07:00
Brady Wetherington 0ec2884c29 The custom settings section of SAML sometimes has bad linefeeds 2021-07-08 17:00:01 -07:00
snipe f264cade7d Merge remote-tracking branch 'origin/develop' 2021-07-08 16:05:32 -07:00
snipe 06806341c7 Nicer tab names for permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 15:57:41 -07:00
Ivan Nieto Vivanco d2e94dfc1c Added cookie option to assets Bootstrap Table to save the state of the table. 2021-07-08 14:05:40 -05:00
snipe a12ae19e32 Try deferring the load so it doesn’t query the server server 7 times for login 
This doesn’t work?

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 10:50:32 -07:00
snipe 3332bbe072 Removed unused properties on login 
This may be dumb anyway - we probably don’t need to make so many round trips to the server just to see if things are required or not… But I’d really like to standardize the validation across the system

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 10:27:44 -07:00
snipe 704eb728bc Added livewire the login screen 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 02:16:57 -07:00
snipe 576e605f73 Make livewire less assy looking 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 22:40:18 -07:00
snipe ebb0aa5532
Merge pull request #9766 from uberbrady/livewire_integration_v6 
Livewire integration for Snipe-IT v6
 2021-06-28 21:51:00 -07:00
Brady Wetherington a6ac4f94f1 Breaking out field-listing into its own Livewire blade for use elsewhere 2021-06-28 21:00:20 -07:00
Brady Wetherington ea1f1eb972 Get some basic Livewire going for 'edit model's default values. 2021-06-28 21:00:20 -07:00
Brady Wetherington 8e66abb926 Basic Laravel7 compatibility, starting getting Livewire going 2021-06-28 21:00:16 -07:00
snipe dc125af029 Fixed locations link on homepage module 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 19:56:41 -07:00
snipe 2365634139 Added dashboard module for locations [ch9199] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 19:46:56 -07:00
snipe 4af247f845 Added additional boxes to the dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:36:15 -07:00
snipe d4e46ee41f Added comma in US currency format [ch16628] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:14:32 -07:00
snipe f504d7ef5f Merge remote-tracking branch 'origin/develop' 2021-06-28 13:12:10 -07:00
snipe a016f4ecd0 Applies PR #9761 to integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:11:22 -07:00
snipe 30297e479e Hide notes field by default 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:08:32 -07:00
snipe a4fd0c9c6d Fixed #9745 - added searchable, sortable notes field to status labels 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:52:57 -07:00
snipe 3ca3de9e4f Merge remote-tracking branch 'origin/develop' 2021-06-23 20:05:38 -07:00
snipe 174d53aff9 Fixed #9729 - order number maxlength updated to 200 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 20:05:22 -07:00
snipe 1ea843248b Fixed #9729 - bulk edit order number capped at 20 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 20:04:45 -07:00
Brady Wetherington 8268aca9fc Removed Ziggy.baseUrl references for meta references that had baseUrl 2021-06-23 19:57:45 -07:00
snipe 7b51bf4f51 Merge remote-tracking branch 'origin/develop' 2021-06-23 14:41:27 -07:00
snipe 4db5a8f62b
Merge pull request #9695 from Joly0/master 
Update print.blade.php
 2021-06-23 14:33:25 -07:00
snipe b3ec4bb31b Porting PR #9720 to v6 integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:28:06 -07:00
snipe ac52ea3463 Porting PR #9720 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:27:15 -07:00
Brady Wetherington 9456a03a88 Almost finished with the routes which is...hopefully? The last thing? 2021-06-22 16:58:23 -07:00
bmkalle a330dca7d4
Update company-select.blade.php 
select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.
 2021-06-17 10:51:00 +02:00
Joly0 9a429952ff update print.blade.php 2021-06-15 08:52:01 +02:00
snipe 3095a78664 Small tweaks to Dashboard controller 
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:43:47 -07:00
Joly0 72f27ccc5b Update print.blade.php 2021-06-11 11:05:39 +02:00
Ivan Nieto Vivanco 9f944ad497 Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471]. 2021-05-27 15:48:13 -05:00
snipe 9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
snipe 3f09d17389 Fixed typo “synchronization” 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-25 18:45:06 -07:00
snipe 9eea46adef Fixed parse error in user print view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-20 13:53:43 -07:00
Jonathon Reinhart fd082addff
Fix incorrect case of ldap sync status string (#9563) 
Fixes #9562
 2021-05-12 19:15:39 -07:00
snipe 76897f3a3a Make label printing from asset page more consistent with normal UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-12 17:08:53 -07:00
tbrconnect a29ef73346
Feature #3088 Print labels from asset detail page (#9559) 
This PR adds a "Generate Label" button to the detail asset page as
described in #3088.

Fixes #3088

Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
 2021-05-12 13:38:26 -07:00
Brady Wetherington 62199f6255
Manually re-add support for Label Logos in Labels (#9552) 2021-05-07 17:01:32 -07:00
snipe 9aac3ae628 Fixed HTML causing two backup headers to appear 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 16:36:07 -07:00
snipe ece627b3a3 Small fixes for location printing when relationships are missing/invalid, per #9521 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:23:46 -07:00
snipe d8d3fa2293 Only show department if it’s valid 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:13:19 -07:00
snipe 57b9b571dc
Fixed #9531 - highlight search box when filled, add clear button (#9534) 2021-05-04 22:00:34 -07:00
snipe 32f043c5df Set the body skin style if one was overridden by the user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:25:39 -07:00
snipe 23376c317e Use correct URL for css for subdirs 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:22:02 -07:00
snipe b3b02933a5 Removed duplicate code 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:21:48 -07:00
snipe 1d43eda21f
Features: improved UI for importer (#9467) 
* Small UI improvements for importer

Signed-off-by: snipe <snipe@snipe.net>

* And UI backup improvements

Signed-off-by: snipe <snipe@snipe.net>
 2021-04-21 20:16:17 -07:00
snipe 90f79eaf83 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-21 10:23:46 -07:00
aranar-pro 5127727730
Fixed #9424: import history adds asset model to assigned user and respects checkin date (#9350) 
* Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.

* Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.

* Fixed #9294: whitespace and comment cleanup for merge

* Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.
 2021-04-20 21:25:17 -07:00
snipe d10d090d33 Moved status label help text to headline 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:31:07 -07:00
snipe aa6b1456b2 Added help text to custom fields headline 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:29:43 -07:00
snipe b2de0d4ade Changed “Asset Categories” to “Categories” since there are more than asset categories now 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:29:22 -07:00
Peter Sarossy cacb707a7f
Added #9355: include Accessories and Consumables on the location reports (#9356) 2021-04-20 14:53:04 -07:00
Supapong Areeprasertkul b28b245acc
Update labels.blade.php (#8441) 
- Make the qr_size bigger when no barcode printed.
- BUG: Missing unit of font size for .qr-text class.
- Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)
 2021-04-20 14:52:17 -07:00
Michael Pietsch 15e729f4b8
fix css when not runnin in webroot directory (#9445) 
Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>
 2021-04-20 14:49:57 -07:00
Masudul Haque Shihab f3831fe010
Fixed #9447 change route parameter name in locations view (#9456) 2021-04-20 14:49:05 -07:00
snipe e4acf8d795 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 14:44:01 -07:00
snipe e8adf8d44c One more category fix 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:57:55 -07:00
snipe b693e5202b Check for category name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:54:36 -07:00
snipe e1c6d4ced7 Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Requests/SettingsSamlRequest.php
 2021-04-14 15:15:07 -07:00
Joly0 31b2287a57
Update print.blade.php (#9426) 
Fixes #9418
 2021-04-14 10:20:36 -07:00
Godfrey Martinez 5fab1d6f0d
FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab (#9424) 
* git commit -m

* added text
 2021-04-14 10:19:40 -07:00
Godfrey Martinez 246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings (#9416) 
* new branch, added manager as an additional field. Currently having DB issues

* WIP DB Issue with eloquent

* added department to LDAP sync

* removed unused variables
 2021-04-14 10:17:57 -07:00
Brady Wetherington bf344fd707 Merge branch 'develop' 
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
 2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco 9cf5fbd675
Logic added to handle when a cloned user is imported via LDAP. (#9429) 2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco 3824a50e8b
Fixes an issue with CSS when the 'skin' value in settings table is empty. (#9423) 2021-04-12 20:37:02 -07:00
snipe bf2479c5d9 Fixed url to user-ridden style 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:36:13 -07:00
snipe ba92d751a3 Removed depreciated Input:: facade 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:28:05 -07:00
Brady Wetherington 792a31cc7f Merge branch 'develop' 2021-04-06 20:10:22 -07:00
snipe 390403ddb7 Fixed #9370 - listbox custom fields not decryoted on edit 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 05:59:31 -07:00
Joel Pittet af8509c4d0
Allow NPM packages to build for production (#9171) 
* add back changes before compiling assets

* new css location and mix manifest

* update papaparse, most vunerabilities attached to it

* update axios and papaparse for security releases

* removing security fixes that still allow npm run production to work

* Update lodash
 2021-04-05 22:01:11 -07:00
snipe 09887bdabd Removed stray opening tag 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-05 21:54:31 -07:00
Godfrey Martinez f9f8ce6df6
Auditing feature improvement Better mobile [ch14328] (#9181) 2021-04-05 21:53:19 -07:00
Tetrachloromethane250 157d9e4ebb
Added #5977: Add permission to view files attached to licenses (#9264) 
* Add permission to view and modify files for licenses

* Actually use the permission
 2021-04-05 21:51:47 -07:00
snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/users/print.blade.php
 2021-04-05 20:55:49 -07:00
Godfrey Martinez 5ea759f615
Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318) 
* LDAP and Active Directory has plenty of other [ch15504]

* removed department id from ldap sync

* removed department id from ldap sync

* Update 2021_03_18_184102_adds_several_ldap_fields.php
 2021-04-05 19:26:04 -07:00
snipe 6f4215cfac Fixed label name for field_values 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-31 14:07:30 -07:00
snipe b5f7cb534e Fixed element name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-31 14:02:25 -07:00
snipe 70a7a8f20b WTF. This shit is haunted. 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-30 08:00:27 -07:00
snipe a5b67965f2 Fixed CSS path 
(Fixes RB #14746)

Signed-off-by: snipe <snipe@snipe.net>
 2021-03-30 07:49:30 -07:00
Nikolay Didenko 06e641b782
Do not override per table data-id-cookie-table attribute by current route name globally (#7835) 2021-03-29 20:05:24 -07:00
Marc Leuser 90b7d34c69
Added #6695: add API endpoint for license seats (#8058) 
* remove miselading comment line

* added dedicated API endpoint for license seats

* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway

* reduce amount of IFs

* add sanity checks to show()

* fix goofed logging logic

* add tests for action log entries
 2021-03-29 19:41:26 -07:00
NMC 3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891) 
* Add a way for a user to override the skin setting.

* Add site setting to allow user to change the skin.

* Fix skin list.

Co-authored-by: NMC <info@nmc-lab.com>
 2021-03-29 19:09:23 -07:00
Eli Young 97fa9663b1
Fixed #9299: Use correct SVG MIME type for uploads (#9300) 
The correct MIME type of SVG is image/svg+xml. Out of an abundance of
caution, I am leaving in image/svg to avoid potentially causing issues
on very old browsers, but this can likely be removed without issue.
 2021-03-15 16:42:11 -07:00
Ivan Nieto Vivanco 9ed226a0af
Fixes links in Models Actions, and to view the fieldset assigned to that Model. (#9232) 2021-03-01 13:08:29 -08:00
Joel Pittet c979779249
Fixes a couple blade templates for relative URLs (#9170) 
* Switched branch name to master

* Production assets for better contrast in dark mode skins

* Fixed #9115: Duplicate column name 'provider' (#9137)

* Sigh. Real assets

* fix blade templates with missing url() function wrapper for relative URLs

* Develop to master (#9195)

* Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187)

* [FIX] Lite test email won't use the mail component (#9092)

* [FIX] Lite test email won't use the mail component

* Revert "[FIX] Lite test email won't use the mail component"

This reverts commit 6dab9aa1a8.

* Fix check for snipeSettings

* Remove random text from message template

* Revert "Fix check for snipeSettings"

This reverts commit 887dcc7bbc.

* Fix test notification with setupCompleted

Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com>
Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com>

* Changed branch from develop to master

* fix blade templates with missing url() function wrapper for relative URLs

* Re-apply patch against develop

* Rebase against develop

Co-authored-by: snipe <snipe@snipe.net>
Co-authored-by: Kevin Köllmann <mail@kevinkoellmann.de>
Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com>
Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com>
 2021-02-26 15:59:36 -08:00
snipe f37d5d3d03 Fixed #9085 - asset models not showing proper pagination 
Huge thanks to @inietov for catching this one
 2021-02-25 16:43:38 -08:00
snipe 57e52f0ba4 Fixed extraneous closing </i> 2021-02-25 13:35:05 -08:00
Oliver Walerys c3166d491a
[FIX] Lite test email won't use the mail component (#9092) 
* [FIX] Lite test email won't use the mail component

* Revert "[FIX] Lite test email won't use the mail component"

This reverts commit 6dab9aa1a8.

* Fix check for snipeSettings

* Remove random text from message template

* Revert "Fix check for snipeSettings"

This reverts commit 887dcc7bbc.

* Fix test notification with setupCompleted
 2021-02-23 14:49:40 -08:00
snipe c8f6318aba Fixed funky layout in asset model modal window (broken HTML) 2021-02-19 10:51:56 -08:00
snipe 9d50e0e8d0 Fixed weird table formatting in expected checkin report 2021-02-17 13:44:35 -08:00
snipe 9deb4204c8 Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report 2021-02-17 13:41:08 -08:00
Ivan Nieto 12ff465cdb
Added feature: Checkbox Custom Fields as list of values. (#9112) 
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.

* Added the same functionality when the custom fieldset is encrypted.

* Added missing bits, so the edit custom assets view shows what values have been already stored in database
 2021-02-16 17:20:29 -08:00
snipe 49415806e1 Nicer formatting of the page if custom logout [ch15660] 2021-02-03 14:56:26 -08:00
ThoBur c40b8334fc
Update edit.blade.php (#8876) 
Fix issue #8518
 2021-02-03 11:59:05 -08:00
snipe 985193ffff Fixed #9082 - allow deployable status type on checkout 2021-02-03 01:29:54 -08:00
snipe fdb5b3baf1
Depreciation detail view fixes [ch15776] (#9059) 
* Allow sorting by months for depreciation list view

* Added dataTableLayout to standardize the list display table

* Implement the dataTableLayout() on the list view blade

* Split the view into tabs so we can combine asset depreciations and license depreciations

* Updated depreciation view to use tabbed interface for assets and licenses

* Added asset models to depreciation details page

* Make asset model category sortable

* Added cateory as allowed to be sorted on

* Added category sort scope

* Removed offset variable

* Small fixes to asset modes display in depreciation to bulk edit models
 2021-01-27 17:44:05 -08:00
Ivan Nieto 6772835efc
Added support for radio buttons in Custom Fields. (#9053) 2021-01-27 14:41:58 -08:00
snipe fb482b0dd6 Fixed translation string in Depreciation view [ch15776] 2021-01-27 14:09:01 -08:00
snipe 0031fab0fe
Added termination date, depreciation in license column selection [ch14505] (#9052) 2021-01-27 01:34:32 -08:00
snipe d19c6ab8e7 Use fadeIn/fadeOut for password reset page for nicer look 2021-01-26 20:05:01 -08:00
snipe d14b1e3825
Added better visual cues for login (#9051) 
* Added better visual cues for login

* Changed box header class to box-header with-border to match other screens

* Since we have all.js now, added class=“minimal” to use icheck
 2021-01-26 19:57:39 -08:00
snipe ba12ee9954 Specifically call out username in forgotten password 2021-01-26 18:00:50 -08:00
Lucas Pleß f3a7467235
Added today as default Date for checkout Form. (#8938) 2021-01-26 12:06:58 -08:00
Ivan Nieto 2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989) 
* Add 'Last Audit Date/Next Audit Date' filter to custom report

* Added a constraint: cannot require a report with a Last Audit Date in the future.
 2021-01-26 12:05:31 -08:00
snipe 75a8639a20 Fixed weird checkbox display 
TODO: fix the 500 on the save
 2021-01-12 18:16:42 -08:00
snipe 380c6171b7 Check if the asset is deployed before prompting for an expected checkin date 2021-01-12 18:02:10 -08:00
snipe d36d6b8e07 Added expected_checkout as editable field in asset edit 2021-01-12 16:48:49 -08:00
snipe c00a1fa21b Added new generic datepicker partial 2021-01-12 16:48:32 -08:00
Ivan Nieto 72f9fe444d
Fix for default parameters in JS functions IE (#8973) 
* Small fix for IE which doesn't support default parameters in the function definition

* Stylistic changes for better comprehension
 2021-01-05 19:25:30 -08:00
Evgeny bbf7fbcff4
Localization digit separator feature. (#8915) 
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
 2020-12-15 11:49:13 -08:00
snipe c0aa6c153e Better callout for warning on api token page 2020-12-09 08:19:04 -08:00
snipe 5f76e03616 Clarified API url info in account > api 2020-12-09 08:14:44 -08:00
snipe 82d8b2ab82 Fixed weird parsing in newer markdown 2020-12-08 20:04:01 -08:00
snipe 4ac15daee7 Fixed #8147 - allow webp image format for public file uploads 2020-12-01 19:06:53 -08:00
snipe bfc60864dd Fixed typo on route for licenses 2020-11-30 20:46:45 -08:00
snipe 4882b01787 Added purchase order and order number to user > licenses view 2020-11-30 12:54:15 -08:00
snipe f475bdbb2d Fixed #8797 - use html_entity_decode in fullName presenter for User 2020-11-25 08:54:23 -08:00
snipe 6f99ce2b07 Branding page UI improvements (image previews inline) 2020-11-25 00:45:46 -08:00
snipe 76ee5a679b Fixed #8810 - email logo was not being used in emails 2020-11-25 00:05:02 -08:00
snipe 973eacf6c3 Small fixes for SAML 
The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it.

I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)
 2020-11-24 13:51:02 -08:00
snipe b2660002b9
Fixed #8781 - added asset count by status type (#8806) 2020-11-24 12:15:07 -08:00
johnson-yi 0cdd83aabf
Fixes #8584, #8654, #8727 - fixes and improvements for saml (#8795) 
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy

* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing

* Improve ui of saml sp metadata by displaying it's url and a download button
 2020-11-20 18:54:25 -08:00
snipe 57d6a7d35e Fixed #8753 - create-asset-from-model did not preselect the model 2020-11-18 13:59:02 -08:00
snipe 2ea805b7ed Added search/sort by Location OU, added to listing 2020-11-17 22:17:07 -08:00
snipe 68487e1200 Added img-responsive class to preview images 2020-11-17 16:15:25 -08:00
snipe f19b9a44fc Fixed #8773 - wrong path for suppliers image on suppliers edit 2020-11-17 16:10:54 -08:00
snipe 4898b58bdb Fixed #8765 - UI not indicating model is required 2020-11-17 13:40:15 -08:00
Brady Wetherington a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751) (#8757) 
* Start work on re-adding back the "Test LDAP logins" feature to develop

* Add back-end method to allow LDAP test users to try to log in.
 2020-11-16 21:23:08 -08:00
snipe fbaf6e2494 Fixed #8747 - upload path for uploaded images 2020-11-16 16:39:02 -08:00
snipe 1f5bcf2475 Added option to download activity report 2020-11-13 16:25:05 -08:00
snipe 0c0de5e351 Added clarity in language as to what the activated flag does on LDAP screens 2020-11-13 11:52:34 -08:00
snipe 10cadecd14 Moved a few of the user edit fields to make more sense (optional stuff further down) 2020-11-13 11:52:09 -08:00
snipe 07936ea901 Changed asset name to asset tag in maintenances 2020-11-13 03:38:31 -08:00
snipe df5cc7525e Merge remote-tracking branch 'origin/develop' 2020-11-12 23:39:09 -08:00
snipe 75b8c3455c Fixed #8609 - custom fieldsets not draggable anymore (regression) 2020-11-12 23:38:12 -08:00
snipe 81d38a0ded Fixed #8733 - typo in unaccepted assets report 2020-11-12 23:26:05 -08:00
snipe b2a8af2fa9 Fixed #8647 - Added additional help info on importer page 2020-11-12 22:46:51 -08:00
snipe 9d2363741e Improved 2FA reset layout 2020-11-12 22:25:07 -08:00
snipe 9db191f0b2 Fixes for #8732 - Flysystem paths, migrator script 2020-11-12 21:46:06 -08:00
snipe 7765c87387 Fixed #8669 - Allow application/xml in SAML upload in Safari 2020-11-12 18:47:19 -08:00
snipe caeea9f530 Merge remote-tracking branch 'origin/develop' 2020-11-12 15:27:49 -08:00
snipe 0fdfd013e7 Fixed #8715 - wrong API url for unaccepted assets 2020-11-12 15:26:50 -08:00
Dampfklon be114176a2
Refactor Expected Checkin Notification into markdown and enable translation (#8236) 
Co-authored-by: snipe <snipe@snipe.net>
 2020-11-12 15:09:40 -08:00
Dampfklon 1f9b04405c
Enable translation of accept-asset page (#8237) 2020-11-12 15:07:45 -08:00
Dampfklon 5fb31a5a3f
Use translated salutation from other notifications (#8234) 2020-11-12 15:05:22 -08:00
snipe 5098d69c05 Fixed stupid auto-indent 2020-11-12 14:20:54 -08:00
snipe b12de13041 Fixed markdown in expiring licenses alert 2020-11-12 14:10:45 -08:00
snipe 6a2e21f502 More in depth error reporting on mail test failure 2020-11-12 13:22:49 -08:00
snipe fd7c0bc5fb Use newer blade facade for requests 2020-11-10 08:36:18 -08:00
snipe 8c19b11e73 Fixed #8448 - “undefined” when testing email from quickstart 2020-11-10 01:48:18 -08:00
snipe 178ed82dc4 Fixed [ch9336] - Removed time stamp in Depreciation report 2020-11-10 01:13:13 -08:00
snipe 6757df5a2d Added Checkout Date Time to Asset Details Page [ch1418] 2020-11-10 01:02:08 -08:00
snipe 895a544d4c Fixed [ch15347] - added status in Depreciation Report 2020-11-09 23:56:16 -08:00
snipe 1cdf6f8263 Fixed #8673 - added category to accessories listing on Account > Assigned Assets 2020-11-09 23:05:19 -08:00
snipe ec14a117b7 Display on the API token page the expiration in years 
TODO: Translate these strings
 2020-11-09 22:55:27 -08:00
snipe ede20523f2 Fixed #8680 - location image path 2020-11-09 21:08:19 -08:00
Brady Wetherington a5423649f4 This is the smallest set of changes we can use to work around a change in functionality 
in Bootstrap Tables. This should remedy some of the issues we've been having with large
GET strings being sent to the back-end by the Assets system.
 2020-11-09 17:36:07 -08:00
snipe df5972c4fa Fixed send creds checkbox in create user form 2020-11-03 13:07:15 -08:00
snipe 44e5fec707 Fixed #8603 - Use correct CSS path for signature-pad.min.css 2020-11-03 10:01:55 -08:00
snipe c800662f0c Use username for forgotten password 
Since emails are not required to be unique
 2020-11-02 23:57:00 -08:00
snipe a55694da2f Added validation to disallow password to be the same as username, email, etc 2020-11-02 20:03:26 -08:00
snipe 33bda9b6d1 Added blade option for same_pwd_as_user_fields 
Disallows password form value to be the same as username, email, first name or last name
 2020-11-02 17:47:25 -08:00
snipe 8ee9e5e059 Fixed #8537 - wrong sorting on dashboard 2020-10-23 18:33:10 -07:00
snipe f357d9fc90 Include audit settings text in settings overview so they get picked up by the filter box 2020-10-23 18:13:28 -07:00
snipe 2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes 
Fixes #8462 - move accessory notes into pivot table
 2020-10-23 14:19:51 -07:00
snipe b9a9949570 Use the form partial for avatars 2020-10-23 12:09:20 -07:00
snipe bf9e53fbe7 Updated markdown templates 2020-10-23 06:55:23 -07:00
snipe f68580b482 Make the email table wider 2020-10-23 06:55:04 -07:00
snipe aec2f2a249 Fixed #8576 - switch to HTML from markdown 
This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(
 2020-10-23 06:54:45 -07:00
snipe 831da2d6d1 New mail vendor files 2020-10-23 06:17:07 -07:00
snipe 2263dae8f4 Fixed HTML 2020-10-23 04:07:55 -07:00
snipe 88f03e6b55 Added last_checkout and notes from pivot for accessories 2020-10-23 00:44:26 -07:00
snipe 5d112be49a Fixed #8585 - requested assets page blank 2020-10-22 20:08:33 -07:00
snipe 496b176d4e Fixed #8589 - unable to accept asset 2020-10-22 19:46:40 -07:00
snipe c71086d2f3 Fixed #8590 - unable to checkin and delete from user view 2020-10-22 19:32:51 -07:00
snipe a6d0209e93 Fixed #8567 - don’t require model for custom report 2020-10-21 12:23:27 -07:00
Bennett Blodinger 132f296f03
Fix typo 2020-10-20 08:13:52 -05:00
snipe c1443aa6eb Pull licenses, accessories, etc - the qty is not accurately reflected 2020-10-19 16:22:55 -07:00
snipe 714ad071ca Add API endpoint to API keys page 
// TODO - localize it
 2020-10-09 14:46:11 -07:00
snipe c0f9a35dea Fixed password reset blade with correct username 2020-10-08 18:47:42 -07:00
snipe b49c5dbf06 Clarified language 2020-10-05 20:43:28 -07:00
snipe 6234c6e5fc Fixed typo 2020-10-05 20:35:27 -07:00
snipe 0cd19c87bf Added utility to delete barcode cache from labels/barcodes setting 2020-10-05 20:34:17 -07:00
snipe dafac4ceb3 Disable ldap_enabled on demo, fixed some incorrect error messages 2020-09-25 19:04:38 -07:00
snipe 98246de4c7 Disable SAML on the demo 2020-09-24 19:25:28 -07:00
Bennett Blodinger 83dfa2a28c
Merge branch 'develop' into gmaps-8465 2020-09-22 17:41:38 -05:00
Blodinger 471e0fd2fc Changes the Google Maps window to be a bit more detailed 2020-09-22 14:30:38 -05:00
Brady Wetherington 0e823a962b Fix for #8424 - where the ldap_server setting was grayed out 2020-09-17 13:32:14 -07:00
snipe 002ca52c83 Standardize feature disabled messages in UI 2020-09-16 15:09:58 -07:00
Brady Wetherington 8331be05aa Some fancy JS to enable/disable Slack-test based on field values 2020-09-16 13:15:39 -07:00
snipe e8dfb71682 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 
# Conflicts:
#	resources/views/settings/slack.blade.php
 2020-09-16 12:40:23 -07:00
snipe 7de685a1c1 Added demo disabled text on slack screen 2020-09-16 12:36:33 -07:00
snipe b508482441
Merge pull request #8438 from snipe/features/nicer_slack_ui 
Nicer slack settings UI
 2020-09-16 12:29:58 -07:00
snipe 30f8431bfb Added required field indicator 2020-09-16 12:29:20 -07:00
snipe a3e738b283 Fixed #8442 - wrong CSS url path on /setup 2020-09-16 11:20:59 -07:00
snipe 74b96a7413 UI tweaks and updated JS to disable the save button if the settings are not correct 2020-09-15 23:14:10 -07:00
snipe 4fd5358aa8 Changed login attempts icon so it’s not the same as SAML 2020-09-15 20:27:01 -07:00
snipe e8befe9afd Increased favicon filesize max 2020-09-15 20:07:29 -07:00
snipe d5f8e93d7c Moved delete logo option higher for nicer layout 2020-09-15 19:52:34 -07:00
snipe 303388e1f5 Added a space between favicon help text blocks 2020-09-15 19:50:15 -07:00
snipe 9601bf6edd
Make “remove image” text clearer 2020-09-15 11:57:40 -07:00
snipe 3b6fb68ff1
Added space between padlock icon and demo warning text 2020-09-15 11:40:36 -07:00
snipe bfd024fdfd
Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled 
Thanks!
 2020-09-15 11:21:35 -07:00
snipe e464f0edf3
Small UI tweaks for kits 2020-09-15 10:15:14 -07:00
Ivan Nieto 291997c915 Change the class of a reusable element so the icon changes from a warning to a padlock 2020-09-15 01:32:46 -05:00
snipe 912401a0a0
Change warning icon to padlock icon 2020-09-12 12:07:56 -07:00
snipe ec5daa387b
Better explanation for demo mode 2020-09-12 10:04:57 -07:00
snipe e448b626e2
Removed pagaination from dashboard 2020-09-12 08:37:37 -07:00
snipe ac2403e8fc
Fixed markdown issue in markdown notifications 2020-09-11 17:12:33 -07:00
snipe cf545f0ed1
Fixed form layout on accessory checkin page 2020-09-11 16:20:56 -07:00
snipe d3d64bd85c
Removed asset tag from accessory checkin markdown notification 2020-09-11 16:06:02 -07:00
snipe 0f22cf6807
Fixed #8428 - Added purchase cost column to user tabs 2020-09-11 11:48:51 -07:00
snipe 2f435a57c1
Fixed #8426 - show model number in custom fields model listing 2020-09-11 11:27:30 -07:00
snipe 82e0b1ffd8
Fixed [ch15130] - update the seeder to clear requested assets table 2020-09-08 18:29:02 -07:00
snipe 5b68a321a6
Added comapny formatter to asset maintenance report - fixes [ch15119] 2020-09-08 18:15:45 -07:00
snipe 251ef82741
Added company formatter to asset maintenance report 2020-09-08 18:14:21 -07:00
snipe d9e7a457d4
Fixed regression on select menus [ch15093] 
Custom report doesn’t pass an $item, so we have to check for that in that required check
 2020-09-04 15:43:49 -07:00
snipe 249b9b7509
Fixed [ch15086] - [object object] in companies date displays 2020-09-03 19:40:17 -07:00
snipe 0eeeb24cae
Added data-validation=“required" to appropriate field partials 2020-09-03 16:59:42 -07:00
snipe 0503a51cae
Corrected validation to match model 2020-09-03 16:58:45 -07:00
snipe c29ec6a100
Removed duplicate state field 2020-09-03 16:00:26 -07:00
snipe a57ab29af6
Accessibility features for custom fields icons 2020-09-03 15:55:52 -07:00
snipe b8ddbadd2b
Use icons for 2FA, LDAP, etc info on user view 2020-09-03 15:55:41 -07:00
snipe 3e120812e3
Removed 2FA reset button if the user is not enrolled in 2FA 2020-09-03 15:55:20 -07:00
snipe 3ea3e8b856
Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389] 2020-09-03 15:12:51 -07:00
snipe fb59405a87
User view can t be loaded [ch15079] 2020-09-03 14:07:30 -07:00
Ivan Nieto 3fcd83c499 Fixes some errors in forms using the deprecated Input:: facade 2020-09-03 13:42:33 -05:00
snipe ed79eacb9d
Updated help text 2020-08-31 19:55:30 -07:00
snipe a64e1be278
Fixed Input:: () vs request() 2020-08-31 17:18:09 -07:00
snipe 13216b8860
Fixed pGenerator (again) 2020-08-31 17:17:51 -07:00
snipe 453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master 
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Models/Ldap.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	tests/unit/UserTest.php
 2020-08-31 12:44:03 -07:00
snipe 9c8ca6af21
Squashed commit of the following: 
commit e321aeabae
Merge: 8ec99ff43 37568ae9e
Author: snipe <snipe@snipe.net>
Date:   Mon Aug 31 12:14:44 2020 -0700

    Merge branch 'master' into integrations/2020-08-31-v5-rc

    # Conflicts:
    #	.all-contributorsrc
    #	.nvmrc
    #	README.md
    #	app/Console/Commands/LdapSync.php
    #	app/Http/Controllers/Api/ConsumablesController.php
    #	app/Http/Controllers/Api/ImportController.php
    #	app/Http/Controllers/Assets/AssetsController.php
    #	app/Http/Controllers/Auth/LoginController.php
    #	app/Http/Controllers/CustomFieldsetsController.php
    #	app/Http/Controllers/LicensesController.php
    #	app/Http/Controllers/UsersController.php
    #	app/Importer/import_mappings.md
    #	app/Models/Ldap.php
    #	app/Models/Loggable.php
    #	composer.json
    #	composer.lock
    #	config/version.php
    #	public/css/build/all.css
    #	public/css/dist/all.css
    #	public/css/skins/skin-contrast.css
    #	public/css/skins/skin-contrast.css.map
    #	public/js/build/all.js
    #	public/js/build/vue.js
    #	public/js/build/vue.js.map
    #	public/js/dist/all.js
    #	public/mix-manifest.json
    #	resources/assets/js/components/importer/importer-file.vue
    #	resources/assets/less/overrides.less
    #	resources/macros/macros.php
    #	resources/views/custom_fields/fieldsets/view.blade.php
    #	resources/views/hardware/edit.blade.php
    #	resources/views/hardware/labels.blade.php
    #	resources/views/hardware/view.blade.php
    #	resources/views/layouts/default.blade.php
    #	resources/views/modals/model.blade.php
    #	resources/views/modals/user.blade.php
    #	resources/views/users/index.blade.php
    #	routes/api.php
    #	routes/web/fields.php
    #	tests/unit/UserTest.php

commit 37568ae9ec
Merge: 01a832169 32ad9050c
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 25 20:49:37 2020 -0700

    Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP

    Fixed #8338 - Added google maps to CSP

commit 32ad9050cf
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 25 20:48:53 2020 -0700

    Added google maps to CSP

commit 01a832169c
Merge: bcad49ce7 3c6883489
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 25 20:38:31 2020 -0700

    Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist

    Fixed #8335 - added assignedTo scope on status labels API call for assetlist

commit 3c6883489c
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 25 20:37:30 2020 -0700

    Added assignedTo scope

commit bcad49ce79
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 16:10:22 2020 -0700

    Try to better handle slack “too many requests” issue

commit b5acca89d7
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 16:02:15 2020 -0700

    Check for admin for slack notifications

commit e52919cf1b
Merge: 714576be4 29f3a5c48
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 15:35:15 2020 -0700

    Merge pull request #8327 from snipe/features/checkin_license_from_all_users

    Checkin license from all users cli tool

commit 29f3a5c48f
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 15:27:40 2020 -0700

    Use more verbose annotation for Auth::user if/else

commit 134e8e6fb9
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 15:25:07 2020 -0700

    Moved user email nulling until after the save

commit 714576be45
Merge: b999c50a2 512899294
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Fri Aug 14 15:24:03 2020 -0700

    Merge pull request #8328 from snipe/fix_deprecation_report

    Fix deprecation report for customers with many active assets

commit 5128992940
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Fri Aug 14 15:03:03 2020 -0700

    Fix deprecation report for customers with many active assets

commit 0291323502
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 14:57:58 2020 -0700

    Use the user as the target

commit e0f6f9b839
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 14:43:37 2020 -0700

    Artisan command to check in licenses from all users

commit f1a6308002
Author: snipe <snipe@snipe.net>
Date:   Fri Aug 14 14:43:07 2020 -0700

    Check for Auth::user before trying to log id (for cli)

commit b999c50a2e
Merge: 9ca20e496 e3906b245
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 12 12:37:47 2020 -0700

    Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation

    Looks great, thank you!

commit e3906b245c
Author: Godfrey M <godmartinz@gmail.com>
Date:   Wed Aug 12 12:27:18 2020 -0700

    added translation for admin/licenses/message.not_found

commit 9ca20e4964
Merge: e0644dbbf 456a74d88
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Tue Aug 11 17:33:19 2020 -0700

    Merge pull request #8313 from snipe/improve_ldap_search_error_reporting

    Improve ldap search error reporting

commit 456a74d88c
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 16:41:20 2020 -0700

    De-merge out incorrectly merged files. Whoops!

commit 799c059070
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Tue Aug 11 16:21:18 2020 -0700

    Add internationalized version of LDAP error message

commit c62d43a778
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Mon Aug 10 17:04:17 2020 -0700

    Improve Exception management in Artisan LDAP Sync method. Still need to localize this better

commit b725bd0fae
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Mon Aug 10 17:23:04 2020 -0700

     Add @PeterUpfold as a contributor

commit e0644dbbf6
Merge: 5b6925b00 004ecad05
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Mon Aug 10 17:22:31 2020 -0700

    Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround

    Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()

commit 5b6925b00c
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 4 21:00:37 2020 -0700

    Removed debugging :(

commit df17a859bf
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 4 20:59:54 2020 -0700

    Changed modal IDs so manager creation modal works on user creation main page

commit 24c43056ba
Author: snipe <snipe@snipe.net>
Date:   Tue Aug 4 20:58:28 2020 -0700

    Moved pGenerator script to default layout footer

    This fixes an issue where the password generator wouldn’t load in a modal in Chrome

commit 606b7e905d
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 31 17:02:33 2020 -0700

    Small edits to PR template

    Slight text changes to ask specifics about versions

commit d73ddad477
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 31 16:59:26 2020 -0700

    Created a PR template

    First draft of the PR guidelines template

commit 9a39cf721e
Merge: 7410b1683 8994f3e15
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 31 12:18:49 2020 -0700

    Merge pull request #8258 from ballertv/features/consumable-api

    This looks great, thank you!

commit 7410b16835
Merge: e955c983a b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Fri Jul 24 16:22:44 2020 -0700

    Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4

    Add new useraccountcontrol value for valid AD users

commit 8994f3e15e
Author: andres <andresgutierrez535@gmail.com>
Date:   Wed Jul 22 19:57:06 2020 -0400

    cleanup

commit d23f1a77ca
Author: andres <andresgutierrez535@gmail.com>
Date:   Wed Jul 22 18:46:02 2020 -0400

    implement checkout API

commit e955c983a3
Merge: 2fa17ac18 eed41e454
Author: snipe <snipe@snipe.net>
Date:   Wed Jul 22 13:43:29 2020 -0700

    Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer

    Added address, city, state and country to importer and city to bulk editor

commit b09e7d19b3
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Wed Jul 22 13:32:16 2020 -0700

    Add new useraccountcontrol value for valid AD users; document algorithm and values

commit 2fa17ac185
Merge: b90515437 3b1e46f72
Author: snipe <snipe@snipe.net>
Date:   Wed Jul 22 12:06:31 2020 -0700

    Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats

    Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…

commit 3b1e46f72b
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date:   Wed Jul 22 11:25:57 2020 -0700

    Update general.php

commit 0c1a1de2a2
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date:   Wed Jul 22 11:24:36 2020 -0700

    Update general.php

    fixed typo

commit 20c9ae5818
Author: Godfrey M <godmartinz@gmail.com>
Date:   Wed Jul 22 10:21:19 2020 -0700

    Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats

commit eed41e4549
Author: snipe <snipe@snipe.net>
Date:   Tue Jul 21 16:57:32 2020 -0700

    Moved address down further, fixed broken HTML

commit b750f4754f
Author: snipe <snipe@snipe.net>
Date:   Tue Jul 21 16:49:54 2020 -0700

    Added city to bulk user importer

commit c17a06792a
Author: snipe <snipe@snipe.net>
Date:   Tue Jul 21 16:49:38 2020 -0700

    Added address, city, state, country to user importer

commit 4f76cc6cfb
Author: snipe <snipe@snipe.net>
Date:   Tue Jul 21 16:46:13 2020 -0700

    I don’t actually know what this file is for

commit b905154373
Author: snipe <snipe@snipe.net>
Date:   Mon Jul 20 14:29:32 2020 -0700

    Fixed #8247 - added notes field to user details display

commit daf748e531
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 17 12:32:01 2020 -0700

    Bumped hash

commit 799a93c46a
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 17 12:11:32 2020 -0700

    Allow for email/username search on users

commit 34aa12e229
Merge: 81a633288 897757bd0
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 16 17:44:13 2020 -0700

    Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create

    Set location_id to rtd_location_id on asset creation

commit 897757bd04
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 16 17:43:44 2020 -0700

    Removed added line for location

commit c7125c3937
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 16 16:34:39 2020 -0700

    Set location_id to rtd_location_id on asset creation

commit 81a6332889
Author: snipe <snipe@snipe.net>
Date:   Tue Jul 14 13:55:38 2020 -0700

    Removed license ID from seats table cookie info

    This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses

commit 6e563f6e4b
Merge: 5320f5c67 7f69ae953
Author: snipe <snipe@snipe.net>
Date:   Mon Jul 13 21:16:54 2020 -0700

    Merge branch 'master' of https://github.com/snipe/snipe-it

commit 5320f5c67c
Author: snipe <snipe@snipe.net>
Date:   Mon Jul 13 21:16:45 2020 -0700

    Disallow non-super users from editing their own permissions

commit 7f69ae953b
Merge: c79f8c1ba 17f6fbabf
Author: snipe <snipe@snipe.net>
Date:   Mon Jul 13 21:16:00 2020 -0700

    Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns

    Changes how we do AJAX calls via Select2 for dynamic drop-down menus

commit 17f6fbabfa
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Mon Jul 13 21:12:03 2020 -0700

    Switch to 'items' to maintain compatbility with other internal API's

commit c79f8c1baf
Merge: 12c92e30b 536401fe0
Author: snipe <snipe@snipe.net>
Date:   Mon Jul 13 17:42:16 2020 -0700

    Merge pull request #8207 from EDVLeer/patch-1

    Update snipeit.sh

commit e7a820f7c9
Author: Brady Wetherington <uberbrady@gmail.com>
Date:   Mon Jul 13 17:14:31 2020 -0700

    Changes how we do AJAX calls via Select2 for dynamic drop-down menus

commit 12c92e30b7
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 10 16:21:27 2020 -0700

    Show whether or not the user was imported via LDAP in the view page

commit fd10b755b0
Author: snipe <snipe@snipe.net>
Date:   Fri Jul 10 11:30:01 2020 -0700

    Removed the sr-only tag in table headers

    It was breaking Bootstrap Tables column selector :(

commit dbbb7680d9
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 9 21:12:50 2020 -0700

    A few more fixes for the cli

    Do not check out a piece of software if it’s already been checked out to the user

commit cf0dd5bbad
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 9 20:43:13 2020 -0700

    Small fixes for cli tool

commit 25e53d8c7f
Merge: ec6ed256f 89d433b41
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 9 20:27:01 2020 -0700

    Merge pull request #8216 from snipe/features/checkout_license_to_all_users

    Added CLI tool to checkout license to all users

commit 89d433b41a
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 9 20:26:02 2020 -0700

    Removed duplicate seat call

commit e2570ada6f
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 9 20:04:05 2020 -0700

    CLI tool to checkout a license to ALL users

commit 45afe725a1
Author: snipe <snipe@snipe.net>
Date:   Thu Jul 9 20:03:47 2020 -0700

    Only try to get the company if there is an auth’d user

    (Needed for command line tools, where no Auth::user() is present)

commit 536401fe0f
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com>
Date:   Tue Jul 7 08:21:36 2020 +0200

    Update snipeit.sh

    Ubuntu 20.04

commit ec6ed256fb
Author: snipe <snipe@snipe.net>
Date:   Mon Jul 6 18:45:43 2020 -0700

    Bumped minor version

commit 2aaa7bed2d
Merge: 339bdddc3 cc9f1577a
Author: snipe <snipe@snipe.net>
Date:   Thu Jun 25 18:37:41 2020 -0700

    Merge pull request #8183 from snipe/features/merge_users

    Added merge utility

commit cc9f1577a4
Author: snipe <snipe@snipe.net>
Date:   Thu Jun 25 17:43:53 2020 -0700

    Removed unused use directives

commit ab1fe8be0c
Author: snipe <snipe@snipe.net>
Date:   Thu Jun 25 17:42:39 2020 -0700

    Added merge utility

commit 339bdddc38
Author: snipe <snipe@snipe.net>
Date:   Thu Jun 25 11:00:33 2020 -0700

    Fix for Vue js not loading due to CSP :(

commit 35b9cf4b70
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 23 02:41:59 2020 -0700

    Fixed missing db prefix on scopeDueOrOverdueForAudit

commit 7ccb41371e
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 23 01:09:39 2020 -0700

    Removed unoptimized images directive

    securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯

commit 2e60a457bf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 23 01:07:00 2020 -0700

    Dumb fix for feature-policy being dumb.

commit 2390d2160b
Merge: b42801f6a 00b051b8c
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 23 00:27:47 2020 -0700

    Merge pull request #8164 from snipe/features/additional_security_headers

    Additional security headers

commit 00b051b8c7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 23 00:26:09 2020 -0700

    Added a few more comments

commit 05b3a9ad7e
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 23:17:27 2020 -0700

    Config variable for HSTS

commit 4fb880384f
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 22:37:14 2020 -0700

    Changed comment

commit 43042ad841
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 22:35:59 2020 -0700

    Consolidated ReferrerPolicy into new SecurityHeaders file

commit a716382ac4
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 22:33:37 2020 -0700

    Removed CSP middleware (it’s added in the general header)

commit 36c8f7f4f1
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 22:31:01 2020 -0700

    Additional security headers

commit b42801f6ae
Merge: de4934f21 946129f20
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 20:47:35 2020 -0700

    Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector

    Fixed weird padlock display in asset listing with encrypted custom fields

commit 946129f206
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 20:45:20 2020 -0700

    Made quote style consistent

commit b941ef1e08
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 20:41:40 2020 -0700

    Pulled CSS font awesome styles out of the blade and into overrides.css

commit d1aa11ec89
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 20:29:19 2020 -0700

    Fix for weird padlock display in asset listing with encrypted custom fields

commit de4934f21d
Merge: af06e4205 b10076b01
Author: snipe <snipe@snipe.net>
Date:   Mon Jun 22 17:28:38 2020 -0700

    Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text

    Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings

commit b10076b015
Author: Godfrey M <godmartinz@gmail.com>
Date:   Mon Jun 22 17:04:39 2020 -0700

    corrected an error where font-size for labels were static in settings.

commit af06e42056
Author: snipe <snipe@snipe.net>
Date:   Wed Jun 17 11:17:25 2020 -0700

    Bumped version

commit 9a2440dc4b
Merge: beae8efb2 2ac1c1636
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 16 20:20:07 2020 -0700

    Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid

    Better handle the logic to determine if we should display the license checkout blade [ch13792]

commit 2ac1c1636c
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 16 16:12:57 2020 -0700

    Better handle the logic to determine if we should display the license checkout blade

commit 004ecad059
Author: Peter Upfold <pgithub@upfold.org.uk>
Date:   Wed Jun 3 08:59:50 2020 +0100

    Force suppress deprecation warning on ldap_control_paged_result()

commit beae8efb21
Merge: d14ab7e3e 9839e5e56
Author: snipe <snipe@snipe.net>
Date:   Wed May 27 23:01:33 2020 -0700

    Merge pull request #8088 from Godmartinz/Label_Woes

    Barcode resizing and text adjustment

commit 9839e5e566
Author: Godfrey M <godmartinz@gmail.com>
Date:   Wed May 27 12:27:40 2020 -0700

    adjusted for all label text, removed local variable

commit d14ab7e3e1
Author: snipe <snipe@snipe.net>
Date:   Wed May 27 00:22:44 2020 -0700

    Porting change from #8053 to master

    Signed-off-by: snipe <snipe@snipe.net>

commit e7f74d94c1
Author: Godfrey M <godmartinz@gmail.com>
Date:   Tue May 26 17:22:45 2020 -0700

    Label_Woes

commit e97cf011b6
Author: Godfrey M <godmartinz@gmail.com>
Date:   Tue May 26 17:15:39 2020 -0700

    Label_Woes

commit ed23505054
Author: Godfrey M <godmartinz@gmail.com>
Date:   Tue May 26 17:10:45 2020 -0700

    Label_Woes

commit 001e721530
Merge: f88683766 8210da6e8
Author: snipe <snipe@snipe.net>
Date:   Wed May 20 10:21:52 2020 -0700

    Merge pull request #8063 from dmeltzer/backport-8092

    BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]

commit 8210da6e82
Author: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date:   Wed May 20 10:29:27 2020 -0400

    Fix Missing Category selection in Asset Model Modal dialog.

    A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.

commit f88683766b
Author: snipe <snipe@snipe.net>
Date:   Thu May 14 00:55:47 2020 -0700

    Roll back previous change

    Signed-off-by: snipe <snipe@snipe.net>

commit e4385c0f8c
Author: snipe <snipe@snipe.net>
Date:   Thu May 14 00:48:30 2020 -0700

    Fixes #8051 regression

    Signed-off-by: snipe <snipe@snipe.net>

commit 0550fe0ffa
Author: snipe <snipe@snipe.net>
Date:   Tue May 12 10:31:54 2020 -0700

    Fix for session fixation vulnerability

    Signed-off-by: snipe <snipe@snipe.net>

commit 7fb3a9b82c
Merge: 9a2ed804c ecb1e87fe
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 22:41:36 2020 -0700

    Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap

    Added option to disable backup in import

commit ecb1e87fe6
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 20:45:15 2020 -0700

    Updated assets

    Signed-off-by: snipe <snipe@snipe.net>

commit f43df5f041
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 20:44:46 2020 -0700

    Fixed form label

    Signed-off-by: snipe <snipe@snipe.net>

commit 95cc48e422
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 20:41:10 2020 -0700

    Added option to disable backup in import

    Signed-off-by: snipe <snipe@snipe.net>

commit 9a2ed804ca
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 20:28:42 2020 -0700

    Fixed mismatched HTML header tags

    Signed-off-by: snipe <snipe@snipe.net>

commit d20fad28e5
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 20:28:24 2020 -0700

    Use more modern request helper

    Signed-off-by: snipe <snipe@snipe.net>

commit ae813ddf75
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 18:11:16 2020 -0700

    Add @alek13 as a contributor

commit bb42109c0c
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 18:10:45 2020 -0700

    Added a clarifying comment

    Signed-off-by: snipe <snipe@snipe.net>

commit f46ecf8ec0
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 18:07:20 2020 -0700

    Updated composer lock

    Signed-off-by: snipe <snipe@snipe.net>

commit b9e821c0e6
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 18:07:14 2020 -0700

    Small fix for Group Functional Tests

    Signed-off-by: snipe <snipe@snipe.net>

commit 9ee28c7513
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 18:07:02 2020 -0700

    Switched to use info instead of danger on undeployable statuses

    Signed-off-by: snipe <snipe@snipe.net>

commit 1a8ba06702
Merge: 0fd232e70 ee4d69b1c
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 17:53:32 2020 -0700

    Merge branch 'master' of https://github.com/snipe/snipe-it

commit 0fd232e70d
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 17:53:24 2020 -0700

    Fixed group functional test

    (We had changed the minimum to 2 instead of 3)

    Signed-off-by: snipe <snipe@snipe.net>

commit ee4d69b1c5
Merge: 31c535094 d1ad11194
Author: snipe <snipe@snipe.net>
Date:   Mon May 11 17:52:45 2020 -0700

    Merge pull request #8041 from alek13/patch-1

    use supported package for slack

commit d1ad111949
Author: Alexander Chibrikin <alek13.me@gmail.com>
Date:   Mon May 11 20:31:13 2020 +0300

    use supported package for slack

    see https://github.com/maknz/slack/issues/94

commit 31c5350941
Author: snipe <snipe@snipe.net>
Date:   Fri May 1 01:05:48 2020 -0700

    Fixed incorrect route for groups edit

    Signed-off-by: snipe <snipe@snipe.net>

commit 7eb70e17e0
Merge: 5bb4f271a 3dfcb4699
Author: snipe <snipe@snipe.net>
Date:   Fri Apr 24 04:50:37 2020 -0700

    Merge pull request #7993 from snipe/fixes/7989_column_selector

    Fixed #7989 - Converted table heading icons in People to CSS glyphs

commit 3dfcb46991
Author: snipe <snipe@snipe.net>
Date:   Fri Apr 24 04:41:08 2020 -0700

    Minor formatting changes

    Signed-off-by: snipe <snipe@snipe.net>

commit 96eb96f964
Author: snipe <snipe@snipe.net>
Date:   Fri Apr 24 04:27:00 2020 -0700

    Removed stray val (typo)

    Signed-off-by: snipe <snipe@snipe.net>

commit a2f08bd3ba
Author: snipe <snipe@snipe.net>
Date:   Fri Apr 24 04:08:54 2020 -0700

    Added comments

    Signed-off-by: snipe <snipe@snipe.net>

commit e009fbe59f
Author: snipe <snipe@snipe.net>
Date:   Fri Apr 24 04:04:53 2020 -0700

    Converted table heading icons in People to CSS glyphs

    Signed-off-by: snipe <snipe@snipe.net>

commit 5bb4f271aa
Author: snipe <snipe@snipe.net>
Date:   Fri Apr 24 00:47:19 2020 -0700

    Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets

    Signed-off-by: snipe <snipe@snipe.net>
 2020-08-31 12:17:19 -07:00
snipe e1cc003cec
Fixed backup urls for download 2020-08-28 18:22:37 -07:00
snipe d25a05d748
Misc Flysystem/image upload request fixes 2020-08-26 11:53:36 -07:00
snipe f385f3e928
Fixed user image upload 
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
 2020-08-26 02:30:23 -07:00
snipe a90d2ba077
Fixed suppliers upload 2020-08-24 18:53:33 -07:00
snipe 232e3f30aa
Fixed accessories “current image” path in edit form 2020-08-24 14:30:55 -07:00
Michael Pietsch 4f5374b2e8 enable use custom file based saml certificate/private key 2020-08-14 12:25:00 +02:00
snipe 19d8d7b146
Updated components and consumables to use storage facade 2020-08-12 13:02:54 -07:00
snipe 5b6925b00c
Removed debugging :( 2020-08-04 21:00:37 -07:00
snipe df17a859bf
Changed modal IDs so manager creation modal works on user creation main page 2020-08-04 20:59:54 -07:00
snipe 24c43056ba
Moved pGenerator script to default layout footer 
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
 2020-08-04 20:58:28 -07:00
snipe 4e0a9c7a94
Fart fix 
I just…. don’t ask.
 2020-08-03 12:35:34 -07:00
snipe 6a089f86f8
Fixed pathing for accessories 2020-08-03 11:17:56 -07:00
snipe 502b3c50a9
Fixed upload preview (fixed regression from #6736) 
This change appears to have been stomped on in one of the merges. :(
 2020-07-31 14:36:50 -07:00
snipe 3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-07-31 11:01:35 -07:00
snipe eed41e4549
Moved address down further, fixed broken HTML 2020-07-21 16:57:32 -07:00
snipe b750f4754f
Added city to bulk user importer 2020-07-21 16:49:54 -07:00
snipe b905154373
Fixed #8247 - added notes field to user details display 2020-07-20 14:29:32 -07:00
snipe 81a6332889
Removed license ID from seats table cookie info 
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
 2020-07-14 13:55:38 -07:00
Ivan Nieto 8fd4529fad Change the form input name for serials in the view 2020-07-13 13:49:21 -05:00
snipe 12c92e30b7
Show whether or not the user was imported via LDAP in the view page 2020-07-10 16:21:27 -07:00
snipe fd10b755b0
Removed the sr-only tag in table headers 
It was breaking Bootstrap Tables column selector :(
 2020-07-10 11:30:01 -07:00
Sean Borg 567a9639f4 Enhanced #5762 Able to bulk edit expected checkin date 
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
 2020-07-10 19:21:34 +01:00
Sean Borg 7a433f8598 Updated purchase date format in hardware/bulkedit 
The Purchase date box in hardware/bulkedit was a different style
to the normal hardware/{id}/edit

It also prevents a strange bug I see in firefox when clicking the old datepicker
it presented 2 datepicker boxes
 2020-07-10 19:21:22 +01:00
snipe b941ef1e08
Pulled CSS font awesome styles out of the blade and into overrides.css 2020-06-22 20:41:40 -07:00
Godfrey M b10076b015 corrected an error where font-size for labels were static in settings. 2020-06-22 17:04:39 -07:00
snipe a7eb89f6b6
Misc fixes for flysystem paths 2020-06-16 16:06:25 -07:00
snipe 7a785b4952
Updated a few flysystem settings 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-28 01:54:29 -07:00
Godfrey M 9839e5e566 adjusted for all label text, removed local variable 2020-05-27 12:27:40 -07:00
snipe 5b4e4c8dcd
Merge pull request #8061 from Godmartinz/develop 
fixed a table header error
 2020-05-26 19:52:14 -07:00
Godfrey M e7f74d94c1 Label_Woes 2020-05-26 17:22:45 -07:00
Godfrey M e97cf011b6 Label_Woes 2020-05-26 17:15:39 -07:00
Godfrey M ed23505054 Label_Woes 2020-05-26 17:10:45 -07:00
Daniel Meltzer 7ea862787c
Refactor controller to use one method that shows all modals based on name. 2020-05-23 15:24:00 -04:00
Daniel Meltzer 7a76cb08a0
We accept xlsx in uploads 2020-05-23 11:36:47 -04:00
Daniel Meltzer 8210da6e82
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:29:27 -04:00
Daniel Meltzer 6a80f95769
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag.  <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:23:04 -04:00
Godfrey M edd4797178 fixed a table header error 2020-05-19 16:59:09 -07:00
Daniel Meltzer a6f90cb3fc
Assorted licenses UI fixes while testing. 
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
 2020-05-12 14:38:21 -04:00
snipe 9a2ed804ca
Fixed mismatched HTML header tags 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:42 -07:00
snipe d20fad28e5
Use more modern request helper 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:24 -07:00
snipe 9ee28c7513
Switched to use info instead of danger on undeployable statuses 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:02 -07:00
Johnson Yi 572185ac96 Revised how saml sp info is displayed 2020-05-09 09:44:51 +10:00
Johnson Yi b2930d6069 Added #542: add saml authentication 2020-05-06 00:06:19 +10:00
snipe 8ecb7969df
Fixed incorrect route for saving groups 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-01 01:26:15 -07:00
snipe 31c5350941
Fixed incorrect route for groups edit 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-01 01:05:48 -07:00
snipe 8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes 
Component checkout/checkin fixes.
 2020-04-30 17:49:22 -07:00
snipe e47c44d055
Merge pull request #8007 from dmeltzer/permissions-form-cleanup 
Permissions edit cleanups.
 2020-04-30 17:48:24 -07:00
snipe 8bb3c01f78
Addressed merge issue for reset password for #7997 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-30 17:45:05 -07:00
Daniel Meltzer bfba30058c
Fix incorrect routing. 2020-04-30 10:35:26 -04:00
Daniel Meltzer debdccf5f1
Remove old help text translation that doesn't exist any more 2020-04-30 10:35:11 -04:00
Daniel Meltzer 358609720a
Component checkout/checkin fixes. 
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
 2020-04-29 12:50:09 -04:00
Daniel Meltzer 42e1e9a0bd
Permissions edit cleanups. 
- Make each section of permissions it's own tbody for better styling
- Remove extra separators when theres nothing to separate
- Vertically center radio buttons in header rows.

Still on the ideal list:
 - Unify code between users and groups into one partial with
conditionals.
 - Sticky header row or put the header row in each section.
 2020-04-29 12:33:50 -04:00
Daniel Meltzer bb50828ca0
Remove General serial field now that the serial is part of the multi asset creation. 2020-04-28 11:39:53 -04:00
snipe c2f1fd4942
Make user form a little nicer looking 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-28 00:01:47 -07:00
snipe 412caebf69
Fixed logo uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 23:22:52 -07:00
snipe b433b49469
Ficing webpack, CSS and JS (*whew* that sucked) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 22:41:33 -07:00
snipe f172747495
Handle parse error in custom fields edit per #7997 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 19:36:07 -07:00
snipe 6427f46a6b
Removed mix (switched to url()) for now until assets are fixed 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 19:35:21 -07:00
snipe 6847a331a7
Backport the column icon fix from master 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 05:55:38 -07:00
snipe 3dfcb46991
Minor formatting changes 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:41:08 -07:00
snipe 96eb96f964
Removed stray val (typo) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:27:00 -07:00
snipe a2f08bd3ba
Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:08:54 -07:00
snipe e009fbe59f
Converted table heading icons in People to CSS glyphs 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:04:53 -07:00
snipe 5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 00:47:19 -07:00
snipe bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 00:39:32 -07:00
snipe 44962d1eb9
Switched to use Primary button 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:44:48 -07:00
snipe e69461d797
Cleaned up LDAP sync blade 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:44:28 -07:00
snipe b01e8720dc
Fixed ldap settings JS error 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 14:41:20 -07:00
snipe c50b81ff19
Added resources 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:15:24 -07:00
snipe b5cc845216
Removed vendor.js from setup blade 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:15:12 -07:00
snipe 3435485a46
Updated path to skin css 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 06:41:19 -07:00
snipe 82b6d2b31b
Fixed a few more tests 2020-04-21 21:13:00 -07:00
snipe 05e9861b71
Checkin/checkout fixes 2020-04-21 11:28:31 -07:00
snipe cff2a65f62
Fixed broken if/else in view from bad merge 2020-04-21 11:13:29 -07:00
snipe 7a6ca5cb40
Tempt fix for css weirdness 
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
 2020-04-21 11:03:32 -07:00
snipe 1d8c3a73ea
Use non-min version of skin until we can get the other webpack stuff sorted 2020-04-21 10:43:04 -07:00
snipe e786ef8290
Pull branding back to develop normal 2020-04-21 10:42:37 -07:00
snipe c38bbfc8bd
Removed title from more info link 2020-04-21 06:29:34 -07:00
snipe be446eedb0
Updated html styles on settings index 2020-04-21 06:29:08 -07:00
snipe dc6e329d96
Fixed name in comments 2020-04-21 06:18:24 -07:00
snipe 72b3228d82
Fixed HTML tags 2020-04-21 06:15:31 -07:00
snipe cb71bcc4af
Switch to old() helper 2020-04-21 03:58:31 -07:00
snipe 58f6b2da5a
Fixing assets 2020-04-21 03:42:35 -07:00
snipe b670371e0b
Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
snipe 87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge 
# Conflicts:
#	README.md
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/ComponentsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Requests/AssetRequest.php
#	app/Http/Requests/ImageUploadRequest.php
#	app/Models/LicenseSeat.php
#	app/Models/Location.php
#	app/Models/Setting.php
#	composer.json
#	composer.lock
#	config/database.php
#	config/version.php
#	npm-shrinkwrap.json
#	package.json
#	public/css/AdminLTE.css
#	public/css/AdminLTE.css.map
#	public/css/overrides.css
#	public/css/overrides.css.map
#	public/css/skins/skin-blue-light.css
#	public/css/skins/skin-blue.css
#	public/css/skins/skin-green-dark.min.css
#	public/js/app.js
#	public/js/bootstrap-table.js
#	public/js/bootstrap/js/bootstrap.js
#	public/js/bootstrap/js/bootstrap.min.js
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/demo.js
#	public/js/ekko-lightbox.js
#	public/js/ekko-lightbox.min.js
#	public/js/extensions/export/bootstrap-table-export.js
#	public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
#	public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
#	public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
#	public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
#	public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
#	public/js/plugins/timepicker/bootstrap-timepicker.js
#	public/js/plugins/timepicker/bootstrap-timepicker.min.js
#	public/js/vue.js
#	public/mix-manifest.json
#	resources/assets/js/bootstrap-js.js
#	resources/assets/js/bootstrap.min.js
#	resources/assets/js/ekko-lightbox.js
#	resources/assets/js/ekko-lightbox.min.js
#	resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
#	resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
#	resources/assets/js/plugins/chartjs/Chart.js
#	resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
#	resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
#	resources/assets/less/AdminLTE.less
#	resources/assets/less/overrides.less
#	resources/assets/less/skins/_all-skins.less
#	resources/assets/less/skins/skin-black.less
#	resources/assets/less/skins/skin-blue.less
#	resources/assets/less/skins/skin-green.less
#	resources/assets/less/skins/skin-purple.less
#	resources/assets/less/skins/skin-red.less
#	resources/assets/less/skins/skin-yellow.less
#	resources/assets/less/variables.less
#	resources/js/components/importer/importer-file.vue
#	resources/lang/en/auth/message.php
#	resources/lang/en/passwords.php
#	resources/lang/es-CO/general.php
#	resources/lang/es-ES/general.php
#	resources/lang/es-VE/general.php
#	resources/less/skins/skin-black-dark.less
#	resources/less/skins/skin-blue-dark.less
#	resources/less/skins/skin-contrast.less
#	resources/less/skins/skin-green-dark.less
#	resources/less/skins/skin-orange-dark.less
#	resources/less/skins/skin-orange.less
#	resources/less/skins/skin-purple-dark.less
#	resources/less/skins/skin-red-dark.less
#	resources/less/skins/skin-yellow-dark.less
#	resources/views/accessories/checkin.blade.php
#	resources/views/accessories/checkout.blade.php
#	resources/views/accessories/edit.blade.php
#	resources/views/account/profile.blade.php
#	resources/views/account/view-assets.blade.php
#	resources/views/asset_maintenances/edit.blade.php
#	resources/views/auth/passwords/email.blade.php
#	resources/views/auth/passwords/reset.blade.php
#	resources/views/categories/edit.blade.php
#	resources/views/companies/edit.blade.php
#	resources/views/components/checkin.blade.php
#	resources/views/components/checkout.blade.php
#	resources/views/components/edit.blade.php
#	resources/views/consumables/checkout.blade.php
#	resources/views/consumables/edit.blade.php
#	resources/views/custom_fields/fields/edit.blade.php
#	resources/views/custom_fields/fieldsets/edit.blade.php
#	resources/views/dashboard.blade.php
#	resources/views/departments/edit.blade.php
#	resources/views/groups/edit.blade.php
#	resources/views/hardware/audit.blade.php
#	resources/views/hardware/bulk-checkout.blade.php
#	resources/views/hardware/bulk.blade.php
#	resources/views/hardware/checkin.blade.php
#	resources/views/hardware/checkout.blade.php
#	resources/views/hardware/edit.blade.php
#	resources/views/hardware/index.blade.php
#	resources/views/hardware/quickscan.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/importer/import.blade.php
#	resources/views/layouts/basic.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/layouts/edit-form.blade.php
#	resources/views/licenses/checkin.blade.php
#	resources/views/licenses/checkout.blade.php
#	resources/views/licenses/edit.blade.php
#	resources/views/locations/edit.blade.php
#	resources/views/manufacturers/edit.blade.php
#	resources/views/modals/upload-file.blade.php
#	resources/views/models/bulk-edit.blade.php
#	resources/views/models/custom_fields_form.blade.php
#	resources/views/models/edit.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/partials/forms/edit/address.blade.php
#	resources/views/partials/forms/edit/asset-select.blade.php
#	resources/views/partials/forms/edit/category-select.blade.php
#	resources/views/partials/forms/edit/category.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	resources/views/partials/forms/edit/company.blade.php
#	resources/views/partials/forms/edit/department-select.blade.php
#	resources/views/partials/forms/edit/depreciation.blade.php
#	resources/views/partials/forms/edit/email.blade.php
#	resources/views/partials/forms/edit/image-upload.blade.php
#	resources/views/partials/forms/edit/item_number.blade.php
#	resources/views/partials/forms/edit/location-profile-select.blade.php
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/location.blade.php
#	resources/views/partials/forms/edit/maintenance_type.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/manufacturer.blade.php
#	resources/views/partials/forms/edit/minimum_quantity.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/model_number.blade.php
#	resources/views/partials/forms/edit/name.blade.php
#	resources/views/partials/forms/edit/notes.blade.php
#	resources/views/partials/forms/edit/order_number.blade.php
#	resources/views/partials/forms/edit/phone.blade.php
#	resources/views/partials/forms/edit/purchase_cost.blade.php
#	resources/views/partials/forms/edit/purchase_date.blade.php
#	resources/views/partials/forms/edit/quantity.blade.php
#	resources/views/partials/forms/edit/serial.blade.php
#	resources/views/partials/forms/edit/status.blade.php
#	resources/views/partials/forms/edit/submit.blade.php
#	resources/views/partials/forms/edit/supplier-select.blade.php
#	resources/views/partials/forms/edit/supplier.blade.php
#	resources/views/partials/forms/edit/user-select.blade.php
#	resources/views/reports/custom.blade.php
#	resources/views/settings/alerts.blade.php
#	resources/views/settings/asset_tags.blade.php
#	resources/views/settings/barcodes.blade.php
#	resources/views/settings/branding.blade.php
#	resources/views/settings/general.blade.php
#	resources/views/settings/labels.blade.php
#	resources/views/settings/ldap.blade.php
#	resources/views/settings/localization.blade.php
#	resources/views/settings/security.blade.php
#	resources/views/setup/user.blade.php
#	resources/views/suppliers/edit.blade.php
#	resources/views/users/bulk-edit.blade.php
#	resources/views/users/edit.blade.php
#	resources/views/users/ldap.blade.php
#	resources/views/users/print.blade.php
#	resources/views/users/view.blade.php
#	routes/api.php
#	routes/web/hardware.php
#	webpack.mix.js
 2020-04-20 23:20:34 -07:00
snipe 7ebd21bc04
Added sr-only to the unstyles image upload button 2020-04-09 19:29:16 -07:00
snipe 83ee64f155
Added missing CSS class to text-only logo 2020-04-08 17:25:14 -07:00
snipe a0f7fdc57a
Merge branch 'fixes/accessibility_fixes' 
# Conflicts:
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
 2020-04-08 11:19:42 -07:00
snipe 1a5785a8d3
Fixed dashboard header size 2020-04-06 21:30:28 -07:00
snipe 320d660e83
Updated chartjs 2020-04-06 21:17:26 -07:00
snipe fb903b2fda
Added comments, better indenting 2020-04-06 21:05:42 -07:00
snipe 7bf398aca4
More settings filter fixes 2020-04-06 20:47:05 -07:00
snipe f6bb655383
Prevent form submission 2020-04-06 20:17:44 -07:00
snipe 19f71face9
Added filtering to settings page 2020-04-06 20:11:13 -07:00
snipe d82b94e281
Pull blue stylesheet if no skin was selected 2020-04-06 19:04:49 -07:00
snipe a8032ac388 Switched to btn-primary for submit 2020-04-02 18:38:54 -07:00
snipe 21d8225696 Use button primary for higher contrast 2020-04-02 18:33:26 -07:00
snipe 766c2b22cb Removed stray tag 2020-04-02 18:33:10 -07:00
snipe bdddab5b8b Added role=“option” to option items, additional icon font fixes 2020-04-02 18:17:21 -07:00
snipe 031adc3be4 Small display fixes to importer table 2020-04-01 19:51:36 -07:00
snipe c906026acd
Merge branch 'master' into fixes/accessibility_fixes 2020-04-01 14:04:02 -07:00
snipe 56c2740b68 Radio button tweaks 2020-04-01 06:56:27 -07:00
snipe 4688d62b9f Small UI fixes 2020-04-01 06:50:37 -07:00
snipe 99686bd73a Added labels for bulk actions 2020-04-01 06:48:02 -07:00
snipe 120e224961 Add the ability to remove all group memberships in bulk 2020-04-01 06:35:13 -07:00
snipe e27d69a31d Remove viewport restrictions 2020-04-01 06:18:37 -07:00
Ivan Nieto c492ba7245
Adding changes to 'upload-table' for being painted in CSS (#7934) 2020-04-01 05:24:05 -07:00
snipe 53658e365f Removed duplicate HTML tag 2020-04-01 04:36:28 -07:00
snipe 4cfa0e36b1 Added labels to password reset 2020-04-01 04:30:54 -07:00
snipe 9d9b5d3885 Added form labels to auth screens 2020-04-01 04:29:54 -07:00
snipe 36f9905be0 Removed test code 2020-04-01 04:29:35 -07:00
snipe 2d2cd68061 Switched to h2 from h4 2020-04-01 03:51:08 -07:00
snipe fd642e95eb Hide success icons from screen readers 2020-04-01 03:25:07 -07:00
snipe 9ab3370be5 Hide icons in error messages 2020-04-01 03:21:15 -07:00
snipe 4dcc1ffdbc More form labels 2020-04-01 02:22:24 -07:00
snipe 7718abaa72 Added aria-hidden 2020-04-01 01:26:44 -07:00
snipe c3d2e8ff26 Added aria-hidden to inline form error text 2020-04-01 00:18:20 -07:00
snipe be93b23488 Added aria-label to form fields 2020-04-01 00:15:33 -07:00
snipe b079d0d6d5 Use btn-primary for submit button 2020-03-31 23:38:10 -07:00
snipe c6c75cc11f Fixed missing </h3 tags 2020-03-31 23:36:56 -07:00
snipe b188285bc9 Fixed empty table headings 2020-03-31 23:02:24 -07:00
snipe 6d659a84b8 Removed extra div tag 2020-03-31 22:53:58 -07:00
snipe 3e3828229d Removed _tab from tab names 2020-03-31 22:52:21 -07:00
snipe bf6a0f8d2f Added aria-hidden 2020-03-31 22:50:38 -07:00
snipe 3873c4b253 Added aria form labels to upload modal 2020-03-31 22:50:29 -07:00
snipe 6cc23f69f9 Added aria form labels 2020-03-31 22:50:14 -07:00
snipe a467a6999e Use upload modal 2020-03-31 22:50:07 -07:00
snipe e0eb10ca1e Added aria-hidden tags 2020-03-31 22:49:49 -07:00
snipe 99c4c73c09 Fixed aria labels on dropdowns 2020-03-31 21:53:26 -07:00
snipe bde45cbb34 Fixed h3 to h2 for semantic header levels 2020-03-31 21:30:24 -07:00
snipe bfa9c0c528 Updated dark skins with updated styles 2020-03-31 20:58:54 -07:00
snipe fe2261c88d A few more aria-hidden fixes 2020-03-31 19:34:01 -07:00
snipe 6aeb3c0a47 Use divs instead of layout table on view 2020-03-31 19:27:21 -07:00
snipe dfaa1c9578 Use the same “no results” treatment for each tab 2020-03-31 18:45:43 -07:00
snipe 0ef1dfe061 Switched from layout tables to decorated divs for asset detail page 2020-03-31 18:39:58 -07:00
snipe 7854003ec2 Added sr-only text to “made with love” footer 2020-03-31 17:29:20 -07:00
snipe c71dd9b68a Added sr-only text 2020-03-31 17:29:06 -07:00
snipe b8b9ac8a1b Fixed mismatched <b>/<strong> tags 2020-03-28 18:00:46 -07:00
snipe 80ac2607cd Added alt tags to assigned assets view 2020-03-28 18:00:19 -07:00
snipe 3552fb1fd8 Added alt tags to profile image 2020-03-28 18:00:05 -07:00
snipe 54a96b8453 Fixed <b> to <strong> 2020-03-28 17:30:17 -07:00
snipe e9ddd1af81 Added th content on activity report 2020-03-28 04:00:26 -07:00
snipe f0b9cd7820 Changed header for h2 2020-03-28 03:43:24 -07:00
snipe 59accca89d Added form labelss 2020-03-28 03:43:08 -07:00
snipe e72ebfb94b Added placeholder text for modal header 2020-03-28 03:42:45 -07:00
snipe 0b7316d548 Changed side heading to h2 2020-03-28 03:42:27 -07:00
snipe d0cf76989a Fixed table headers for custom fields 2020-03-28 02:52:14 -07:00
snipe 5e4918579a Added table headers 2020-03-28 02:41:27 -07:00
snipe 5a6c13e364 Added aria-hidden and sr-only tags to minus/collapse symbol 2020-03-28 01:37:49 -07:00
snipe 5c68353e62 Use non-min bs tables for now 2020-03-28 01:36:35 -07:00
snipe 53728e5c71 Removed whitespace 2020-03-28 01:36:22 -07:00
snipe b965d170ab Added accessibility features to bootstrap tables 2020-03-28 00:51:26 -07:00
snipe a8f6bbd86a Added alt text to image formatter in bootstrap tables 2020-03-27 22:01:24 -07:00
snipe 2a813244a2 Wrapped text in h5s, added aria hidden to icons 2020-03-27 21:45:27 -07:00
snipe b50894fca1 Use a variable in the settings to determine what css classes to use 2020-03-27 21:44:50 -07:00
snipe 41fa2d1aa1 Added aria handlers and sr-only text 2020-03-27 21:44:32 -07:00
snipe 5858c90e71 Minor formatting change (spacing) 2020-03-27 15:50:01 -07:00
snipe f0ef06ebe1 Added more alt tags 2020-03-27 15:35:29 -07:00
snipe 700f7de748 Added alt text to logo 2020-03-27 14:10:56 -07:00
snipe af2ea7ac03 Added aria-hidden="true" to create dropdown in topnav 
Since it’s technically duplicated content
 2020-03-27 14:08:01 -07:00
snipe 690d8255c9 Removed the title attribute from the select2 output 
It contains duplicate info since its auto-generated by select2
 2020-03-27 14:07:30 -07:00
snipe aded2193a2 Added aria-hidden="true" to top navigation elements 2020-03-27 13:29:00 -07:00
snipe 6d99b2a68c Added “skip to content” link 2020-03-27 13:28:48 -07:00
snipe 55a619778f Added language header 2020-03-25 16:32:33 -07:00
snipe 039f5da0e1
Add image upload to user edit [ch10508] (#7877) 
* Use correct Request include

* Updated to use additional form request

* Added SVG sanitizer

* Added response method to form request

* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete

* Fixed upload path for avatars

* Added fieldname variable to blade partial for image upload

* Added enctype="multipart/form-data"  to form to allow uploads

* Added image field

* Updated Request::old() to use $request->old()

* Fixed derp in edit blade referring to $item when it should be $user

* Added svg+xml to image rule
 2020-03-05 18:00:24 -08:00
snipe d1a8d76d85 Set maxlength in password reset form to 250 2020-03-04 22:06:43 -08:00
snipe 03c5a42f5a Fixes for flysystem paths :( 2020-02-11 20:22:55 -08:00
snipe 46a138c64b Fixed id to statuslabel in sidenav 2020-02-10 12:36:48 -08:00
Fabian Grutschus 5becb93e6c
Added: allow appending of domain name to username when user tries to login (#7790) 2020-02-04 12:47:49 -08:00
Ivan Nieto ab36784edd Added a parameter that http://snipe-it.app/fields expected, without it that functionality was broken (#7687) 
Nice!
 2019-12-30 20:18:47 -08:00
snipe b5db0b22f8 Switched to Request facade 
I don’t know why my greps keep missing this shit.
 2019-12-10 19:47:54 -08:00
snipe 296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 (#7637) 
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. 


* Upgraded framework to Laravel 6

### TO DO:

- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”

* More updates from Input:: to Request:: helper

* Switch to Request:: from Input

* Added passport config

* Fixed goofy password minimum in seeder

* Added laravel/helpers

* Changed ($item)  to ($item->id) in forms

I have no idea why this is necessary

* Changed ($item) to ($item->id) in forms

* Updated API middleware to auth:api

* Updated with added laravel auth.php values

* FIxed *&!^$%^&$^%!!!! ajax issue

* Switch to Request::get from Input::get

* Switched to Request facade

* Added password security minimums back in

The package we were using has not been updated to Laravel v6, so I created custom validators instead

* Added language strings for error messages for password rules

* Fixed `($item)` issue in formActions for partials
 2019-12-10 19:32:50 -08:00
snipe 88fb1370f0 Added slightly friendlier error handling for assets without models 
This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.
 2019-12-06 18:17:03 -08:00
snipe de0b5a6149 Fixes #6440 - quote marks in the right place 2019-12-06 11:04:16 -08:00
Dustin B 8fd4e35244 Closes #6440 Print All Assigned - New Tab (#7135) 
Should add the functionality to, by default open in a new tab and not reference back to the source page. Reduces overhead and should resolve #6440. 

Untested, need confirmation.
 2019-12-06 11:00:01 -08:00
Valentyn Tulub 6ad1f51673 Added #6489: show asset assignments under user assignments (#7293) 
* Add a setting to show assets assigned to other assets #6489

* Update user's views to show assets assigned to other assets #6489

* Add ukrainian and russian translation for the feature #6489 in settings
 2019-12-06 10:57:48 -08:00
snipe 88cf456386
Adding Dept to license seats (#7609) 
* Adding Dept to license seats

* Added query scope to order by department

* Make license seat department sortable

* Disable license seat internal search - this never actually worked
 2019-11-21 22:03:56 -08:00
snipe d8049209ca Fixed bug where deleted consumable would throw an error on print page 2019-11-21 21:43:54 -08:00
snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration 
# Conflicts:
#	.env.example
#	.travis.yml
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/Api/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/ComponentsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Middleware/EncryptCookies.php
#	app/Http/Requests/AssetRequest.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/AssetMaintenance.php
#	app/Models/Location.php
#	app/Models/User.php
#	composer.json
#	composer.lock
#	config/backup.php
#	config/database.php
#	config/version.php
#	public/mix-manifest.json
#	resources/lang/en-ID/general.php
#	resources/lang/vi/admin/settings/general.php
#	resources/views/accessories/edit.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	tests/api/ApiCategoriesCest.php
 2019-11-18 19:49:39 -08:00
snipe 22d2ad9248
Fixes nested location selectlist (#7483) 
* Rename child locations method

* Use Ajax dropdown for locations selectlist for edit/create

* Removed locations database call on edit/create blades for faster loading

* Updated locations controller to use the new iterator

* Increase pagination on locations controller to 500

We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.

* Fixed the else to make codacy happy

* Improve the design and performance of the nested location selectlist (#7484)

* Improve the design and performance of the nested location selectlist

* Fixed parse errors

* Removed debugging code/comments
 2019-10-02 03:56:56 -07:00
Martin Berg 3dcef9aac9 Add support for custom remote user header (#7370) 2019-09-03 11:07:26 -07:00
Logan Swartzendruber 4c8b26f732 Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. (#7388) 
* Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view.

* Add conditional for including the asset number in the URL of the barcode image.

* Change case of variables to pass Codacy PR review standards.
 2019-09-03 11:02:55 -07:00
snipe 60bb385cf7 Make status label required 2019-08-14 23:46:09 -07:00
snipe 47724d7268 Make error text color match 2019-08-14 23:46:00 -07:00
snipe c9f9a60354 Fixed asset tag error message alignment 2019-08-14 23:28:01 -07:00
snipe 441ae69f5c
Integrations/develop into master (#7352) 
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992)

* Added upcoming audit report

TODO: Fid diff/threshold math

* Added route to list overdue / upcoming assets via API

* Controller/API methods for due/overdue audits

We could probably skip this and just handle it via view in the routes…

* Added query scopes for due and overdue audits

* Added audit due console command to kernel

* Added ability to pass audit specs to main API asset search method

* Added audit presenter

* Added bootstrap-tables presenter formatter to display an audit button

* Added gated sidenav items to left nav

* Added audit due/overdue blades

* Cleanup on audit due/overdue console command

* Added language strings for audit views

* Fixed :threshold placeholder

* Removed unused setting variable

* Fixed next audit date math

* Added scope for both overdue and upcoming

* Derp. Wrong version

* Bumped version

(I will release this version officially tomorrow)

* Leave the activated state for users alone in normal LDAP synchronisation. (#6988)

* Fixed #7003 - crash when warranty months or purchase date is null

* Fixed #6956 - viewKeys policy inconsistent  (#7009)

* Fixed #6956 - Added additional gates show showing/hiding license keys

* Modified gate to allow user to see licenses if they can create or edit the license as well

* Added API middleware to API routes to enable throttling

TODO: Figure out how to make this costumizable without touching the code

* Import locations from CSV via command line (#7021)

* Added import locations command

* Small fixes to location importer

* Added country, LDAP OU

* Cleaned up comments, added more clarification to what the script does

* Added ability to update groups via API

Fixes [ch9139]

* Bumped version

* Fixed #6883 - remove escaping of fields on LDAP import

* Fixed #6880 - correctly encrypt encrypted fields via the API

* Fixes #5054: LDAP users deactivated for none-ad (#7032)

When using none-AD ldap, users are automatically deactivated every LDAP
sync.  This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.

Fixed #5054, at least for 4.X

* Updated packages

  - Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
  - Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
  - Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
  - Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
  - Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
  - Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
  - Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)

* Fixed #7044 - API update deleted custom fields if they are not re-presented

* Fixed XSS vulnerability when creating a new categories, etc via modal on create

Same fix as before, because of the weird select2 post-parsing ajax behavior

* Updated email strings

* Fixed #7046 - added user website url back into UI

* Updated language strings

* Bumped version

* Updated packages

* New backups config for spatie

* Removed debugbar service provider (autodiscovery)

* Use laravel v5.5 withCount manual aliases

* Added spatie language files

* Removed old laravel backups config

This config file was renamed in a newer version of spatie laravel-backup

* Set the serialization

* Added the command loader to console kernel

* Renamed fire() to handle()

* Updated withCount to use manual naming

* Updated backup path in backup admin

* Updated travis with new php versions

* Bumped laravel version in readme

* Fixed custom field edit screen

* Fixed baseUrl is undefined error

I literally cannot figure out how this ever worked before.

* Fix for included files in backup

* Bumped version

* Switch has() to filled()

* Change ->has() to ->filled()

* Removed cosole log

* Bumped packages

* Use getReader instead of fetchAssoc for CSV parser

https://csv.thephpleague.com/9.0/upgrading/

* Handle JSON validation errors like 5.4

* Handle JSON validation errors like 5.4

* Handle JSON validation errors like 5.4

* Trying to fix ajax asset validation

This I think gets us closer, but still not handling the validation on the asset properly.

When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:

```
Illuminate\Support\MessageBag Object
(
    [messages:protected] => Array
        (
            [name] => Array
                (
                    [0] => The name field is required.
                )

            [seats] => Array
                (
                    [0] => The seats field is required.
                )

            [category_id] => Array
                (
                    [0] => The category id field is required.
                )

        )

    [format:protected] => :message
)
```

Currently the Assets ajax returns:

```
[2019-05-24 06:52:06] develop.ERROR: array (
  'messages' =>
  array (
    'model_id' =>
    array (
      0 => 'The model id field is required.',
    ),
    'status_id' =>
    array (
      0 => 'The status id field is required.',
    ),
    'asset_tag' =>
    array (
      0 => 'The asset tag field is required.',
    ),
  ),
)
```

So not sure why it’s not working.

* Fixed missing asset validation

* Check that a model exists before trying to fiddle with fieldsets

* Tidied up license check

* Removed extra escaping on checkin

* Updated importer to work with newer CSV Reader::getRecords() method

* Fixed field mapping

* Small fix for reordering fields

Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]

This needs revisiting for a more solid fix, especially for data that was already entered bad.

* Fixed bug where sorting by company name in Users API did not work

Fixes [ch9200]

* Removed custom fields from AssignedSearch to prevent confusing data in selectlist

Fixes [ch9193]

* Removed alert-danger from tests

* Fixed missed consumables_count withCount() statement

* Fixed Undefined variable user in $backto if checked out to a non-user

Fixes [ch9194]

* Check for valid model before attempting to access fieldsets

Fixes [ch1249]

* Only build the log upload destination path if there is a matching record

Fixes [ch1232]

* Fixed free_seats_count variable name

(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)

* Only gtry to delete the file if a record is found in the log

* Only try to get fieldset if model is valid

* Fixed more camel-casing -> snake-casing

* Only display the file if the log record can be found

* Fixed casing in sync command

* Updated README

* Derp - typo

* Added link to Atlassian plugin

* More Atlassian clarifications

* Show accessory image on view page

* Increased image size to 800px, added lightboxes

* Fixed #7083 - Removed user_exists constraint on department save

If the user has been deleted, this prevented the department from being successfully saved on edit

* Updated branch in version file

* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084)

* bump up to php7.1

& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`

* AND modapache ><

* 2 updates required to get software-properties+ppa

* Bumped version

* Bumped release again :(

* Missed one

* Fixed #7098 - updated backup config for deleteFile() method

* Fixed #7092 -  handle weird port forwarding/port numbers for baseUrl

* Bumped version

* Fixed #7099 - set email to null by default for backup notifications

* Removed old comments

* Fixed #7100 - Check if $user isset on checkin

* Increased throttle to 120 requests per minute

* Added Filipino, corrected order for Spanish variations

* Update language strings

* Bumped hash

* Changed has to filled to fix bulk asset editing

* Bumped point version

* Small fixes for phpleague CSB reader v9

* Improved error checking in locations importer

* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility

* Reduce minimum group name length to 2 (from 3)

eg: IT

* Back in time fix FOR #7145 for new installs on MySQL 8+

* Fixed permission insert

//TODO

Handle this via model

* Possible fix for reporting/admin migration back in time

* Fixed #7164 - change table name to permission_groups

* Fixed LDAP password blanking on save

* fixing previous commit's actual wiping of password (#7183)

replaced Input::fille('ldap_pword') with _filled_.   Should be good to go.  

https://github.com/snipe/snipe-it/issues/7179

https://github.com/snipe/snipe-it/issues/7169

* Bumped version

* Downgrading rollbar for Laravel 5.5

* Spelling Correction (#7206)

Fixed Spelling for the word reqrite, to be rewrite.

* Fix #6910: Add logic to manipulate the eloquent query. (#7006)

* Added company_id to consumables_users table

* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users

* Remove a migration that tries to fix this problem, but is not longer necessary

* Addresses #7238 - add PWA code to layout

Needs additional UX testing

* Better log message for bad LDAP connection

* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed

* Comment clarification on #7186

* Check for valid seat on hardware view

* Added space between footer and custom message

* Cap warranty months to three characters

Filles rollbar 209

* Cap warranty months to 3 on the frontend blade

* Fixed countable() strings on user destroy

* Check that the user has assets and that the aset model is valid

* Bumped hash

* Caps asset warranty to 20 years

* Command to fix custom field unicode conversion differences between PHP versions (#7263)

* Fixes #7252 form request changes (#7272)

* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests

* Removed debug info

* More fixes for #7252

This is mostly working as intended, if not yet the way Laravel wants us to do it.

Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.

* Removed experimental method

* Check for digits_between:0,240 for warranty

* Removed debug code

* Apply fix from PR #7273 to master

* Bumped hash

* Fixed #7250 - permission issue for API fieldsets and fields endpoints

This applies the change from #7294 to master

* Add @mskrip as a contributor

* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name

* CORS for api (#7292)

* Added CORS support to API

* Changed order so CORS will still work if throttle hit

* Added APP_CORS_ALLOWED_ORIGINS env option

* Fixed typo

* Clarified header comments

* More clarification

* DIsable CORS allowed origins by default to replicate existing behavior

* Change variable name to be clearer

* Bumped version

* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317)

* Added comments to the ByFilter query scope for clarity

* Added accessories checkout/checkin API endpoint

* Fixed CVE-2019-10742

https://nvd.nist.gov/vuln/detail/CVE-2019-10742

* Update README.md (#7334)

Add reference to CSV importer.

* Group related variables in .env

* History importer fixes

* Fixes to history importer
 2019-08-14 21:48:14 -07:00
snipe 8b4a9aa382 Fixes to history importer 2019-08-13 18:15:42 -07:00
snipe 0e93495ca2 Check that the user has assets and that the aset model is valid 2019-07-17 17:51:35 -07:00
snipe 77a6f6f400 Cap warranty months to 3 on the frontend blade 2019-07-17 12:15:15 -07:00
snipe fecf8015a1 Added space between footer and custom message 2019-07-17 12:09:32 -07:00
snipe 79ab0d8dc2 Check for valid seat on hardware view 2019-07-17 12:09:18 -07:00
snipe 6736b1c4e7 Addresses #7238 - add PWA code to layout 
Needs additional UX testing
 2019-07-15 13:49:56 -07:00
snipe 087cdd859e Fixed #7092 - handle weird port forwarding/port numbers for baseUrl 2019-05-29 14:57:58 -07:00
snipe 2dd31544fe Increased image size to 800px, added lightboxes 2019-05-24 19:11:08 -07:00
snipe 237acdcff0 Show accessory image on view page 2019-05-24 18:22:57 -07:00
sreyemnayr f85ac97d8c Feedback for Kits; Fix checkins for accessories (#7060) 
* Kits feedback

* Fix accessory checkin
 2019-05-23 19:39:30 -07:00
snipe f6ef139111 Fixed baseUrl is undefined error 
I literally cannot figure out how this ever worked before.
 2019-05-23 16:56:22 -07:00
snipe b2eacb147b Fixed #7046 - added user website url back into UI 2019-05-21 18:55:12 -07:00
Ivan Nieto e40a5a70a5 RTF support added (#7024) 
* Added the Gatte Facade to AssetsController

* Added the filetype RTF in the modal to upload files

* Added validation of RTF files
 2019-05-15 15:47:40 -07:00
snipe d016076806
Fixed #6956 - viewKeys policy inconsistent (#7009) 
* Fixed #6956 - Added additional gates show showing/hiding license keys

* Modified gate to allow user to see licenses if they can create or edit the license as well
 2019-05-08 08:14:49 -04:00
snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop 
# Conflicts:
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/LicensesController.php
#	composer.json
#	composer.lock
#	config/version.php
#	resources/views/auth/two_factor_enroll.blade.php
 2019-05-06 08:45:13 -04:00
snipe e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992) 
* Added upcoming audit report

TODO: Fid diff/threshold math

* Added route to list overdue / upcoming assets via API

* Controller/API methods for due/overdue audits

We could probably skip this and just handle it via view in the routes…

* Added query scopes for due and overdue audits

* Added audit due console command to kernel

* Added ability to pass audit specs to main API asset search method

* Added audit presenter

* Added bootstrap-tables presenter formatter to display an audit button

* Added gated sidenav items to left nav

* Added audit due/overdue blades

* Cleanup on audit due/overdue console command

* Added language strings for audit views

* Fixed :threshold placeholder

* Removed unused setting variable

* Fixed next audit date math

* Added scope for both overdue and upcoming

* Derp. Wrong version

* Bumped version

(I will release this version officially tomorrow)
 2019-05-05 22:32:52 -04:00
snipe e4a298ca2a Added scope for both overdue and upcoming 2019-05-05 22:13:30 -04:00
snipe 00a8a2aff3 Fixed next audit date math 2019-05-05 20:00:05 -04:00
snipe 7d416d1175 Fixed :threshold placeholder 2019-05-05 19:57:23 -04:00
snipe e9b9301efb Added language strings for audit views 2019-05-05 19:35:20 -04:00
snipe 4369d6adc6 Added audit due/overdue blades 2019-05-05 19:21:48 -04:00
snipe 69614a7db4 Added gated sidenav items to left nav 2019-05-05 19:21:26 -04:00
snipe 8154d1116c Added bootstrap-tables presenter formatter to display an audit button 2019-05-05 19:21:06 -04:00
snipe e46cccdf90 Added upcoming audit report 
TODO: Fid diff/threshold math
 2019-05-04 17:52:17 -04:00
ajsy 0cdc7af611 Update print.blade.php 2019-05-03 15:22:01 +03:00
snipe ce16eae508 Merge branch 'master' of https://github.com/snipe/snipe-it 2019-05-02 15:20:52 -07:00
snipe dc73dbfbfd Fixed #6911 - note must be a string on license checkin 2019-05-02 15:20:47 -07:00
ajsy 878cfee5a2 Revert "Delete print.blade.php" 
This reverts commit a0721412fa.
 2019-04-20 09:28:48 +03:00
ajsy a0721412fa
Delete print.blade.php 2019-04-19 15:50:05 +03:00
ajsy 52add03e56 Update print.blade.php 
replace string in serial number with x except last five character
 2019-04-19 15:43:40 +03:00
ajsy c974968821 Update view.blade.php 2019-04-19 14:03:09 +03:00
ajsy f2242fa32e Update view.blade.php 2019-04-19 13:20:41 +03:00
snipe 420e8bc85a Allow phone number to be changed in Profile 2019-04-18 14:13:50 -04:00
snipe ded1a59914 Removed help text for email images (since we embed them by default now) 
Added help text for username format
 2019-04-02 18:22:31 -07:00
snipe 37b8029d04 Fixed parse error on label settings 
Also fixed [ch1362] - moving left/right
 2019-04-02 18:04:31 -07:00
snipe d01f9a701c Fix double-encoding issue? 
I assume there’s something new in Laravel 5.7/5.8 that’s causing the double escaping. I’m not seeing it everywhere, which is more confusing, TBH. :-/
 2019-03-20 04:12:03 -07:00
snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop 
# Conflicts:
#	.all-contributorsrc
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/ImportsController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Requests/ItemImportRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/version.php
#	docker/startup.sh
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
 2019-03-20 02:17:02 -07:00
snipe da015ec4a8
Fixed #6834 and #6402 - use inline QR code generation for 2FA (#6840) 
* Fixed  #6834 and #6402 - use inline QR code generation for

* Update auth controllers to use translations

* Updated composer lock

* Added comments

* Moar comments

* Typo
 2019-03-20 01:24:31 -07:00
snipe a874dbb0d0 Working attempt, but will try with old library for mininal footprint 2019-03-19 23:18:16 -07:00
snipe 0e1289f12f
Fixes #6821 - fixed 2 fa active for users list (#6822) 
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced

I also updated the language in the user’s listing table to clarify what “activated” means

* Added login enabled info to user view

* Clarified comments

* Added info about 2FA on user profile

Because why not

* Added nowrap to table, and added 2FA reset for superadmins
 2019-03-18 11:59:02 -07:00
snipe 7b33f95e83
Fixes/import permissions mask (#6826) 
* Check for empty headers in import

* Added import permission

* Fixed model path in docblock

* Added import gate to default blade

* Check if the user is an admin OR idf they have import permissions

* Walked back that admin permission

Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
 2019-03-18 11:58:08 -07:00
Tim Farmer 5893e25b43 Label bugs in alerts settings (#6808) 
* Label bugs in alerts settings

Found another label bug where the alert_email label should be alerts_enabled.

* Update alerts.blade.php
 2019-03-14 10:53:05 -07:00
snipe 0b927623e8 Added “record created” string for clarification in asset/license history 2019-03-13 22:06:57 -07:00
Ivan Nieto c7f48951a9 Valo/checkin date in history of asset (#6733) 
* To see checkin/checkout Date in History of Asset

* Added some logic to get today's date if the checkin_at input is blank

* Updating the action_date taking the value from the action_log table

* Hide created_at field and rename 'Action Date' as only 'Date'
 2019-03-13 21:36:32 -07:00
snipe 55f727ef28 Fixed HTML labels on alerts setting page 
Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block
 2019-03-13 19:53:23 -07:00
snipe 6c71e72dcd Fixed labels labels (wha?) 
Wrong HTML labels for some fields in the Settings > Labels page.

Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
 2019-03-13 19:50:35 -07:00
snipe 1b0d855c00 Added translation, removed commented out code 2019-03-13 12:15:48 -07:00
ajsy 03c5b8e4ab Create print.blade.php 2019-03-09 11:36:42 +03:00
ajsy a958d56590 Update view.blade.php 2019-03-09 11:29:06 +03:00
snipe 7e8d337ed5 Moved kit icon 2019-03-08 16:49:05 -08:00
snipe 400907cc40 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2019-03-08 16:24:12 -08:00
snipe 61afdeac2e Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop 2019-03-08 16:18:48 -08:00
Martin Meredith 55cbbf2b00 Fixes #6794: Fix URLs to access some 'missing' images (#6795) 
* Fix image path for Model view

* Fix URLs for images in account view

* Fix Supplier view Image URL
 2019-03-08 12:47:37 -08:00
Martin Meredith daf6d98a3b Remove test data for Pie (#6793) 2019-03-08 12:46:47 -08:00
Tim Farmer 7deab0f53b Label bugs in general settings (#6801) 
* checkbox label bug

The checkbox label in general settings for require_accept_signature was set to full_multiple_companies_support instead so when you click the label for require accept signature it would check the wrong box.

* Update general.blade.php

* Update general.blade.php

Another label that is wrong in general settings
 2019-03-08 12:24:24 -08:00
Steffen e1907e30b1 Allow multiple upload fields and add logo option to labels (#6736) 
* Change upload js to work with multiple upload elements on a single page

* Change uploadFile in upload modal and form partial

* Change uploadFile to js-uploadFile to avoid potential issues in the future

* Remove duplicate style attribute causing webpack to fail

* Missed a css class in rename to js- prefix

* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config

* Add more css classes to labels

* Allow unescaped " (quot) in css ouput

* Add max size param to partial, set defaults for allowedType and size
 2019-03-01 15:25:42 -08:00
Dmitrii Minaev 16bb784e78 Codestyle & bug fixes 2019-02-28 01:37:58 +03:00
snipe c47fa5ad1c Fixed missing @endcan 2019-02-26 19:14:28 -08:00
Dmitrii Minaev 5f3a0bdea5 app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php 
add accessories and consumables tables
add selectlist api to:
 app\Http\Controllers\Api\AccessoriesController.php
 app\Http\Controllers\Api\ConsumablesController.php
 app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
 2019-02-19 22:19:00 +03:00
snipe 0000f487ac Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop 
# Conflicts:
#	config/version.php
 2019-02-13 23:02:21 -08:00
snipe 35ebe33e4e
Fixed #6703 - fixes password confirmation (#6711) 
* Fixed #6703 - fixes password confirmation

* Removed debugging

* Fixed tests

* I guess we use 10 as the settings for password min in tests

* One more try to fix tests - confirmation won’t validate until password validates
 2019-02-13 23:01:19 -08:00
snipe 230c9da1df Fixed #6703 - fixes password confirmation 2019-02-13 21:30:15 -08:00
snipe 35898e4ca0 Added asset tag to maintenances report 2019-02-13 07:09:16 -08:00
snipe 533649f24e Merge branch 'develop' into dev-master-integration 
# Conflicts:
#	.gitignore
#	.travis.yml
#	app/Console/Commands/LdapSync.php
#	app/Console/Commands/SendExpectedCheckinAlerts.php
#	app/Console/Commands/SendExpirationAlerts.php
#	app/Console/Commands/SendInventoryAlerts.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/Importer.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/License.php
#	app/Models/Location.php
#	app/Models/Recipients/AlertRecipient.php
#	app/Models/User.php
#	app/Providers/AppServiceProvider.php
#	composer.json
#	composer.lock
#	config/trustedproxy.php
#	config/version.php
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
#	resources/lang/ar/admin/settings/general.php
#	resources/lang/bg/admin/settings/general.php
#	resources/lang/en-ID/admin/settings/general.php
#	resources/lang/en-ID/passwords.php
#	resources/lang/en/passwords.php
#	resources/lang/es-CO/passwords.php
#	resources/lang/es-ES/passwords.php
#	resources/lang/es-MX/passwords.php
#	resources/lang/es-VE/passwords.php
#	resources/lang/fi/admin/settings/general.php
#	resources/lang/id/admin/settings/general.php
#	resources/lang/id/passwords.php
#	resources/lang/ja/passwords.php
#	resources/lang/nl/passwords.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/passwords.php
#	resources/lang/pt-BR/admin/settings/general.php
#	resources/lang/pt-BR/passwords.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/admin/statuslabels/table.php
#	resources/lang/ru/passwords.php
#	resources/lang/sr-CS/general.php
#	resources/lang/sr-CS/mail.php
#	resources/lang/sv-SE/admin/settings/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/passwords.php
#	resources/lang/vi/admin/models/message.php
#	resources/lang/vi/admin/users/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/views/importer/import.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/partials/forms/edit/image-upload.blade.php
#	resources/views/users/edit.blade.php
#	resources/views/users/view.blade.php
#	tests/unit/ImporterTest.php
 2019-02-13 06:42:52 -08:00
snipe 2768ea692e Removed extraneous js call 2019-02-13 04:24:37 -08:00
snipe 35e60fd151 Updated languages 2019-02-13 03:56:18 -08:00
herroworrd 3f7d2aebc7 Fixed #6634: Asset Import History fixes and optimizations (#6657) 
* Starting work on asset history importer.

* Starting work on asset history importer.

* Added checkin target.

* Last change... importing history should also probably be an admin only task.

* Added caching for user and asset queries.

* Updated cache keepalive time to DateTimeInterface

* Updated cache keepalive time to DateTimeInterface
 2019-02-08 16:05:56 -08:00
Dmitrii Minaev e01e0c5596 Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php 
Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js
Some design fixes resources\views\kits\edit.blade.php
Add default value to form (template) resources\views\modals\kit-model.blade.php
New routes for kit accessories and kit consumables routes\api.php
New routes for kit models, kit accessories and kit consumables routes\web\kits.php
New templates
 2019-01-27 23:19:24 +03:00
snipe 9d21fc85bc Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report 2019-01-25 20:59:54 -08:00
snipe 194d0733d4 Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report 
This report will likely be deprecated.
 2019-01-25 20:57:14 -08:00
Ivan Nieto 7d982c9ea6 Import page is blank [ch90] (#6636) 2019-01-24 15:34:50 -08:00
Ivan Nieto 310ed0f1d3 Fix an issue when trying to checkin a license seat. [ch46] (#6599) 
* Fix an issue when trying to checkin a license seat.

* Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.
 2019-01-17 20:36:40 -08:00
snipe 1eace04ad9 Handle asset maintenances that do not have a valid asset associated 2019-01-16 02:26:42 -08:00
snipe c055e3af21 Only try to return the asset tag link if a valid asset id has been passed 2019-01-16 02:19:35 -08:00
omyno f0500e9797 Show user's signature in print view (#6471) 2019-01-15 14:03:40 -08:00
Wes Hulette 3e19509a49 Fixed: #6395 - Adjusted graph size (#6518) 
* Fixed missing oauth tables during setup.

* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop

* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop



Merge remote-tracking branch 'origin/develop' into develop

* Fixed Pie Graph sizing on dashboard

Updated chart.js to 2.7.3
Added height to canvas
 2019-01-15 14:02:49 -08:00
snipe 394d265b96 Added XML to uploadable file type - re: #6099 2018-12-12 16:45:09 -08:00
Wes Hulette b38d07064b Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381) 
* Fixed missing oauth tables during setup.

* Custom fields of type "CUSTOM REGEX" are always saved as "ANY" 

Fixes #5896

* Updated per PR

Fixed spelling

* Fixed logic error

Moved conditional code from view to controller
Added getFromatType function for dropdown
 2018-12-06 20:05:04 -08:00
Wes Hulette 34246ee4ef [WIP] v5 Develop: New LDAP implementation (#6352) 
* Fixed missing oauth tables during setup.

* WIP New LDAP implementation

* WIP New LDAP implementation

* WIP New LDAP implementation


Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP

* WIP New LDAP implementation

Added Adldap2 to handle ldap intergration.

* Updated per PR quality review

* Added specific LDAP settings method

* Corrected version number

* Added return documentation

* Added imports

* Changed class to be injected into controller

* Updated with PR suggestions
 2018-12-06 14:05:43 -08:00
snipe 09c4dd4891 Added ability to upload favicon and email logo 
todo: refactor the image upload/resize for less copypasta
 2018-12-05 19:56:12 -08:00
Minaev Dmitriy 0bbe499414 Kits checkout. But only with models. 2018-11-13 20:33:32 +03:00
Evgeny dd7db95135 A couple hardcoded strings replaced in according with #6406 (#6412) 
Hardcoded strings was replaced with corresponding placeholders.
Log statuses mentioned in #6406 wasn't translated cause it needs more separate complicated development
 2018-11-08 15:20:44 -08:00
snipe ea91d59ffc
Use username instead of email address in password reset (#6382) 
* Switch to use username instead of email

* Fixed indenting

* Updated password language

* Updated blades to reflect username instead of email

* Changed password/reset controllers to use username instead of email

* Redirect to login page instead of repeating the password reset form
 2018-10-31 18:03:24 -07:00
snipe ce8d47b2b4 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-31 15:19:18 -07:00
snipe 65aef11ae3 Fixed #5879 - added user department filter for custom report 2018-10-31 15:19:13 -07:00
Tim Bishop 7835cc34c8 Insert audited items to the top of the list. (#6376) 
When doing a large number of items they soon disappear off the bottom of
the screen. It's handy to be able to check the result as it's happening
so adding them to the top of the list keeps the most recent items visible.

Move the "Processing..." spinner to the header so it stays at the top.
 2018-10-31 11:13:08 -07:00
snipe 2cecd5e056 One more fix for #6175 (non-accessories) 2018-10-31 10:23:47 -07:00
snipe 5da9120870 Fixed #6175 - crashing when accessory has been deleted 
My guess would be this crash (reported in #6175) was happening because of deleted accessories/accessory rows.
 2018-10-31 10:23:32 -07:00
Minaev Dmitriy 9d5cd27575 New save mechanic 2018-10-31 16:06:38 +03:00
snipe 5faf8bfcd0 Fixed error on unaccepted asset report 2018-10-29 14:39:42 -07:00
snipe f0e6a5c905 Fixed error on asset creation 2018-10-29 14:35:34 -07:00
snipe e443a576f7 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-19 16:46:53 -07:00
snipe 20b26effdb Fixed #6349 - add view permission for print all assigned 2018-10-19 16:46:46 -07:00
snipe 1a10aa0dda Fixed #6349 - add view permission for print all assigned 2018-10-19 16:43:28 -07:00
Minaev Dmitriy f1f7694835 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2018-10-19 19:00:53 +03:00
Minaev Dmitriy 0e66c3cb56 Predefined kits test 2018-10-19 17:30:25 +03:00
Wes Hulette 465b69516d Fixed: #6259 - Remove remote JS/CSS file loading (#6330) 
* Fixed missing oauth tables during setup.

* Remove remote JS/CSS file loading


Updated gravatar to return to default image

* Updated default avatar path to user url

Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
 2018-10-17 12:52:01 -07:00
snipe 2ded2ff53a Make dashboard snapshots clickable 2018-10-15 18:19:30 -07:00
snipe 74c20e62d5 Fixed - suppress the asset create button if the user is not allowed to create assets 2018-10-15 17:57:47 -07:00
snipe 0dbce93d1b Better logic for disallowing company selection when user is not a superadmin and FCS is enabled 2018-10-15 17:57:28 -07:00
snipe 9797412d23 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-15 17:02:39 -07:00
snipe 6b6cf06530 Display asset name if one exists and the user cannot edit 2018-10-15 17:02:31 -07:00
snipe 539c3023b9 Added - check whether the user can edit an asset before allowing them to change the name on checkout 2018-10-15 16:52:45 -07:00
Joe Ferguson 704209de9c Fixed #6301: Do not allow duplicate asset tags (#6324) 
* Fixed #6301: Do not allow duplicate asset tags

* Display error message for single asset_tag failure
 2018-10-11 17:15:09 -07:00
snipe 835b461d7d Fixed #6323 - typo in link for low inventory 2018-10-11 15:31:10 -07:00
snipe b8f8d49927 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-11 15:29:48 -07:00
snipe 63a2727077 Fixed #6323 - typo in link for low inventory 2018-10-11 15:29:38 -07:00
Ivan Nieto 5516978f2e #5696 proposed fix (#6314) 
* Another 'or' caught in a blade template

* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.

* Getting right the permission in the view checkout-license
 2018-10-11 14:08:09 -07:00
Wes Hulette 19ee62f704 Fixed: Missing JS file import (#6320) 
* Fixed missing oauth tables during setup.

* Fixed missing JS import
 2018-10-11 13:51:37 -07:00
snipe c7596e7741 Fixed image not uploading on asset create 2018-10-09 17:31:52 -07:00
Wes Hulette d715ecf41d Fixed: Tooltips (#6309) 
* Fixed missing oauth tables during setup.

* Fixed missing tooltips

Updated spelling in bootstrap-table.blade.php to use bootstrap data element. 
Using custom jquery-ui without tooltips to fix conflict issue.

* Removed custom jQuery ui file added fix in bootstrap.js file
 2018-10-09 15:20:27 -07:00
Wes Hulette 6818901f7d Fixed: Admin LTE left menu bar not working (#6308) 
* Fixed missing oauth tables during setup.

* Updated per AdminLTE upgrade guide.
 2018-10-09 15:20:12 -07:00
snipe a516e4278e Remove company select option if the user is not an admin and FCS is enabled 2018-10-05 07:30:42 -07:00
snipe c21524f240 Fixed NaN when no asset tag is provided 2018-10-05 05:42:28 -07:00
snipe ecb8204c3c Associate serials with multiple asset creation 2018-10-05 05:30:13 -07:00
snipe 476b58632b Handle array of asset tags 
TODO: figure out how to display validation errors more sanely
 2018-10-05 04:34:47 -07:00
snipe d4a97d0431 Increase max fields in multi-asset creation 2018-10-05 04:18:06 -07:00
snipe ade9a0c995 Removed server-side validation right now 
Getting an unexpected keyword ‘export’ error. I’ll come back to this.
 2018-10-05 03:47:58 -07:00
snipe 7e33051c7a Remove console logging 2018-10-05 03:44:30 -07:00
snipe 4a448ba5f9 Increment tag based on first 2018-10-05 03:43:40 -07:00
snipe 8e90ed00d8 Added alt tags to logo 2018-10-05 03:43:16 -07:00
snipe 81d8c1cc52 Fixed remove-asset-tag javascript on asset edit, added server side validation support 2018-10-05 02:51:14 -07:00
snipe 4920dced6e Enabled toggleDisabled on form validator 2018-10-05 01:12:14 -07:00
snipe 4a4fc38c43 Style updates 2018-10-05 00:57:18 -07:00