DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
11808 commits 96 branches 267 tags 295 MiB
Commit graph

11808 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 3f8b63e053 Add linked text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:02 +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 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
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 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 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
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
Godfrey M 13d3f85c62 fixes ldap location sync 2023-11-01 12:26:58 -07:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05: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 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 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 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
snipe 9a7e7bddcc
Merge pull request #13818 from snipe/bug/sc-23902 
Fixed validation handling on backup uploads
 2023-10-31 15:33:26 +00:00
snipe aa2a25dc19 Display the form errors correctly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:49 +00:00
snipe 57372fc82a Correctly call the validator in the response if it fails 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:38 +00:00
snipe ae90f9defa
Merge pull request #13817 from snipe/feature/sc-23901 
Added checkboxes to intentionally remove field values in bulk user edit
 2023-10-31 12:54:07 +00:00
snipe 3495652827 Added checkboxes to intentionally remove field values in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:52:53 +00:00
snipe 5779a63221 Undoing that thing I just did :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:28:57 +00:00
snipe 209627e2cc Force format if dates are given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:25:00 +00:00
snipe 9fc1cbd7ae Change cast to include format 
https://laravel.com/docs/8.x/eloquent-mutators#date-casting - this doesn’t seem to work tho?
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:24:48 +00:00
snipe e405e27643
Merge pull request #13815 from snipe/feature/sc-23898 
Add additional fields to Download All in Activity Report
 2023-10-31 09:45:12 +00:00
snipe 96211cf73c Add additional fields to Download All in Activity Report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 09:43:47 +00:00
Nathan Butler 79f380cbe7 Added asset history tab to locations view 2023-10-31 10:28:54 +11:00
snipe 518c43680d
Merge pull request #13812 from snipe/bug/sc-23897 
Handle redirect from after POST request from backup restore
 2023-10-30 20:21:29 +00:00
snipe e554a80589 Handle redirect from after POST request from backup restore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 20:01:01 +00:00
snipe f47a8664f9
Merge pull request #13811 from Godmartinz/missing_translation_string 
add missing translation string
 2023-10-30 19:40:51 +00:00
Godfrey M 97953ae082 add missing translation string 2023-10-30 12:17:55 -07:00
snipe 8e20071254
Merge pull request #13731 from snipe/improvements/trim_on_import 
Added trim to import values
 2023-10-30 14:17:37 +00:00
snipe 316c90c144
Update app/Importer/ItemImporter.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2023-10-30 14:17:27 +00:00
snipe 462d2d329a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-10-30 14:12:38 +00:00
snipe a6b713ae21 Add @mmanjos as a contributor 2023-10-30 14:12:23 +00:00
snipe 0d67ae27c2
Merge pull request #13810 from mmanjos/develop 
Fixed #11179: APP_FORCE_TLS is missing from the example .env.docker
 2023-10-30 14:11:54 +00:00