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

14667 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M bb2c73348d only grabs custom Fields that are not encrpyted 2024-04-03 11:03:58 -07:00
Godfrey M 4327653d70 remove db cleaner for encrypted selections 2024-04-03 10:57:41 -07:00
Godfrey M 5f7f4c9b91 aligns dropdown menu for user in nav 2024-04-03 10:41:50 -07:00
snipe d44202e55b 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
 2024-04-03 13:09:48 +01:00
snipe df95447ea4 New dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-03 13:08:08 +01:00
snipe 01852c7188
Merge pull request #14520 from Godmartinz/loading_overlap_bug 
fixes z-index of table load
 2024-04-03 13:07:14 +01:00
snipe 79c5697042 Fixed dev - take 2! 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-03 13:06:49 +01:00
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
steve@degga.net bf10fd0cf0 Rename dynamicUrl() method 2024-03-31 22:37:41 -04:00
steve@degga.net 83ce04dc8d Fixes syntax error. 2024-03-31 22:31:06 -04:00
steve@degga.net f7bbec6be4 Makes all manufacturer URLs dynamic, not just warranty lookup. 2024-03-31 22:18:44 -04:00
MrM 658ba092e2
Hide encrypted values in hardware list 
Encrypted values are now hidden also in hardware list, clicking on them show the decrypted value
 2024-03-31 18:55:58 +02:00
MrM b221d99e7b
Encrypted values enhancement 
Show asterisks instead of the value, respecting the length of the field
 2024-03-31 12:27:35 +02:00
snipe b7af049589 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-03-29 13:20:22 +00:00
snipe c2d863da99 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 13:19:22 +00:00
snipe 6f9ba6ede4 Merge remote-tracking branch 'origin/develop' 2024-03-29 12:49:22 +00:00
snipe df4e6a0023 Fixed typo in Polish 
I will fix this in CrowdIn shortly

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 12:47:43 +00:00
snipe d60fa65f85 Merge remote-tracking branch 'origin/develop' 2024-03-28 21:59:36 +00:00
snipe 8081a82fe4 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-03-28 21:58:58 +00:00
snipe f42e5d5292 Reverting the store/update asset API responses for now 
This currently breaks the Jamf integration - need a better longer term plan.

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 21:58:49 +00:00
snipe 5a3f5b03d0
Merge pull request #14456 from akemidx/feature/sc-25079/legacy-locations 
Default Locale value changed to en-US
 2024-03-28 21:47:40 +00:00
akemidx 721902c2d4 committed for later 2024-03-28 16:44:44 -04:00
Godfrey M a450530c74 fixes z-index of table load 2024-03-28 11:44:55 -07:00
snipe 2b4886f37f
Commented out Heroic deploy for now 2024-03-28 17:43:18 +00:00
snipe b45de3e17f
Update README.md 
Added alert notations
 2024-03-28 17:41:46 +00:00
snipe b2eea3e5a5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2024-03-28 13:02:51 +00:00
snipe f411c0fdd8
Merge pull request #14518 from snipe/fixes/downgrade_alpine 
Downgrade alpine to 3.13.5
 2024-03-28 12:59:52 +00:00
snipe 74d8431d01 Downgrade alpine to 3.13.5 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:58:43 +00:00
snipe 3ea0cd75a5 Merge remote-tracking branch 'origin/develop' 2024-03-28 12:27:24 +00:00
snipe 5f6c746d25
Merge pull request #14517 from snipe/bug/sc-25186/label_index 
Check that the array key exists in the label engine
 2024-03-28 12:26:20 +00:00
snipe 1f2d30ebf4 Check that the array key exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:25:29 +00:00
akemidx e6b366020a lots of attempts and syntax, but no go 2024-03-27 19:05:59 -04:00
snipe 6dd6b45829 Merge remote-tracking branch 'origin/develop' 2024-03-27 20:43:34 +00:00
snipe e5800a2dac
Merge pull request #14516 from snipe/fixes/fixed_sorting_on_last_checkin_assets_api 
Fixes/fixed sorting on last checkin assets api
 2024-03-27 20:39:12 +00:00
snipe 0d3d172108 Make last_checkin searchable and fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:40 +00:00
snipe 86677b5f13 Make last_checkin sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:25 +00:00
snipe 3f5b94f8ad Merge remote-tracking branch 'origin/develop' 2024-03-27 19:52:23 +00:00
snipe cf8cb8521b
Merge pull request #14515 from squintfox/fixes-results-not-limited-by-api-params 
Fixes #14289: /reports/activity API endpoint returns too many results due to orwhere
 2024-03-27 19:51:58 +00:00
spencerrlongg cec84b857b fixed last audit date + test 2024-03-27 14:39:23 -05:00
Robert Spadaro ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04:00
spencerrlongg 1d4a7a7b02 added audit dates 2024-03-27 14:05:30 -05:00
snipe 57010b4c23
Merge pull request #14500 from Godmartinz/add-accessory-signature-to-print-all 
Added signature to user print report for Accessories and Consumables
 2024-03-27 19:02:59 +00:00
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00:00
snipe 1572e339f9
Merge pull request #14514 from snipe/localizations/new_translations_march_224 
Updated translations
 2024-03-27 19:01:23 +00:00
snipe 7782e5cc93 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 18:59:28 +00:00
Godfrey Martinez bcdda551b3
Merge pull request #12 from Godmartinz/remove_jquery 
removes jquery and updates translation
 2024-03-27 11:58:11 -07:00
Godfrey M bc66c0f223 removes jquery and updates translation 2024-03-27 11:56:47 -07:00
spencerrlongg 701411c1b9 get rid of a couple unnecessary changes 2024-03-27 13:53:57 -05:00
Spencer Long 013463aafc
Merge branch 'develop' into bug/sc-24884 2024-03-27 12:45:45 -05:00
Jeff Clay 1b8c7ff4ec
Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php and updated .env files to provide value for the new option. 2024-03-27 11:38:13 -05:00