snipe
66c3559e1c
Merge pull request #10636 from inietov/fixes/inconsistencies_between_checkout_checkin_dates_master
...
Fixes #10627 Inconsistencies between checkout/checkin dates on asset history and activity log for master branch
2022-02-08 10:19:16 -08:00
snipe
ad52f9df72
Merge pull request #10635 from inietov/fixes/inconsistencies_between_checkout_checkin_dates
...
Fixes #10627 Inconsistencies between checkout/checkin dates on asset history and activity log
2022-02-08 10:18:52 -08:00
Ivan Nieto Vivanco
413e44be2f
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco
d71aa859fc
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:43:24 -06:00
snipe
ebc35c4519
Merge pull request #10630 from JonathonReinhart/10629-checkin-API-error-status
...
Fix /hardware/{id}/checkin API response on error
2022-02-08 08:54:17 -08:00
Jonathon Reinhart
cd963179fd
Fix /hardware/{id}/checkin API response on error
...
Fixes #10629
2022-02-08 01:08:42 -05:00
Ivan Nieto Vivanco
796a0ebdaa
Add initial support for default values in checkboxes customfields
2022-02-07 22:17:40 -06:00
snipe
474f24e40e
Merge branch 'master' of https://github.com/snipe/snipe-it
2022-02-07 18:27:59 -08:00
snipe
b3a0f86431
Temp fix for weird JSON format in history
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-07 18:27:55 -08:00
snipe
959074f836
Merge pull request #10625 from inietov/fixes/checkin_checkout_api_routes_broken
...
Fixes #10614 Checkin/Checkout API route's broken
2022-02-07 11:56:48 -08:00
Ivan Nieto Vivanco
b4d2b1322f
Pass ID of the checkin/checkout assets in API
2022-02-07 13:43:13 -06:00
snipe
a77c51c5f2
Merge pull request #10624 from uberbrady/develop_fix_secure_hosts_in_subdirectory
...
(Develop) fix secure hosts in subdirectory
2022-02-07 11:41:33 -08:00
Brady Wetherington
a15c0adc79
Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
2022-02-07 11:33:38 -08:00
snipe
1a31231569
Merge pull request #10623 from uberbrady/fix_secure_hosts_in_subdirectory
...
Fixes #10577 - Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
2022-02-07 11:33:33 -08:00
Brady Wetherington
f1d4087317
Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
2022-02-07 11:26:54 -08:00
snipe
f2b8091b31
Merge pull request #10622 from Godmartinz/bug/sc-18678/add-required-field-marker-to-default-currency
...
Fixed Bug/sc 18678/add required field marker to default currency
2022-02-07 10:34:27 -08:00
Godfrey M
67882f5531
Removed untracked fileseetvert "adding untracked files"
...
This reverts commit 9d0b163c11
2022-02-07 10:23:24 -08:00
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
f4069e00cd
Merge pull request #10611 from uberbrady/master
...
D'oh! Migration fails on empty settings table :(
2022-02-03 20:07:01 -08:00
Brady Wetherington
8650faf0d8
D'oh! Migration fails on empty settings table :(
2022-02-03 20:04:33 -08:00
snipe
796ef741e8
Merge pull request #10610 from uberbrady/fixes/ldap_active_status
...
Fixes #10563 - Rework the LDAP sync command to better handle the active flag
2022-02-03 19:45:41 -08:00
Brady Wetherington
36ae6f9430
Yanked debugging code, tightened up comments.
2022-02-03 19:41:16 -08:00
Brady Wetherington
1945b97b72
Just trying to really tighten up on the LDAP Active Flag and how we parse it.
2022-02-03 19:04:56 -08:00
Brady Wetherington
392e61688d
Rework the LDAP sync command to better handle the active flag
2022-02-03 15:01:45 -08:00
snipe
db82e06665
Fixed migration with invalid LDAP prepopulation value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-02 18:22:51 -08:00
snipe
ac5c6123bc
Fixes #10563 - LDAP active flag - hopefully?
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-02 18:07:34 -08:00
snipe
8add47739e
Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null
...
Fixes: Column activated cannot be null [sc-18528]
2022-02-02 12:21:31 -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
Ivan Nieto Vivanco
eac8e0bdba
Add a casting to a truthy/falsy that needs to be integer
2022-02-02 13:54:57 -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
