DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9464 commits 101 branches 268 tags 288 MiB
Commit graph

3016 commits

Author SHA1 Message Date
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 3702dd87ce fixing pr 2023-02-01 16:10:30 -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 583a0412fe Added edit fieldsets translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:23 -08: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
snipe a61ccbb965 Added very clunky but better error messages on that validation for date_format 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:33:49 -08:00
snipe 91394f7262 Removed duplicate comment section 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:23:06 -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 4b51424723 fixes a couple buttons color choices in high contrast 2023-01-24 09:42:03 -08: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
akemidx 25996cbe03 translating the quick info printed out on accept x eula blades 2023-01-23 16:18:21 -05: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
snipe 33fe2b57f7 Added new byod strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:10:48 -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
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 50cc69c427 Added South Sudan to country list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 13:23:57 -08:00
snipe d508374c57 Disallowed category type change string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:15:51 -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 014eab3abc Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 11:09:26 -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 9c63f426d9 Added missing translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-04 14:09:14 -08:00
snipe b77d5801fa English is hard, apparently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-04 13:56:16 -08:00
snipe d187174f00
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator 
Added: validation for department names at Company locations
 2022-12-22 11:29:12 -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
snipe d13a237000
Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer 
Adds remote field to the user importer
 2022-12-14 12:13:18 -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 e26036e998 Merge remote-tracking branch 'origin/develop' 2022-12-08 17:36:01 -08:00