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

8552 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b3d65b5703 Merge remote-tracking branch 'origin/develop' 2022-07-15 18:53:20 -07:00
snipe 0f38714e21
Merge pull request #11517 from snipe/fixes/small_changes_to_gh_actions_configs 
Changed some autolabeler and code owners
 2022-07-15 18:53:01 -07:00
snipe 7a099bc268 Changed some autolabeler and code owners 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 18:51:57 -07:00
snipe 6f1f6c75e6 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-07-15 17:11:55 -07:00
snipe 40d5c37aea
Merge pull request #11516 from snipe/fixes/11508_alert_font_size 
Fixed #11508 - font size in alert menu
 2022-07-15 17:10:26 -07:00
snipe 58499c2322 Fixed #11508 - font size in alert menu 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 17:09:17 -07:00
snipe 6428dc5cd2 Removed duplicate supplier_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-13 13:08:15 -07:00
snipe 5f5ff04636
Merge pull request #11502 from mikeroq/fixes/eula_download_if_app_locale_is_not_en 
Fixes #11496 - Wrong URL generated for download of asset acceptance PDF if locale was not en
 2022-07-12 16:18:59 -07:00
mikeroq f21824a8e2 Changed comparing the action type from translated in presenter to actual value 2022-07-12 17:59:03 -05:00
snipe 0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include 
adds a checkbox to exclude archived assets from custom reports
 2022-07-12 12:59:18 -07:00
Godfrey M 27039325f3 removed comments, because I forgot 2022-07-12 12:41:07 -07:00
Godfrey M 58c54cc3dc uses notArchived scope instead now 2022-07-12 12:20:11 -07:00
Godfrey M 48349071ed accounts for status_id as well 2022-07-12 09:46:44 -07:00
snipe bb5ac900ec
Merge pull request #11492 from mikeroq/fixes/email_all_assigned_to_user_with_no_email 
Fixes "email list of all assigned" apparently being successful even if the user has no email address
 2022-07-11 18:27:01 -07:00
mikeroq 5efe45226d Fixes Email List of All Assigned being "successful" when the user has no email 
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
 2022-07-11 20:02:10 -05:00
snipe a0183ff56f Merge remote-tracking branch 'origin/develop' 2022-07-11 17:11:44 -07:00
snipe bb091760af Fixedd unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 17:11:28 -07:00
snipe 78d13871eb
Merge pull request #11458 from snipe/dependabot/github_actions/codacy/codacy-analysis-cli-action-4.1.0 
Bump codacy/codacy-analysis-cli-action from 1.1.0 to 4.1.0
 2022-07-11 16:34:51 -07:00
snipe fc5cf3e291
Merge pull request #11483 from snipe/fixes/migrations_on_restore 
Fixes - migrations on restore
 2022-07-11 16:34:06 -07:00
snipe 3182f251e1 Merge remote-tracking branch 'origin/develop' 2022-07-11 16:26:14 -07:00
snipe d6ba8655bb
Merge pull request #11490 from snipe/fixes/print_assigned_sig_broken 
Fixed - print assigned sig broken
 2022-07-11 14:48:25 -07:00
snipe 8114d01799 Only show sig file if there is a value for accepted sig 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 14:46:45 -07:00
Godfrey M 75844c5942 adds a checkbox to exclude archived assets from custom reports 2022-07-11 09:56:58 -07:00
snipe 78d5c37267
Merge pull request #11484 from mikeroq/fixes/delete_file_modal_on_licenses 
Fixes license file(s) delete modal showing entire model data instead of just the name
 2022-07-10 13:23:03 -07:00
mikeroq 397e89cbed Fixes modal showing entire model data instead of just the name 2022-07-09 14:09:40 -05:00
snipe 2518e2f0ee Removed > 300 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 17:09:56 -07:00
snipe e833052e8e Check for column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 16:46:00 -07:00
snipe 43e370f35a Move migrations further up 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 16:40:51 -07:00
snipe 8d3c9e67a0 Merge remote-tracking branch 'origin/develop' 2022-07-07 16:19:29 -07:00
snipe 3988c0e3f0
Merge pull request #11480 from snipe/fixes/changed_model_file_icon 
Changed model file icon
 2022-07-07 16:19:09 -07:00
snipe 723454b04d Changed model file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 16:17:35 -07:00
snipe 30c03435e4 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-07-07 16:01:17 -07:00
snipe 5043533fde
Merge pull request #11479 from snipe/fixes/padlock_icon 
Fixes padlock icon
 2022-07-07 16:00:02 -07:00
snipe d458973649 Removed unneeded JS 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:58:37 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -07:00
snipe 3a6c6d8466 Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:40:39 -07:00
snipe d62167e364 Merge remote-tracking branch 'origin/develop' 2022-07-07 14:39:02 -07:00
snipe 9297d8af1d
Merge pull request #11478 from snipe/fixes/upgrade_font_awesome 
Upgrade font-awesome to v6
 2022-07-07 14:38:34 -07:00
snipe bae9792f01 Missed two 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:36:09 -07:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:22:08 -07:00
snipe 75e5cde39b Merge remote-tracking branch 'origin/develop' 2022-07-06 18:20:30 -07:00
snipe f853188bc7
Merge pull request #11471 from uberbrady/add_license_seat_indexes 
This adds some indexes for performance on license_seats
 2022-07-06 18:19:40 -07:00
Brady Wetherington 61813a6f2c This adds some indexes for performance on license_seats 2022-07-06 18:10:48 -07:00
snipe 7a0c9776b4 Merge remote-tracking branch 'origin/develop' 2022-07-05 17:58:59 -07:00
snipe ee4f355e49 Changed logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 17:58:45 -07:00
snipe bfc8c18675
Merge pull request #11451 from mikeroq/fixes/populate_custom_fields_from_asset_model_create 
Fixes custom fields not populating when creating asset from asset model page
 2022-07-05 17:31:08 -07:00
snipe f1488767f8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-07-05 16:41:00 -07:00
snipe 2d5755c1dd Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:40:17 -07:00
snipe acc2e12f12 Merge remote-tracking branch 'origin/develop' 2022-07-05 16:35:34 -07:00
snipe eb2793bfa7 Added @reederda 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:35:12 -07:00