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
12041 commits 96 branches 267 tags 295 MiB
Commit graph

12041 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 62b557f82c Revert "Add database migration step" 
This reverts commit 65e3696029.
 2023-11-09 15:29:19 -08:00
Marcus Moore 158c82ff5f Revert "Be explicit about database host" 
This reverts commit fd410c0281.
 2023-11-09 15:26:50 -08:00
Marcus Moore fd410c0281 Be explicit about database host 2023-11-09 15:20:41 -08:00
Marcus Moore 65e3696029 Add database migration step 2023-11-09 14:56:32 -08:00
Marcus Moore 690a5119f4 Install Passport during test setup process 2023-11-09 14:49:56 -08:00
Marcus Moore cc0653c68a Update GitHub test action to run on PHP 8.1 and 8.2 2023-11-09 14:42:47 -08:00
Marcus Moore 042a15d294 Set minimum PHP version to 8.1 2023-11-09 14:41:13 -08: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
spencerrlongg 8e4c0f60a1 return format 2023-11-08 17:36:54 -06:00
spencerrlongg 5615fc09e6 add view modal 2023-11-08 16:55:29 -06:00
spencerrlongg d68f1e4cfa initial display work done 2023-11-08 16:48:20 -06:00
spencerrlongg 0c4901487d delete component class (for now) 2023-11-08 16:12:01 -06:00
spencerrlongg 7f4b2d6e42 modal and initial stuff working 2023-11-08 16:10:09 -06: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
spencerrlongg 715a49d9fe update php in composer.json 2023-11-08 14:29:06 -06: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 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
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 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
Godfrey M 3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07: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