DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 16:57:38 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12519 commits 89 branches 265 tags 290 MiB
Commit graph

12519 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe fb1965331c
Merge pull request #13981 from Godmartinz/license-table-header-fix 
Fixed the Column header Serial to Product Key for Licenses
 2023-11-30 18:51:42 +00:00
Godfrey M fdaa44654d changes the table header Serial to Product Key 2023-11-30 10:46:18 -08:00
snipe 1455331a90 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-30 18:25:38 +00:00
spencerrlongg 7e780c1187 cleanup rules formatting 2023-11-30 12:20:02 -06:00
spencerrlongg df954a3af2 return types 2023-11-30 12:06:58 -06:00
spencerrlongg 135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06:00
snipe 42109dc1eb
Merge pull request #13976 from Godmartinz/sc-24144_final 
Fixed black dark theme, contrast issues etc
 2023-11-30 16:23:13 +00:00
snipe 47c8ae000a
Merge pull request #13975 from ubc-cpsc/bugfix/CVE-2023-49316 
Fixes CVE-2023-49316 by upgrading phpseclib/phpseclib
 2023-11-30 16:22:08 +00:00
Brady Wetherington 5a60df55d1 Add more LDAP tests - including pagination(!) 2023-11-30 16:09:37 +00:00
Brady Wetherington 16da994e28 Add LDAP as 'recommended' requirement; flesh out LDAP tests 2023-11-30 14:00:20 +00:00
Brady Wetherington 2a00dc2d28 Merge branch 'develop' into test_ldap 2023-11-30 12:04:43 +00:00
spencerrlongg 151ceb5fbe get rid of firsts and find by responses id 2023-11-29 17:14:46 -06:00
spencerrlongg d794608a09 note 2023-11-29 15:04:52 -06:00
spencerrlongg c3492f1699 fixed eol, add calculated eol/eol explicit tests 2023-11-29 14:57:31 -06:00
Godfrey M 4a19f23e7c fixes for black dark theme 2023-11-29 11:30:02 -08:00
spencerrlongg 9d8433bd6d a couple quick things 2023-11-29 13:15:41 -06:00
Joël Pittet 5b4d6b346b Update for CVE-2023-49316 by upgrading phpseclib/phpseclib (3.0.14 => 3.0.34) 2023-11-29 11:03:12 -08:00
spencerrlongg 65ca24f6ae asset assigned to asset works now 2023-11-29 11:37:52 -06:00
snipe f004007c47 Merge remote-tracking branch 'origin/develop' 2023-11-29 10:09:27 +00:00
snipe 96210e9498
Merge pull request #13970 from snipe/bug/sc-24149 
Created mutator for requestable attribute
 2023-11-29 10:08:41 +00:00