Dampfklon
|
0d49fc3a2e
|
remove unused route, controller functions and view
|
2022-02-13 12:10:19 +01:00 |
|
Brady Wetherington
|
c300e7c7f6
|
Remove extraneous backslash
|
2022-02-08 12:23:15 -08:00 |
|
|
Brady Wetherington
|
fb890fbc30
|
Properly alert when invalid JSON is submitted to something that wants JSON
|
2022-02-08 12:22:59 -08: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 |
|
|
Brady Wetherington
|
a15c0adc79
|
Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs
|
2022-02-07 11:33:38 -08: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
|
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
|
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
|
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 |
|
|
Ivan Nieto Vivanco
|
3ef775533a
|
Adds actionlog for bulk edits
|
2022-02-01 12:10:46 -06: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
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Ivan Nieto Vivanco
|
f510b9c2a9
|
Add query to filter non-deprecable assets when the Depreciation Report is called
|
2022-01-15 14:21:31 -06:00 |
|
|
Ivan Nieto Vivanco
|
8334ed6f7e
|
Add query to filter non-deprecable assets when the Depreciation Report is called
|
2022-01-15 14:01:19 -06:00 |
|
|
Ivan Nieto Vivanco
|
153c30eda8
|
Add to Importer the capacity to search Models only with Model Name since Model Number is not required
|
2022-01-15 04:32:47 -06:00 |
|
|
Ivan Nieto Vivanco
|
58b1db29e2
|
Adds condition to only update the Asset's Model Number if is provided by import file
|
2022-01-15 04:15:38 -06:00 |
|
|
Ivan Nieto Vivanco
|
8bd280b416
|
Add to Importer the capacity to search Models only with Model Name since Model Number is not required
|
2022-01-15 04:12:30 -06:00 |
|
|
Brady Wetherington
|
ef463a37d8
|
Make 'pending' assets properly requestable; use requestable scope
|
2022-01-14 12:48:33 -08:00 |
|
|
snipe
|
207ff014b1
|
Merge pull request #10514 from uberbrady/fix_double_wildcard_query_requestable
Fixed extraneous wildcard query in requestable asset search
|
2022-01-13 19:39:08 -08:00 |
|
|
Brady Wetherington
|
65e584c2bd
|
Revert the unnecessary optimization for asset->count()
|
2022-01-13 19:37:08 -08:00 |
|
|
snipe
|
24a234ede3
|
Merge pull request #10503 from uberbrady/develop_fix_dont_req_preauth_uac
Permit DONT_REQ_PREAUTH AD users to log in
|
2022-01-13 17:01:59 -08:00 |
|
|
snipe
|
be7e6ed847
|
Merge pull request #10502 from uberbrady/ldap_useraccountcontrol_dont_req_preauth
Add new UserAccountControl to permitted UAC's for AD.
|
2022-01-13 17:01:47 -08:00 |
|
|
Brady Wetherington
|
4e8ae8a162
|
Fix extraneous wildcard query in requestable asset search
|
2022-01-13 16:32:40 -08:00 |
|
|
Ivan Nieto Vivanco
|
949fe2a14a
|
Adds last_audit_date and next_audit_date in the asset importer
|
2022-01-13 15:14:20 -06:00 |
|
|
snipe
|
984db1ef44
|
Apply personal API token fix to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-13 01:39:56 -08:00 |
|
|
snipe
|
512dbfee7a
|
Added gate to check that the user is allowed to view API keys
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-13 01:33:27 -08:00 |
|
|
snipe
|
eb8f23a888
|
Removed commented code
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-13 01:32:28 -08:00 |
|
|
snipe
|
8f4ec95fbb
|
Remove assets query, since we handle that via API call now and just need the count()
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-12 23:23:00 -08:00 |
|
|
snipe
|
224d0b2fd2
|
Small language file additions
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-12 22:21:00 -08:00 |
|