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

9430 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore cd582be851
Drop tables that may exist in down methods 2023-01-23 15:42:45 -08:00
Marcus Moore 760844de6f
Add conditionals 2023-01-23 15:42:33 -08:00
Marcus Moore e6dc61d2cf
Revert column names to legacy versions in down method 2023-01-23 15:42:05 -08:00
snipe 35dfaddd79
Merge pull request #12400 from snipe/jerm/fix-import-backup-checkbox 
Fixed "Backup before importing?" checkbox on import page
 2023-01-23 15:35:18 -08:00
Jeremy Price d3bcc48ae5 [imports] fix "Backup before importing?" checkbox on import page 
We were always taking backups before import, no matter the status of
this box.

Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.

We're now checking the status, and it behaves as expected
 2023-01-23 15:08:59 -08:00
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 cd8cb445ba Corrected fieldname for user fieldname for avatar in Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:53 -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 48c85966d7 Added gravatar and avatar as fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:07:17 -08:00
snipe a0aed19f95 Refactor image handler 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:55 -08:00
snipe f77d871dff Use the imageHandler for profile avatar changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:20 -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 60eab08735 Added ->with(‘users as users_count’) in Accessory query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:41:07 -08:00
snipe 90c1631820 Added users_count to transformer for API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:35 -08:00
snipe dceb77d4d4 Refactored numRemaining, removed unnecessary numCheckout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:20 -08:00
snipe 46e3e8a3dd Added new users_count field to API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:39:53 -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
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