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

9240 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx 25996cbe03 translating the quick info printed out on accept x eula blades 2023-01-23 16:18:21 -05:00
snipe 4b01909806
Merge pull request #12389 from snipe/fixes/livewire_ui 
Fixed #12388 - Add CSS to the div to correct the weird indenting
 2023-01-23 11:42:26 -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 b59dcc7b30
Merge pull request #12379 from marcusmoore/fix/row-divider-overflow 
Fix minor visual bug on asset show page
 2023-01-19 16:21:31 -08:00
snipe 69ab42b3f9
Merge pull request #12380 from snipe/maintenance/asset_updates 
Updated dev assets
 2023-01-19 15:53:55 -08:00
snipe 0080ac92e7 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:52:06 -08:00
snipe 9508a97852
Merge pull request #12378 from marcusmoore/fix/allow-removing-asset-name-during-checkout 
Allow users to set a blank asset name during checkout
 2023-01-19 14:50:58 -08:00
Marcus Moore 0fa956403c
Fix row divider overflow 2023-01-19 14:16:28 -08:00
Marcus Moore 181f96ad33
Allow users to set a blank asset name during checkout 2023-01-19 12:35:44 -08:00
snipe 04e28c2d34
Merge pull request #12377 from inietov/fixes/visual_glitch_deleting_importing_files 
Fixed #12340  Deleting imported files visually drops first element in table.
 2023-01-19 11:59:40 -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
snipe 155977de2d
Merge pull request #12370 from marcusmoore/fix/file-upload-tab-permissions 
Fixed file uploads for accessories, components, and consumables
 2023-01-18 16:08:53 -08:00
snipe 378dc968b7 Derp. Copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 15:44:28 -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
snipe 45019c65f1 BYOD migration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:10:39 -08:00
snipe acd182e3d2 Added byod to presenter with boolean formatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:10:30 -08:00
snipe 48b8cfcef9 Added byod to model, removed duplicate validation rule 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:04:36 -08:00
snipe f626413502 Added byod to API transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:04:02 -08:00
snipe b80d52a9c3 Added byod to asset controller for create and update methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:51 -08:00
snipe ee4b8f4694 Added byod to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:31 -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
snipe 956bd384b0
Merge pull request #12364 from snipe/features/make_2fa_sortable 
BREAKING: Partial fix for #12356: Make 2FA sortable in user list
 2023-01-17 20:24:05 -08:00
snipe 7e22663326
Merge pull request #12363 from corydlamb/Ampersand-Patch 
Fixed #12362: Bug With Passwords Including Ampersands?
 2023-01-17 19:17:50 -08:00
snipe c3e4d9d773 Make column name consistent with field name (BREAKING) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 18:27:47 -08:00
snipe f08babfa8a Just moved some stuff around - no actual meaningful code changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:22:03 -08:00
snipe 4ef0005e7c BREAKING: changed API fieldname result for 2FA 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:40 -08:00
snipe dbda288a44 Formatting changes only for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:20 -08:00
snipe eaf9332096 Added filterability to 2FA fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:03 -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 23a1b2d60a
Register the consumables.files ability 2023-01-17 17:15:23 -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
corydlamb 295f0dd1f5
Update WelcomeNotification.php 
Used htmlspecialchars_decode to fix the issue I had involving Ampersands in the password field (and I'm assuming the other fields) of the welcome notification email. Changes are all in lines 22-26. Sorry if I'm not doing this very well as this is my first pull request.
 2023-01-17 19:33:25 -05:00
Marcus Moore 1fef992fa8
Allow users with components.files ability to upload files for components 2023-01-17 15:58:11 -08:00
Marcus Moore e23ee7540d
Register the components.files ability 2023-01-17 15:45:40 -08:00
snipe dd8c6e92db
Merge pull request #12355 from snipe/features/make_category_visable_on_models_page_by_default 
Added catergories to default visiable set on asset models
 2023-01-15 17:09:00 -08:00
snipe f4630d67be Added catergories to default visiable set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-15 17:07:50 -08:00
snipe 6f6f99f64e
Merge pull request #12354 from uberbrady/fix_npm_dependencies 
Backed out less-loader version requirement so that builds still work
 2023-01-14 10:57:35 -08:00
Brady Wetherington 6f89e8b0d8 Backed out less-loader version requirement so that builds still work 2023-01-14 10:53:36 -08:00
snipe 6815a16a5f
Merge pull request #12353 from snipe/fixes/rollbar_logging 
Only add rollbar to the logging array if the app is in production
 2023-01-13 13:53:30 -08:00
snipe 0c3d03a4ce Only add rollbar to the logging array if the app is in production 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 13:50:16 -08:00
snipe 8048d06853
Merge pull request #12352 from snipe/fixes/added_south_sudan_to_country_list 
Added South Sudan to country list
 2023-01-13 13:24:54 -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