DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12356 commits 101 branches 268 tags 320 MiB
Commit graph

12356 commits

This branch
This branch
All branches
Author SHA1 Message Date
spencerrlongg e028145ad9 Add new asset tests for archive, depreciate, and physical fields 2023-12-13 09:16:08 -06:00
snipe 547d58cf14 Merge remote-tracking branch 'origin/develop' 2023-12-13 14:15:36 +00:00
snipe b92906b071
Merge pull request #14028 from snipe/security/snyk_14013 
[Snyk] Upgrade alpinejs from 3.12.3 to 3.13.3 #14013
 2023-12-13 14:15:07 +00:00
snipe b1d4d89b19 [Snyk] Upgrade alpinejs from 3.12.3 to 3.13.3 #14013 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 14:14:04 +00:00
snipe 4f56c2e9d6 Added radio to seeder for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 14:03:13 +00:00
snipe 70250191ed
Merge pull request #14026 from snipe/bug/sc-23599 
Fixed checkbox/radio button display on models edit for default fields
 2023-12-13 14:00:27 +00:00
snipe 337d863330 Missed closing label on radio buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 13:52:31 +00:00
snipe 7b85a30b64 Fixed checkbox seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 13:16:45 +00:00
snipe ac96bad4a1
Merge pull request #14014 from Godmartinz/requested_assets_table_missing_header 
added a missing table header on requested table for checkout
 2023-12-13 12:57:20 +00:00
snipe 3834221589 Fixed radio button display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:30:08 +00:00
snipe 016ca1adc1 Fixed HTML for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:27:50 +00:00
snipe 7743b3a0fa Merge remote-tracking branch 'origin/develop' 2023-12-12 14:02:18 +00:00
snipe 8d4a4ccdab
Merge pull request #14022 from snipe/chore/sc-24329 
Added GH test action status badge
 2023-12-12 14:01:56 +00:00
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
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