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

15614 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c5c3000a38 Added GH test action status badge 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:59:45 +00:00
snipe 46c0d38c6d Removed huntr.dev badge 
They refocused their company to only AI now :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:44:11 +00:00
snipe f9697887e8 Removed extraneous test 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:41:35 +00:00
snipe c2896c034d Merge remote-tracking branch 'origin/develop' 2023-12-12 13:33:50 +00:00
snipe 0241e66f2d
Merge pull request #14021 from snipe/bug/sc-24328 
Fixed HTML double-encoded on checkout emails.
 2023-12-12 13:31:41 +00:00
snipe b53a4c366e Removed escaping on notes on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:26:41 +00:00
snipe 1572d5c3cc Merge remote-tracking branch 'origin/develop' 2023-12-12 12:27:15 +00:00
snipe 6bb842f52c
Merge pull request #14020 from snipe/bug/sc-24326 
Added $user->created_at to API user create method
 2023-12-12 12:26:58 +00:00
snipe e894138fd4 Added $user->created_at to API user create method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 12:26:02 +00:00
snipe f8a56f6dc2 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-12-12 04:33:04 +00:00
snipe 068f64a78e
Merge pull request #14018 from snipe/features/more_info_in_quickscan 
Added model name and number to quickscan
 2023-12-12 04:30:11 +00:00
snipe 631dd58de1 Added model name and number to quickscan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 04:23:04 +00:00
snipe bbe5c7c6e8
Merge pull request #14017 from snipe/bug/sc-24323 
Smaller icon size for activity reports, other action icons
 2023-12-12 01:02:45 +00:00
snipe 41f1c5c1e3 Smaller icon size for activity reports, other action icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:58:20 +00:00
spencerrlongg b01d53a247 one more 2023-12-11 18:43:46 -06:00
snipe 8100f11a36
Merge pull request #14016 from snipe/feature/sc-24184 
Set default sorting on backups to latest first
 2023-12-12 00:36:28 +00:00
snipe 65dae836c6 Set default sorting on backups to latest first 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:35:08 +00:00
snipe 1689c7f9b6 Merge remote-tracking branch 'origin/develop' 2023-12-12 00:15:35 +00:00
snipe 1084382654
Merge pull request #14015 from snipe/bug/sc-24322 
Updated importer icons
 2023-12-12 00:15:15 +00:00
snipe 456e6979f0 Updated import icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:12:06 +00:00
spencerrlongg 65cbba3c2e completely kill vue 2023-12-11 18:09:22 -06:00
Godfrey M 5eb08d9568 added a missing table header for checkout 2023-12-11 11:14:55 -08:00
snipe e7a9c7ec99
Merge pull request #14008 from akemidx/sc20532_change_log_level 
Change log level on status label colors above 256
 2023-12-08 09:01:28 +00:00
snipe cf242d8b86 Merge remote-tracking branch 'origin/develop' 2023-12-08 08:59:17 +00:00
snipe aa4aaf69b0 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-08 08:58:45 +00:00
akemidx f112e31b46 changing log level from ERROR to LOG 2023-12-07 17:56:10 -05:00
akemidx dc83689553 changing log level from ERROR to LOG 2023-12-07 17:50:25 -05:00
snipe 16ea459eca Merge remote-tracking branch 'origin/develop' 2023-12-07 19:49:25 +00:00
snipe e483e910fe
Merge pull request #14007 from snipe/bug/sc-24315 
Fixed maintenances patch endpoint
 2023-12-07 19:48:43 +00:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
snipe 4e96c8d05d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	Dockerfile.alpine
 2023-12-07 14:12:56 +00:00
snipe 2c5c97fd7e
Merge pull request #14005 from uberbrady/restore_more_directories 
Improve backup directory array
 2023-12-07 14:12:04 +00:00
Brady Wetherington 6bd351c5d8 Whoops, didn't even add changes - duh 2023-12-07 14:08:15 +00:00
spencerrlongg f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
spencerrlongg 04069bab82 remove comment 2023-12-05 20:50:07 -06:00
spencerrlongg 3106035ef9 delete, comment 2023-12-05 20:41:34 -06:00
spencerrlongg 18720b3302 safety stuff 2023-12-05 20:36:59 -06:00
spencerrlongg 12e546e63a everything working, cleanup 2023-12-05 20:22:20 -06:00
spencerrlongg c28936fefb almost there... problem with update button 2023-12-05 17:39:35 -06:00
spencerrlongg 080d196138 buttons work now after style tags removed 2023-12-05 16:41:25 -06:00
spencerrlongg d3967b37cd this is a start, buttons not working? 2023-12-05 14:52:14 -06:00
Godfrey M b90cfba796 adds status label id to line change 2023-12-05 11:56:54 -08:00
Godfrey M 49342a4542 added status names to asset history 2023-12-05 11:50:43 -08:00
Godfrey M a95f0b8862 remove column sizes 2023-12-05 11:07:52 -08:00
Godfrey M 7a1d5e11cc Merge remote-tracking branch 'origin/add_license_to_info_for_activation' into add_license_to_info_for_activation 2023-12-05 11:07:34 -08:00
Godfrey M 15af64a355 fixed the bootstrap column sizes 2023-12-05 10:07:58 -08:00
snipe 0089ea2321
Merge pull request #13882 from marcusmoore/fixes/jquery-validation 
Fix client side validation in the v7 branch
 2023-12-05 17:26:48 +00:00
snipe 3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907 
Convert Vue Personal Access Tokens to Livewire
 2023-12-05 16:45:16 +00:00
spencerrlongg 6ca5fb6b20 remove token scope html 2023-12-05 09:44:03 -06:00
snipe 34bf6818ca
Merge pull request #13999 from snipe/security/alpine 
Updated to alpine 3.18.5 (PR to #13989)
 2023-12-05 15:01:07 +00:00