Godfrey M
5a70bba51b
changed model for default currency requirement check
2022-02-07 09:51:35 -08:00
Godfrey M
9d0b163c11
adding untracked files
2022-02-07 08:58:49 -08:00
snipe
c0cc90066f
Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop
...
Fixes: Column activated cannot be null for develop [sc-18528]
2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco
fa2f8409f9
Add a casting to a truthy/falsy that needs to be integer
2022-02-02 14:09:23 -06:00
snipe
ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin
...
Added #10454 : Quick Scan Checkin
2022-02-01 20:19:45 -08:00
snipe
06a5ea1530
Fixed duplicate use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 18:57:45 -08:00
snipe
99c4fd8f84
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 18:56:18 -08:00
snipe
d2655c1092
Bumped RC version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 18:54:46 -08:00
snipe
5fded57ec6
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
2022-02-01 18:53:05 -08:00
snipe
2815e0d36e
Fixed audit email template (applies #10592 to master)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 17:27:32 -08:00
snipe
cda13f69ae
Merge pull request #10592 from uberbrady/fix_upcoming_audits_email
...
Fixed markdown upcoming audits email table
2022-02-01 17:25:46 -08:00
snipe
669826f6b2
Merge pull request #10574 from uberbrady/fix_force_root_url_v6
...
Add some guardrails around very-badly formatted APP_URL settings
2022-02-01 16:14:48 -08:00
snipe
a7d34dfb19
Merge pull request #10579 from misilot/fix-10176-webui
...
Replace .my.cnf with column-statistics.cnf at the system level for mysqldump
2022-02-01 16:14:37 -08:00
snipe
8083ba8dca
Merge pull request #10590 from inietov/fixes/bulkedit_does_not_show_in_history_develop
...
Fixes Bulk edit doesn't show in Asset's history nor Activity report for develop [sc-16550]
2022-02-01 16:14:25 -08:00
snipe
237bc22a5c
Merge pull request #10591 from uberbrady/allow_invalid_app_urls_develop
...
Allow invalid app urls develop
2022-02-01 14:17:08 -08:00
Brady Wetherington
eaba560877
We had a markdown failure in the upcoming audits table, this fixes it.
2022-02-01 14:06:01 -08:00
snipe
2e998b110f
Add @TenOfTens as a contributor
2022-02-01 13:40:31 -08:00
Brady Wetherington
f70c238b1c
Merge remote-tracking branch 'upstream/develop' into develop
2022-02-01 11:53:33 -08:00
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
