DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10034 commits 101 branches 268 tags 288 MiB
Commit graph

10034 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d2daaf30eb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-03-28 03:32:04 -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
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 dcbd216e2c Merge remote-tracking branch 'origin/develop' 2023-03-24 08:29:22 -07: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 8a395d63a1 Merge remote-tracking branch 'origin/develop' 2023-03-24 07:23:06 -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 43c286c61f Merge remote-tracking branch 'origin/develop' 2023-03-24 06:18:10 -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
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 b91e914a61 Merge remote-tracking branch 'origin/develop' 2023-03-23 10:55:58 -07: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
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 58ea1592bb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/livewire/slack-settings-form.blade.php
 2023-03-22 00:26:15 -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 5346ebba94 Make select2 list in slack settings not searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:21:21 -07:00
snipe 6c2c36469a Merge remote-tracking branch 'origin/develop' 2023-03-21 22:18:53 -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
snipe 4efac7827b Trying other save method, I guess? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:10:30 -07:00
snipe b45dc09f57
Merge pull request #12707 from snipe/fixes/fixed_migration_for_demo 
Fixes back-in-time Slack v slack migration
 2023-03-21 22:01:17 -07:00
snipe 76425ca2a5 Fixes back-in-time Slack v slack migration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:59:17 -07:00
snipe e609130291
Merge pull request #12706 from snipe/fixes/static_helper 
Forgot the static method declaration - derp
 2023-03-21 21:21:56 -07:00
snipe 41eb2464e2 Forgot the static method declaration - derp 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:21:01 -07:00
snipe 8aec28fad6 Merge remote-tracking branch 'origin/develop' 2023-03-21 21:14:06 -07:00
snipe e55fc4d047
Merge pull request #12705 from snipe/fixes/webhook_ui 
Slack webhook UI tweaks, added select2
 2023-03-21 21:11:14 -07:00
snipe e40762cf7f Small anal-retentive spacing/indenting tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:00:43 -07:00
snipe 2d3ddd1c7a Fixed default value for webhook_selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:56:08 -07:00
snipe 637438ccf6 Added select2 to slack settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:00:11 -07:00