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

13323 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe ad6822875d
Merge pull request #13892 from Godmartinz/ldap_sync_bug 
added a `empty()` around location_id to fix  ldap sync bug
 2023-11-19 06:58:38 +00:00
Godfrey Martinez 5569c2ba4a
Merge branch 'develop' into ldap_sync_bug 2023-11-16 10:02:56 -08:00
Godfrey M 2f12a9cfe2 add a conditional around location_id to fix bug 2023-11-16 09:52:44 -08:00
snipe 617f58e046 Merge remote-tracking branch 'origin/develop' 2023-11-16 15:28:13 +00:00
snipe 81583207a9
Merge pull request #13887 from spencerrlongg/bug/sc-24024 
Fix for Unique Serial
 2023-11-16 15:27:55 +00:00
spencerrlongg b1f75a3bb3 remove unused import 2023-11-15 13:20:17 -06:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
spencerrlongg 0924a53789 quick fix 2023-11-15 12:28:30 -06:00
Godfrey M c9d46856a3 added name back 2023-11-14 15:00:11 -08:00
Godfrey M 6d65f6646f allows validation to ignore self and update 2023-11-14 14:55:51 -08:00
snipe 0da3ef70d9 Merge remote-tracking branch 'origin/develop' 2023-11-14 16:16:30 +00:00
snipe eb87720661
Merge pull request #13878 from snipe/fixes/clearer_error_text_on_import 
Clarified upload error text
 2023-11-14 16:16:16 +00:00
snipe 9316ecb8d6 CLarified upload error text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 16:14:39 +00:00
snipe ec83b733f1 Merge remote-tracking branch 'origin/develop' 2023-11-14 14:40:21 +00:00
snipe a81e2be6da
Merge pull request #13876 from snipe/fixes/added_fieldmap_back_for_cli_import 
Added default map back to the importer
 2023-11-14 14:40:08 +00:00
snipe 73ebd9017f Added default map back to the importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 14:37:48 +00:00
snipe a48eb60f87 Merge remote-tracking branch 'origin/develop' 2023-11-13 20:40:05 +00:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean 
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
 2023-11-13 20:22:52 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
snipe 000a28d648
Merge pull request #13830 from spencerrlongg/bug/sc-23921 
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
 2023-11-13 20:19:44 +00:00
snipe f3d6de316b Merge branch 'master' of https://github.com/snipe/snipe-it 2023-11-13 16:41:18 +00:00
snipe 1f17c6e4f4 Merge remote-tracking branch 'origin/develop' 2023-11-13 16:41:07 +00:00
snipe 495df737fc Unfixed indenting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-13 16:39:35 +00:00
snipe 0bae1a1f5e
Merge pull request #13853 from snipe/features/link_back_to_asset_on_create 
Link back to asset on create
 2023-11-13 16:37:35 +00:00
snipe 5dde7cb439
Merge pull request #13871 from snipe/snyk-fix-bdea9ba7648f6c20aef5ce312ee450cd 
[Snyk] Security upgrade alpine from 3.17.3 to 3.17.5
 2023-11-13 16:34:08 +00:00
snyk-bot 6acff575e6
fix: Dockerfile.alpine to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5438697
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5788365
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5821141
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-6032385
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-6032385
 2023-11-13 04:03:04 +00:00
snipe 9bff2d0bbf Fixed indenting? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-09 21:47:29 +00:00
snipe 9e1cfac995
Merge pull request #13857 from akemidx/bug/sc-20532 
Bug Fix:  Undefined array key 266
 2023-11-09 09:39:04 +00:00
Ivan Nieto Vivanco 7d30001ff8 Ignore the importer checkout if user is not found 2023-11-08 15:32:33 -06:00
Marcus Moore 49136a4d67 Add tests for color helper 2023-11-08 12:35:42 -08:00
akemidx 4382adce85 typo in error log message 2023-11-08 15:29:29 -05:00
akemidx 2051ac785d adding in error logging and code comments 2023-11-08 13:44:46 -05:00
akemidx 9cc89911f7 possibilitieeeeeeeeessss 2023-11-08 13:29:32 -05:00
akemidx 495521b70e adjusting for less than 0 possibility 2023-11-08 12:51:51 -05:00
snipe 6da0671143 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:44:09 +00:00
snipe a24d21e683 Added new unescaped alert box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:41:05 +00:00
snipe d2bf71327b Redirect /asset_tag/view to /asset_tag 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:56 +00:00
snipe ef10f2e50e Use more correct route in redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:38 +00:00
snipe 08153d418f Use new alert box and linked string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:18 +00:00
snipe 3f8b63e053 Add linked text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:02 +00:00
snipe 8a61803963 Merge remote-tracking branch 'origin/develop' 2023-11-08 11:39:46 +00:00
snipe d2bfa9a3b6
Merge pull request #13852 from snipe/bug/sc-23959 
Fixed URL to favicon on default blade (used in 404 messages)
 2023-11-08 11:39:24 +00:00
snipe 26311e46b8 Fixed URL to favicon on default blade (used in 404 messages) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 11:38:48 +00:00
snipe b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication 
clarifies an address column under locations
 2023-11-08 08:59:07 +00:00
snipe 749b87cbbd Merge remote-tracking branch 'origin/develop' 2023-11-08 08:58:12 +00:00
snipe bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922 
New Translation Strings for Custom Asset Export
 2023-11-08 08:57:20 +00:00
snipe cf42eca198
Merge pull request #13814 from ntbutler-nbcs/feature-location-history 
Added #13754 - asset history tab to locations view
 2023-11-08 08:55:07 +00:00
snipe 44d064f094
Merge pull request #13842 from marcusmoore/bug/sc-23932 
Fixed notes not saving to action log when licenses are checked in/out
 2023-11-08 08:53:00 +00:00
snipe 3fb913669b
Merge pull request #13847 from spencerrlongg/bug/sc-23914 
Removed Refresh Button on Client Tables
 2023-11-08 08:52:40 +00:00