DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 10:34:08 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12890 commits 96 branches 267 tags 295 MiB
Commit graph

12890 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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 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
snipe a0de9eb343 Updated to alpine 3.18.5 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-05 15:00:04 +00:00
snipe b4d747550c
Merge pull request #13998 from snipe/feature/add_help_text_for_rtd 
Added help text to RTD location field
 2023-12-05 14:42:07 +00:00
snipe 7258af20fc Added help text to RTD location field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-05 14:40:49 +00:00
Godfrey Martinez dd68182d08
Merge branch 'develop' into add_license_to_info_for_activation 2023-12-04 11:17:07 -08:00
Godfrey M 0e9e31f68b adds info needed for license self activation 2023-12-04 11:12:30 -08:00
snipe 174a3398d1
Merge pull request #13993 from Godmartinz/license_product_key_serial_swap 
Fixed the Column header Serial to Product Key on a User View
 2023-12-04 19:09:03 +00:00
Godfrey M 4fd43799b4 missed one view 2023-12-04 10:56:03 -08:00
spencerrlongg cef1c5d4d2 cleanup test 2023-12-04 12:47:46 -06:00
snipe 09ec8d1d5c Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/mix-manifest.json
 2023-12-04 15:42:58 +00:00
snipe 5d60be97af
Merge pull request #13992 from snipe/bug/sc-24182 
Added eula-pdfs to allow-list on restore
 2023-12-04 15:35:34 +00:00
snipe 1e46ecc2ee Added eula-pdfs to allow-list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-04 15:33:56 +00:00
spencerrlongg 2d57b9399c more cleanup 2023-11-30 16:20:48 -06:00
spencerrlongg ca8765e1d7 cleaned up 2023-11-30 16:18:50 -06:00
spencerrlongg 6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
spencerrlongg 68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg 88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
spencerrlongg 133c469e36 organization 2023-11-30 14:25:58 -06:00
snipe 5730518fc6
Merge pull request #13978 from uberbrady/test_ldap 
Test ldap
 2023-11-30 19:23:29 +00:00