DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10433 commits 97 branches 266 tags 292 MiB
Commit graph

10433 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joe Ferguson d667ae53ed
Add missing strings to Step 2 preflight 2023-03-28 10:30:35 -05:00
snipe 099173fb94
Merge pull request #12744 from snipe/fixes/12742_wrong_url_on_requestable_models 
Use named route with params
 2023-03-28 07:19:49 -07:00
snipe 09674c012c Use named route with params 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 07:18:45 -07:00
snipe 52fd334745
Merge pull request #12743 from snipe/fixes/quieter_logging 
Changed log level to debug vs info/error
 2023-03-28 06:56:06 -07:00
snipe feef06e7bf Changed log level to debug vs info/error 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 06:54:41 -07:00
snipe 6800098469 Bumped version for 6.1.0-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 03:31:02 -07:00
Marcus Moore 2cbc6276f7
Implement test for license checkout notification 2023-03-27 14:09:31 -07:00
Marcus Moore 362d5b9fd4
Merge branch 'develop' into bug/sc-15034 2023-03-27 11:46:30 -07:00
snipe 468805bab5
Merge pull request #12732 from svpernova09/preflight-translation-string-fixes 
User preflight fix translation strings w/ bad path
 2023-03-27 10:43:13 -07:00
Joe Ferguson cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe 008ba83128
Merge pull request #12729 from snipe/fixes/file_importer_string 
Fixed translation string for importer
 2023-03-24 08:28:51 -07:00
snipe 697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -07:00
snipe 4d1e28ad03
Merge pull request #12727 from snipe/fixes/add_json_to_mimes 
Fixed #12641 - added JSON to mimes
 2023-03-24 07:22:30 -07:00
snipe 47eccb665e
Merge pull request #12728 from snipe/fixes/fixes_typo_in_category_list 
Use single “accessory” translation
 2023-03-24 07:19:59 -07:00
snipe 150a2b572e Use single “accessory” translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 07:14:02 -07:00
snipe 6bc0df73e8
Merge pull request #12661 from Godmartinz/gh12655_missing_translations 
Adds translations for category types to index and edit of categories
 2023-03-24 07:09:40 -07:00
snipe 16dcc2d3ed Fixed #12641 - add JSON to mimes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 06:57:43 -07:00
snipe aa4bdd4eb3
Merge pull request #12726 from snipe/fixes/12724_custom_fields 
Fixed #12724 - fieldset not saving on model
 2023-03-24 06:17:42 -07:00
snipe e869b1fd53 Fixed #12724 - fieldset not saving on model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 06:11:24 -07:00
snipe 13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null 
Fixed Trying to access array offset on value of type null [sc-20528]
 2023-03-24 04:52:56 -07:00
snipe 642d1e9f36
Merge pull request #12720 from inietov/fixes/undefined_array_key_266 
Fixed Undefined array key 266 rollbar 17086
 2023-03-24 04:50:47 -07:00
snipe 3792d3fdd2
Merge pull request #12721 from marcusmoore/fixes/allow-migrating-sqlite 
Fixes the migration of sqlite databases
 2023-03-24 04:50:15 -07:00
Marcus Moore 317335e79f
Allow the migration of sqlite databases 2023-03-23 17:40:03 -07:00
Marcus Moore fa69a580ab
Start to scaffold license checkout notification test 2023-03-23 17:18:33 -07:00
Marcus Moore fc043a35d9
Fix checkouts for licenses 2023-03-23 17:03:48 -07:00
Marcus Moore 25e859c866
Simplify test case 2023-03-23 16:42:21 -07:00
Marcus Moore 2dcf4e3d16
Standardize on sending anonymous notifications for asset checkouts 2023-03-23 16:31:40 -07:00
Marcus Moore 1f664709ba
Merge branch 'develop' into bug/sc-15034 
# Conflicts:
#	app/Notifications/CheckoutAssetNotification.php
 2023-03-23 13:04:40 -07:00
Ivan Nieto Vivanco fbb3684022 Add a condition to 'restart' the color index for the status pie chart 2023-03-23 12:43:02 -06:00
snipe fc3672c119
Merge pull request #12717 from marcusmoore/fixes/update-slack-property-names 
Fixes calls to changed webhook properties names
 2023-03-23 10:55:02 -07:00
Marcus Moore 9d2c4a4dee
Update webhook message 2023-03-23 10:38:35 -07:00
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco aa8dfcf89f Added a ternary to avoid null offset in array 2023-03-22 13:48:23 -06:00
Marcus Moore b396f2bed3
Update test case names 2023-03-22 12:41:30 -07:00
Marcus Moore 28ced46b9d
Clean up test code 2023-03-22 12:38:14 -07:00
Marcus Moore 66224765ea
Use factory state for webhook settings 2023-03-22 12:31:47 -07:00
Marcus Moore 9c4a3ce56a
Update slack_endpoint to webhook_endpoint in test and notification 2023-03-22 12:27:36 -07:00
Marcus Moore f6d0dd0f93
Merge branch 'develop' into bug/sc-15034 2023-03-22 11:58:47 -07:00
Marcus Moore e303aeadd1
Fix test name 2023-03-22 11:56:54 -07:00
snipe e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178 
#20178: Added Dell and Lenovo to warranty link function
 2023-03-22 00:54:40 -07:00
snipe f3785acf4d
Merge pull request #12710 from snipe/localization/fixing_a_few_more_hardcoded_strings 
Handled a few more hard-coded strings
 2023-03-22 00:22:06 -07:00
snipe 545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
snipe e28d4fa588
Merge pull request #12709 from snipe/fixes/null_location_in_bulk_users 
Ability to remove user location from users
 2023-03-21 23:04:31 -07:00
snipe e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -07:00
snipe 418ce75a9f
Merge pull request #11431 from ntbutler-nbcs/develop 
[Fix / Minor Change] Asset checkinbytag now consistent with existingAPI
 2023-03-21 22:40:21 -07:00
Brady Wetherington 6fe520a55d Hooked various the contents of the components together 2023-03-21 22:26:32 -07:00
snipe 0418d390f0 Corrected width to 100% 
I should not be allowed to touch computers

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:25:15 -07:00
snipe b3d5bb75a3 Apply master patch to develop because I am an idiot on the wrong branch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:23:09 -07:00
snipe 1fa9f80c03 Correctly disable the select2 in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:18:42 -07:00