lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
9257 commits 1 branch 0 tags 220 MiB
Commit graph

9257 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore
f63710fb5c
Remove unused import 2023-02-22 12:34:56 -08:00
Marcus Moore
7667b0a216
Remove extra line 2023-02-22 12:34:35 -08:00
Marcus Moore
931ca98c02
Remove middleware bypass 2023-02-22 12:33:55 -08:00
Marcus Moore
aae2106658
Use existing language translation string 2023-02-22 12:02:14 -08:00
Marcus Moore
c03079944a
Be more explicit in test case 2023-02-06 16:06:13 -08:00
Marcus Moore
0e57e4836e
Add translation for Company 2023-02-06 12:21:23 -08:00
Marcus Moore
45e8e9bbed
Move company name to better location 2023-02-06 12:21:09 -08:00
Marcus Moore
38cdcdf064
Eager load company 2023-02-06 10:59:51 -08:00
Marcus Moore
78343ddb7c
Add asset's company name to checkout page 2023-02-06 10:58:10 -08:00
Marcus Moore
0cefc7de15
Skip security headers middleware when testing 2023-02-02 18:37:35 -08:00
Marcus Moore
9a0c66bd30
Clear some extra lines 2023-02-02 18:30:18 -08:00
Marcus Moore
d8e92d29c0
Improve readability 2023-02-02 18:25:54 -08:00
Marcus Moore
93a62c87c2
Implement test for searching users 2023-02-02 17:57:24 -08:00
Marcus Moore
89eff23e44
Continue implementing tests 2023-02-02 17:41:32 -08:00
Marcus Moore
a2e47d19fc
Scaffold tests for user select list api and begin to implemenet 2023-02-02 13:47:00 -08:00
Marcus Moore
b92d1d3ec7
Logically group query when searching users to scope to company 2023-01-24 11:54:56 -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
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