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
7337 commits 101 branches 268 tags 288 MiB
Commit graph

7337 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 3ef775533a Adds actionlog for bulk edits 2022-02-01 12:10:46 -06:00
snipe b9d6708181
Merge pull request #10588 from TenOfTens/develop 
Typo found in snipeit/routes/api.php @ line 391
 2022-02-01 07:21:08 -08:00
TenOfTens 70eeafd2a3
Update api.php 
Typo at line 391 GroupsCOntroller to GroupsController. Was causing an error with the groups view not reflecting the actual groups seen from the database.
 2022-02-01 08:51:34 -06:00
snipe f45c963428
Merge pull request #10586 from inietov/fixes/bulkedit_does_not_show_in_history 
Fixes Bulk edit doesn't show in Asset's history nor Activity report [sc-16550]
 2022-01-31 23:07:02 -08:00
Ivan Nieto Vivanco 2fec40d7df Adds actionlog for bulk edits 2022-02-01 00:00:12 -06:00
Brady Wetherington 72e9360228 Merge remote-tracking branch 'upstream/develop' into develop 2022-01-31 10:13:30 -08:00
snipe 215beb9d8a
Merge pull request #10580 from misilot/fix-10176-webui-master 
Replace .my.cnf with column-statistics.cnf at the system level for mysqldump (master)
 2022-01-29 07:16:24 -08:00
Tom Misilo b0c61ee044 Replace .my.cnf with column-statistics.cnf at the system level for mysqldump 
Fixes #10176

The `column-statistics.cnf` file is copied to `/etc/mysql/conf.d/column-statistics.cnf` for each Dockerfile that exists.

This puts it as a system level mysql client change, so the web ui interface also works.
 2022-01-29 07:28:12 -06:00
Tom Misilo fb585955b4 Replace .my.cnf with column-statistics.cnf at the system level for mysqldump 
Fixes #10176

The `column-statistics.cnf` file is copied to `/etc/mysql/conf.d/column-statistics.cnf` for each Dockerfile that exists.

This puts it as a system level mysql client change, so the web ui interface also works.
 2022-01-29 07:24:50 -06:00
snipe 16fb2213b5 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-28 12:40:03 -08:00
snipe a0d0645453 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-28 12:38:42 -08:00
snipe 1ef336a08b
Merge pull request #10576 from snipe/features/add_custom_fields_search 
Added #9576 - Lookup Asset by Custom Field via API [sc-18632]
 2022-01-28 09:51:28 -08:00
snipe aa3aa78204 Adds Lookup Asset by Custom Field via API [sc-18632] 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-28 09:08:48 -08:00
snipe db0a078c0b
Merge pull request #10573 from uberbrady/fix_force_root_url 
Add some guardrails around very-badly formatted APP_URL settings
 2022-01-27 11:29:29 -08:00
Brady Wetherington 44719e3dcc Fix whitespace issues 2022-01-27 11:29:20 -08:00
Brady Wetherington 1cf1278b3b Fix whitespace issues 2022-01-27 11:28:51 -08:00
Brady Wetherington 476075235a Add some guardrails around very-badly formatted APP_URL settings 2022-01-27 11:24:21 -08:00
Brady Wetherington 70648dedd3 Add some guardrails around very-badly formatted APP_URL settings 2022-01-27 11:21:46 -08:00
snipe a65fb63b6b
Merge pull request #10511 from inietov/features/audit_date_in_importer 
Adds audit dates in the asset importer
 2022-01-27 10:58:53 -08:00
snipe 9634dde0dd
Merge pull request #10567 from inietov/fixes/importing_and_checking_out_licenses_master 
Fixes Importing licenses without product key duplicates the license
 2022-01-27 10:58:06 -08:00
snipe 0eab249819
Merge pull request #10569 from inietov/fixes/donked_layout_required_field_error_depreciation_develop 
Fixes donked layout required field error depreciation in develop[sc-17111]
 2022-01-27 10:57:33 -08:00
snipe 077caa29f8
Merge pull request #10570 from inietov/fixes/donked_layout_required_field_error_depreciation 
Fixes donked layout required field error depreciation [sc-17111]
 2022-01-26 21:23:51 -08:00
