DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12031 commits 101 branches 268 tags 288 MiB
Commit graph

12031 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 1171141904
Merge pull request #13848 from marcusmoore/bug/sc-23949 
Fixed missing import
 2023-11-08 08:50:31 +00:00
Marcus Moore eceb69122c Add missing import 2023-11-07 16:03:28 -08:00
akemidx 154e71de74 shifting wrap around logic back into 0-265 2023-11-07 17:43:51 -05:00
spencerrlongg 93101d36b8 removed refresh button on client tables 2023-11-07 15:07:24 -06:00
Marcus Moore 4fb349e326 Remove extra assertions 2023-11-06 14:04:52 -08:00
Marcus Moore 4d2790c3f4 Add tests for license checkout notes 2023-11-06 13:54:36 -08:00
Marcus Moore a08e0bd547 Ensure notes are saved to the action log when licenses are checked in and out 2023-11-06 12:20:13 -08:00
snipe 9143b7a1b7 Merge remote-tracking branch 'origin/develop' 2023-11-03 20:10:38 +00:00
snipe 92c7de3fb5
Merge pull request #13837 from snipe/features/add_employee_number_to_user_merge 
Added employee number to user merge screen
 2023-11-03 20:10:05 +00:00
snipe d0cc42a068 Added employee number to user merge screeb 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 20:09:11 +00:00
snipe 39c06802aa Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-11-03 14:07:46 +00:00
snipe 8c316e0bd3 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 14:07:15 +00:00
snipe 7a638e4a65 RB-17457 - Object of class Illuminate\Database\Eloquent\Collection could not be converted to int 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 14:06:27 +00:00
Godfrey M 3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07:00
snipe b47e734b37 Merge remote-tracking branch 'origin/develop' 2023-11-02 14:50:55 +00:00
snipe 4d65d09306 Removed trim on manager ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-02 14:50:40 +00:00
snipe c5e1cdbcee
Merge pull request #13828 from Godmartinz/ldap_location_sync 
fixed ldap location sync
 2023-11-02 12:20:01 +00:00
spencerrlongg 75532d9662 adds permission test 2023-11-01 16:49:59 -05:00
Godfrey M 13d3f85c62 fixes ldap location sync 2023-11-01 12:26:58 -07:00
spencerrlongg 938ec75aa7 clarifying note 2023-11-01 14:09:03 -05:00
spencerrlongg c9604b896a nevermind 2023-11-01 13:46:32 -05:00
spencerrlongg d167ec6dc0 unique undeleted recreated with laravel rule 2023-11-01 13:36:35 -05:00
spencerrlongg e05af5216e formatting 2023-11-01 12:14:46 -05:00
spencerrlongg 3f834cb88f authorization tested in request 2023-11-01 11:43:53 -05:00
spencerrlongg d971172cf3 rm unnecessary import 2023-11-01 11:34:15 -05:00
spencerrlongg 53bd5626c9 this works, need to write up pr 2023-11-01 11:33:29 -05:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
spencerrlongg b67b00dd82 this is a start, something up with asset_tag unique rule 2023-10-31 21:06:44 -05:00
spencerrlongg d4b9f6a2a4 add not_array (not ready, doesn't catch for specific exception) 2023-10-31 21:00:22 -05:00
snipe e43051a1f7 Merge remote-tracking branch 'origin/develop' 2023-10-31 17:11:38 +00:00
snipe 5073c3389f
Merge pull request #13821 from snipe/bug/rb-17462 
More graceful failure if ldap_results JSON decode isn’t set
 2023-10-31 17:11:14 +00:00
snipe f822f8b186 More graceful failure if ldap_results JSON decode isn’t set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 17:09:18 +00:00
snipe e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900 
Fixed datetime displayed on license edit for fields that should be date
 2023-10-31 16:59:12 +00:00
snipe db8a7c5ad9 Merge remote-tracking branch 'origin/develop' 2023-10-31 16:30:22 +00:00
snipe 95e9002cd0
Merge pull request #13820 from inietov/fixes/attempt_to_read_property_fields 
Fixed Attempt to read property fields on null [sc-23903]
 2023-10-31 16:30:07 +00:00
snipe 60088403b9 Merge remote-tracking branch 'origin/develop' 2023-10-31 16:04:29 +00:00
snipe 22996895d8 Check for valid model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 16:04:19 +00:00
Ivan Nieto Vivanco 9f9f8c173b Add condition to only run trough custom fields if a custom fieldset exist 2023-10-31 10:00:36 -06:00
snipe 96be0c25c4 Merge remote-tracking branch 'origin/develop' 2023-10-31 16:00:27 +00:00
snipe e6810e8db9
Merge pull request #13819 from snipe/bug/check_for_valid_category_on_print 
Check that the category exists on user print page
 2023-10-31 15:59:54 +00:00
snipe 28641493ca Check that the category exists 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:58:59 +00:00