Ivan Nieto Vivanco a87478d3ac Set the actual field we are evaluating as required (months) 2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco 34819ec5cf Fixes the appearance of some error messages 2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco 44349db597 Fixes the appearance of some error messages 2022-01-26 22:58:02 -06:00
snipe c70ae19c28
Merge pull request #10529 from uberbrady/fix_insecure_host_headers 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (v5)
 2022-01-26 16:59:55 -08:00
snipe b153138d1e
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop 
Add Zip field in the User Importer for develop [sc-18556]
 2022-01-26 16:58:37 -08:00
snipe d0b90bdff9
Merge pull request #10568 from inietov/fixes/importing_and_checking_out_licenses 
Fixes Importing licenses without product key duplicates the license for develop branch
 2022-01-26 16:30:00 -08:00
Ivan Nieto Vivanco 55fdc86e02 Tweak query in the License Importer to not require a Product Key 2022-01-26 17:51:04 -06:00
Ivan Nieto Vivanco 450cb8f92f Tweak query in the License Importer to not require a Product Key 2022-01-26 17:49:34 -06:00
snipe 8ebade7892
Merge pull request #10566 from inietov/fixes/cant_add_customfield_to_fieldset 
Fix #10564: Edit the route to associate custom fields with fieldsets
 2022-01-26 13:02:26 -08:00
Ivan Nieto Vivanco fcd203f4dc Fix the route to associate custom fields with fieldsets 2022-01-26 14:43:20 -06:00
Brady Wetherington 48f1380f6e
Merge pull request #10528 from uberbrady/fix_insecure_host_headers_v6 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden
 2022-01-24 18:26:30 -08:00
snipe eade041b6e Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2022-01-21 12:33:53 -08:00
snipe ee47a02792 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-21 12:33:49 -08:00
snipe 8813f55770
Merge pull request #10545 from inietov/fixes/unable_to_add_asset_model 
Fixes #10536 Unable to add asset model (v6.0.0-RC-1)
 2022-01-21 10:13:10 -08:00
Ivan Nieto Vivanco 7383ec7f1e Add an early return if the model id is not set (for new Asset Models) 2022-01-21 11:45:45 -06:00
snipe 0721ab8bbf Regenerated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-20 11:01:04 -08:00
snipe 00c8a1ee21
Merge pull request #10533 from inietov/feature/add_remaining_address_field_to_user_import 
Add Zip field in the User Importer [sc-18556]
 2022-01-19 12:07:18 -08:00
Ivan Nieto Vivanco c86ed892ab Add Zip field in the User Importer 2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco 1fc71a4111 Add Zip field in the User Importer 2022-01-19 13:35:54 -06:00
Brady Wetherington 0c4768fd2a Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 
(For v5)
 2022-01-18 15:52:59 -08:00
Brady Wetherington 455bc736be Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 2022-01-18 15:31:30 -08:00
snipe a26119c262 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2022-01-18 14:50:35 -08:00
snipe e7541f29d2 Use php artisan serve url 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-18 14:50:24 -08:00
snipe f9647614ab
Merge pull request #10527 from inietov/fixes/pdo_exception_syntax_error_when_sendexpirationalers_is_called 
Fixes PDO exeception syntax error when Expiring Alerts Threshold is not set
 2022-01-18 12:43:08 -08:00
Ivan Nieto Vivanco a05795420a Respect the default value of 60 days in expiring licenses 2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco 42d86bf57b Adds default values if the expiring alerts threshold is null 2022-01-18 14:21:49 -06:00
snipe 201b52baf8
Merge pull request #10523 from inietov/fixes/depreciation_report_shows_assets_that_not_deprecate_master 
Fixes bug where the depreciation report shows assets that not deprecate for master
 2022-01-18 10:37:21 -08:00
snipe c8c559784d
Merge pull request #10522 from inietov/fixes/depreciation_report_shows_assets_that_not_deprecate 
Fixes bug where the depreciation report shows assets that not depreciate
 2022-01-15 12:23:58 -08:00