snipe
702791210e
Throttle password reset requests to 5 every 60 seconds
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-08 14:26:30 -07:00
Ivan Nieto Vivanco
23b770fac6
Added a validation to use the same name in categories with different types
2021-10-08 15:19:16 -05:00
snipe
1c77fd0d09
Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror
...
Fixed typo when setting the headers
2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco
d184da8611
Fixed typo (thanks @ssddanbrown)
2021-10-08 13:39:49 -05:00
Dampfklon
ab4a234e20
fix rebase errors
2021-10-07 21:32:57 +02:00
Dampfklon
7645f23f5c
remove pending Acceptances on checkin
2021-10-07 21:03:46 +02:00
Dampfklon
4418ad2340
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
2021-10-07 21:03:46 +02:00
Dampfklon
12ee06deb6
add Download All Button, change route analogue to activity report
2021-10-07 21:01:50 +02:00
Dampfklon
9a9ca59544
Fix decprecated implode usage
2021-10-07 20:55:47 +02:00
Dampfklon
ed99532c30
Unaccepted Assets Report Actions (send reminder, delete) added
...
Unaccepted Assets Export fixed
2021-10-07 20:53:02 +02:00
snipe
ccd430ce07
Switched back down to debug level
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:38:21 -07:00
snipe
f306401e7e
Fixed SVG XSS vuln
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:26:45 -07:00
snipe
c06a93ef13
Removed extra brace in assets for components
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 10:38:13 -07:00
Ivan Nieto Vivanco
ef6eea67d8
Set headers in a different manner in the middleware
2021-10-05 14:09:35 -05:00
Brady Wetherington
bbeedc026d
A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.
2021-10-04 22:07:29 -07:00
Brady Wetherington
d80604f2ac
Most of the basics are working, but not done and lots of debug messages are about
...
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
2021-10-04 22:06:48 -07:00
snipe
34eab88b7e
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 20:25:31 -07:00
snipe
b20c841a89
Fixed asset models restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:29:13 -07:00
snipe
52caee2a9f
Handle checking and unchecking for bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:26 -07:00
snipe
52ea172e5d
Fix ID array
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:07 -07:00
snipe
9b48732cd2
Force revalidation headers when user logs out
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 12:52:48 -07:00
snipe
daa88f06f7
Added pivot to components JSON
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 15:51:08 -07:00
snipe
d0acb9fdb4
Applies PR #10150 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 15:33:00 -07:00
Ivan Nieto Vivanco
11aa8971c8
Fix error if the Department is also empty
2021-09-30 17:20:44 -05:00
Ivan Nieto Vivanco
5c7aaaac22
Fix error when department is null
2021-09-30 16:46:23 -05:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Brady Wetherington
ae466be153
Fix license output, tweak CleanFloat function to handle numbers over 1 million
2021-09-28 19:10:25 -07:00
Brady Wetherington
f3338667c7
Create new ParseCurrency helper and use it in the appropriate controllers
2021-09-28 18:20:39 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
NMC
c680977791
Merge branch 'develop' into api-licenses
2021-09-27 15:02:51 -04:00
snipe
d88c0ae5ec
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
...
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
2021-09-26 13:41:52 -07:00
snipe
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 01:11:08 -07:00
snipe
67d898e897
Updated map icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 14:30:36 -07:00
snipe
e03d7b7016
More fa icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 13:07:02 -07:00
snipe
ad6f073c82
Few more icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:38:23 -07:00
snipe
dbe93d91cd
Updated fontawesome icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:07:46 -07:00
snipe
2f9582ee5c
Switched to loadMissing for performance
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:31:19 -07:00
snipe
3b7ce0091c
Load components in the assets API if components=true in API request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:23:53 -07:00
snipe
6e270c0ed2
Include created_at in pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 17:23:17 -07:00
snipe
3862b6476b
Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout
...
Fixes API Issue when checking out a component
2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco
7dfab3a6e2
Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api
2021-09-23 15:02:39 -05:00
snipe
a6b3aa5f04
Don't try to delete the file if there is no log entry
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:04:25 -07:00
snipe
61cf9ec009
Small conflict handling bits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 00:00:44 -07:00
snipe
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
snipe
b4a90045e6
Added totals to depreciation report footer
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 21:52:18 -07:00
snipe
0763c76a4e
Fixed scoping with leftjoin
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 20:54:24 -07:00
snipe
5d32c17a2e
Removed comments
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 20:01:36 -07:00
snipe
10ca7cffc3
Fixes for query scoping, ordering, and nicer readability
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 19:59:23 -07:00
snipe
61176335d7
Improved category_type with strtolower() to make it case insensitive
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 15:51:41 -07:00
Delta5
c8c3c7fbbd
Fixed issue with incorrect error message
2021-09-21 19:45:18 +00:00
Delta5
59302e1d19
Add restore to users api endpoint
2021-09-21 17:42:26 +00:00
snipe
9b52c61d95
Updated banner with better warning
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 18:49:04 -07:00
snipe
36464bc17d
Fix confirmation, because apparently you can't pass that along via cli vs interactively
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 18:22:06 -07:00
snipe
f35208d58d
Clean up, find custom fields and drop those columns
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 18:03:13 -07:00
snipe
4d30edd535
Let's make sure to keep some of the stuff we need on the demo as well
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 17:29:32 -07:00
snipe
957f33c8cf
First stab at a better pave command
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 17:19:41 -07:00
snipe
b331bb33d9
Code fixes and a new migration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 15:37:24 -07:00
snipe
8a93e1e796
Remove asset call on depreciation report controller method
...
We ajax this in now, so no need for it
Signed-off-by: snipe <snipe@snipe.net>
2021-09-15 13:49:53 -07:00
snipe
d96f877aa4
Default show_in_nav to 0
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-15 11:33:13 -07:00
snipe
02705d0d1a
Fixed S3 upload path
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-14 12:49:17 -07:00
snipe
80175cffdc
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-10 20:44:49 -07:00
snipe
514f9aa64a
Fixed #9973 - add use_default_eula to categories API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-10 20:23:49 -07:00
Ivan Nieto Vivanco
f1b8b7d11d
Convert whatever value we get in column 'checkout type' to all lowercase
2021-09-08 12:49:29 -05:00
snipe
cfaa6679af
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history
...
Fixed #10026 : Checkout date not saved in asset history
2021-09-07 17:37:30 -07:00
snipe
bb5a04491d
Merge pull request #10053 from inietov/fixes/accepted_assets_still_showing_unaccepted_report
...
Fix Accepted Assets still showing on Unaccepted Asset Report
2021-09-07 12:15:17 -07:00
snipe
f9c0eee7c9
Merge pull request #10048 from inietov/fixes/blank_results_for_non_superadmins
...
Fix to PR #10009 . The asset search now works as intended for normal users
2021-09-07 12:14:29 -07:00
Ivan Nieto Vivanco
27ff0be9a8
Delete checkout acceptances when an asset is checked in without response
2021-09-07 12:01:32 -05:00
Ivan Nieto Vivanco
b5525e6a21
Deleted additional bindings present also in the User model
2021-09-07 00:57:12 -05:00
Ivan Nieto Vivanco
c3eb7a3425
Remove aditional bindings that 'overflows' the generated queries
2021-09-07 00:15:21 -05:00
snipe
94310e18b1
Presenters and Transformers for Depreciation report
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:33:59 -07:00
snipe
2f25eb598b
Allow the Assets API controller to handle depreciation reports
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:33:39 -07:00
Ivan Nieto Vivanco
e621eaf456
Change date showed in the activity report view, the condition is now on action_date
2021-09-01 13:58:17 -05:00
Ivan Nieto Vivanco
ea1d7a42e2
Add condition to check if action_date have value and if it have assign it to created_at parameter
2021-09-01 13:08:08 -05:00
snipe
4293674f4a
Added a few more fields to the users API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:36:06 -07:00
snipe
aeae681326
Fixecd copypasta from state to zip
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:28:20 -07:00
snipe
4794f93224
Added additional fields for user search
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 12:24:53 -07:00
snipe
f58ed6bd1f
Merge pull request #9982 from Shankschn/master
...
Fixes: When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
2021-08-31 11:08:52 -07:00
Ivan Nieto Vivanco
d917ae51b7
Remove e() function from other input fields
2021-08-31 04:01:20 -05:00
Ivan Nieto Vivanco
e7470b5545
Remove e() function from the saved notes when updating an asset maintenance
2021-08-31 03:50:57 -05:00
snipe
a02534b6c8
Merge pull request #10009 from inietov/fixes/blank_results_for_non_superadmins
...
Fixes #9985 . Error 500 when using the asset search - blank results for non super-admins
2021-08-30 13:29:18 -07:00
snipe
6d3a82aacf
Merge pull request #10008 from uberbrady/fix_unlink_error_ldap
...
Fixed rb445 and rb446 - the unlink calls for the client-side certs...
2021-08-30 12:47:38 -07:00
Brady Wetherington
da0b375773
Fixed rb445 and rb446 - the unlink calls for the client-side certs
...
need to be wrapped around a file-existence check
2021-08-30 12:29:16 -07:00
Ivan Nieto Vivanco
d1304cc975
Add sentence to infer the table's name according to the query passed
2021-08-30 13:44:26 -05:00
snipe
085be16966
Merge remote-tracking branch 'origin/develop'
2021-08-25 14:45:41 -07:00
Ivan Nieto Vivanco
4a79c77630
Add a condition to checkin licenses assigned to Assets
2021-08-25 16:38:34 -05:00
Ivan Nieto Vivanco
137f55e4ce
Change condition to return the actual max upload size allowed to files
2021-08-25 15:27:25 -05:00
snipe
4abb9baa95
Merge remote-tracking branch 'origin/develop'
2021-08-24 15:29:41 -07:00
Shanks
961e80404a
Update AssetsController.php
...
Fix：When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
2021-08-24 16:39:58 +08:00
snipe
70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs
...
Add client side ldap certs
2021-08-23 16:30:46 -07:00
snipe
9285697611
Merge remote-tracking branch 'origin/develop'
2021-08-20 17:30:52 -07:00
snipe
9687bcb41c
Fixed issue where consumables model number was not searchable
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-20 17:30:35 -07:00
snipe
24af2ab67a
Merge remote-tracking branch 'origin/develop'
2021-08-18 14:31:53 -07:00
snipe
7b447a2f16
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-08-18 14:31:38 -07:00
Ivan Nieto Vivanco
f04e23cacb
Add a small refactor so we not repeat logic
2021-08-18 15:22:53 -05:00
Ivan Nieto Vivanco
4207858a14
Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index
...
Also edit the default color for assets with the Pending label, so it match the color in the docs
2021-08-18 14:08:35 -05:00
snipe
b88fde5dae
Nicer comment formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 12:07:09 -07:00
snipe
b5bb74b8ca
Merge remote-tracking branch 'origin/develop'
2021-08-17 22:01:23 -07:00
snipe
cce808c784
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
...
Duplicates d4e46ee41f
2021-08-17 21:59:33 -07:00
Brady Wetherington
4d4badf830
Got the client-side LDAP setup working well enough for sync!
2021-08-17 14:43:36 -07:00
Godfrey M
cef0e424e1
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
James Emanuel
98285001ac
Fixing Typo on creating Depreciation
2021-08-16 15:33:17 +03:00
snipe
29c584289f
Merge remote-tracking branch 'origin/develop'
2021-08-14 14:09:31 -07:00
snipe
ef687fdc7b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-14 14:07:04 -07:00
snipe
45caa8a90d
Added restore functionalty to asset API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-14 14:06:15 -07:00
Godfrey M
01037cf9cb
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
2021-08-10 18:26:43 -07:00
Tobias Regnery
eced1ab77f
Fix advanced search with serial and another field
...
The advanced search in /hardware produces incorrect results if the serial is combined with another field like category.
There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'.
Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause.
I think this function could be simplified further, but this is the minimal bugfix.
2021-08-05 15:07:28 +02:00
Computroniks
f994af16da
Added function to calculate cost based on quantity
...
sumFormatterQuantity takes the same input as sumFormatter but instead
of calculating the specified columns total it calculates the total
purchase cost of an item based upon its quantity. Also updated affected
pressenters to use this formatter.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
2021-08-04 22:09:50 +01:00
NMC
4cfc4aec1d
fix false search in api.
2021-08-01 15:10:22 -04:00
NMC
976957ddd4
Add Maintained filed in licenses view and api. + Expires in API
2021-08-01 14:30:16 -04:00
snipe
cdc4940338
Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset
...
Fixes Integrity constraint violation when emailing password reset.
2021-07-30 16:01:53 -07:00
Ivan Nieto Vivanco
27cdfbc579
Edit the log message
2021-07-29 16:14:52 -05:00
Ivan Nieto Vivanco
405545cd88
Add exception handling in the ForgotPasswordController
2021-07-29 16:02:45 -05:00
Tobias Regnery
1a908e361e
Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
...
locations->isDeletable() checks via gate::allows if a locations is deletable.
This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item).
This returns false because locations don't have a company_id.
Check for this and return true if the item don't have a company_id.
2021-07-29 10:43:01 +02:00
snipe
593e1234a5
Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api
...
Fixed #9671 : wrap OR queries in sub-condition in checkedout search
2021-07-27 14:39:10 -07:00
snipe
9a5d9eafeb
Merge pull request #9709 from morning-bird/master
...
add CompanyableTrait
2021-07-27 14:38:21 -07:00
Ivan Nieto Vivanco
38a2a0c1ee
Add the pertinent filters in Accessories and Consumables controllers
2021-07-26 12:59:15 -05:00
snipe
75d4a46fff
Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown
...
Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]
2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco
0f1c48cb6f
Add the field model_number to Accessory importer
2021-07-24 02:38:44 -05:00
Ivan Nieto Vivanco
35ffe8b902
Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view
2021-07-20 18:56:22 -05:00
snipe
5f842d02ef
Fixed namespace
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:24:40 -07:00
Petri Asikainen
f753404197
missed this when rebasing
2021-07-15 12:26:14 +03:00
Petri Asikainen
5d999d2572
legacy image_source support for store
2021-07-15 12:26:14 +03:00
Petri Asikainen
d50294e8e2
Just mention source of idea as code rewriten
2021-07-15 12:26:14 +03:00
Petri Asikainen
2fc3ff671e
hand legacy image_source field
2021-07-15 12:26:14 +03:00
Petri Asikainen
89cc84f1d9
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-15 12:26:14 +03:00
Petri Asikainen
f24138da44
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-15 12:26:14 +03:00
Petri Asikainen
a76b36cad9
Handle image_source with ConvertBase64ToFiles
2021-07-15 12:26:14 +03:00
Petri Asikainen
1936fc2ea9
Better debug comment
2021-07-15 12:26:14 +03:00
Petri Asikainen
23f77b2894
Fixed case again
2021-07-15 12:26:14 +03:00
Petri Asikainen
15dd7061ed
removed unused Bag-functions
2021-07-15 12:26:14 +03:00
Petri Asikainen
5f81488679
fix debug placement
2021-07-15 12:26:14 +03:00
Petri Asikainen
c894e8ceb3
handle files via standard field
2021-07-15 12:26:14 +03:00
Petri Asikainen
bbe964c6b2
debug trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
2325b1d8c2
Try without trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
948a741935
case case again..
2021-07-15 12:26:14 +03:00
Petri Asikainen
d7d3681d71
trait base64 encoded files
2021-07-15 12:26:13 +03:00
Petri Asikainen
e6d432423d
trait base64 encoded files
2021-07-15 12:26:13 +03:00
Petri Asikainen
6173aaa25c
fixed capitalization
2021-07-15 12:26:13 +03:00
Petri Asikainen
91af3f2661
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
4191dd39ea
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
2f3501bdc2
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f1b8ce0a1b
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
6a21660c14
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
64c8767e81
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
0e7af80806
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
e95b15d553
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
bb269e0e5f
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
60f13c8d79
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
5081ca3512
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
b4380c8012
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f6766c5f23
Support images and multipart requests
2021-07-15 12:26:07 +03:00
Petri Asikainen
8bbbb06c5e
testing image upload via api
2021-07-15 12:24:25 +03:00
Petri Asikainen
febf1ec20f
Support legacy image_source property
2021-07-14 13:09:50 +03:00
Petri Asikainen
7b12668af4
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-07-13 17:23:44 +03:00
Oskar Stenberg
5b5874499d
Added import for min_amt for consumables
2021-07-12 11:46:19 +02:00
snipe
f785c3e759
Default to 1 if no qty is passed
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 16:04:52 -07:00
Petri Asikainen
4379ea61fa
Just mention source of idea as code rewriten
2021-07-08 19:50:33 +03:00
Petri Asikainen
41deabf998
hand legacy image_source field
2021-07-07 09:33:48 +03:00
Petri Asikainen
7a424649c8
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-07 09:24:24 +03:00
Petri Asikainen
b2d3ba7410
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-07 09:20:38 +03:00
Petri Asikainen
168d7f7004
Handle image_source with ConvertBase64ToFiles
2021-07-07 09:08:37 +03:00
Mark Brule
f706c87cbc
wrap OR queries in sub-condition
2021-07-06 20:43:17 +00:00
Tobias Regnery
9e1d7ffb5d
Fix scope of departments for FullMultipleCompanySupport
...
If a user tries to view or edit a department from a different company
with FullMultipleCompanySupport enabled, there is a 403 error displayed.
Apply the correct company scope in order to only display the departments
from the own company in the departments view.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
2021-07-06 09:45:46 +02:00
Petri Asikainen
f53cabee24
Better debug comment
2021-07-06 07:26:16 +03:00
Petri Asikainen
e275c9ee90
Fixed case again
2021-07-06 07:10:03 +03:00
Petri Asikainen
3d8acd1bd8
removed unused Bag-functions
2021-07-06 07:00:12 +03:00
Petri Asikainen
2169c62700
Merge branch 'feature/api-image-uploads-json' into feature/api-image-uploads
2021-07-06 06:55:54 +03:00
Petri Asikainen
c21b291484
keep using request
2021-07-06 06:51:07 +03:00
Petri Asikainen
c1bc2486ad
keep using request
2021-07-06 06:49:19 +03:00
Petri Asikainen
e3166c2209
fix debug placement
2021-07-06 06:41:37 +03:00
Petri Asikainen
7a5b5c291d
merged from develop
2021-07-06 06:38:32 +03:00
Petri Asikainen
d66ef233bf
handle files via standard field
2021-07-06 06:25:37 +03:00
Petri Asikainen
013df747d7
debug trait
2021-07-05 09:59:19 +03:00
Petri Asikainen
02fb7ac03e
Try without trait
2021-07-04 13:39:46 +03:00
Petri Asikainen
d48a9d549d
Try without trait
2021-07-04 13:37:05 +03:00
Petri Asikainen
f59f3dbde4
case case again..
2021-07-02 10:43:15 +03:00
Petri Asikainen
f4fa6836cb
trait base64 encoded files
2021-07-02 10:29:26 +03:00
Petri Asikainen
e846e6ac76
trait base64 encoded files
2021-07-02 10:18:18 +03:00
Petri Asikainen
e15159b9c3
trait base64 encoded files
2021-07-02 10:17:29 +03:00
Ivan Nieto Vivanco
5545457536
Remove an else statement that doesn't allow to continue the importer flow.
2021-07-01 14:26:03 -05:00
Brady Wetherington
102591b009
Better debugging output, and remove non-PHP-7.3-compatible option
2021-06-30 14:53:08 -07:00
Petri Asikainen
347e742e88
merged current upstream/develop
2021-06-30 12:02:05 +03:00
snipe
868419b35b
Components checkin/checkout via API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-30 01:02:44 -07:00
Petri Asikainen
6048acc95d
fixed capitalization
2021-06-30 06:36:12 +03:00
snipe
50a644a2c0
Did I seriously spell my own goddamned name wrong in the docblock??
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:28:00 -07:00
snipe
c517ec849d
Small refactor for login Livewire
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:05:23 -07:00
snipe
8780fa0a26
Use correct auth failure message
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 07:46:39 -07:00
Petri Asikainen
b0aa26e6cb
Support images and multipart requests
2021-06-29 14:25:20 +03:00
Petri Asikainen
b49733832c
Support images and multipart requests
2021-06-29 12:29:17 +03:00
Petri Asikainen
8c0be3aa87
Support images and multipart requests
2021-06-29 12:29:07 +03:00
Petri Asikainen
a936744e2e
Support images and multipart requests
2021-06-29 12:28:52 +03:00
Petri Asikainen
f9da83bc46
Support images and multipart requests
2021-06-29 12:28:42 +03:00
Petri Asikainen
fc8498972e
Support images and multipart requests
2021-06-29 12:28:32 +03:00
Petri Asikainen
4ba75291e4
Support images and multipart requests
2021-06-29 12:27:18 +03:00
Petri Asikainen
a7b1e31776
Support images and multipart requests
2021-06-29 12:27:08 +03:00
Petri Asikainen
604a0b6df1
Support images and multipart requests
2021-06-29 12:26:59 +03:00
Petri Asikainen
4ed9788a0e
Support images and multipart requests
2021-06-29 12:26:45 +03:00
Petri Asikainen
e8a4059db9
Support images and multipart requests
2021-06-29 12:26:24 +03:00
Petri Asikainen
aa402bf896
Support images and multipart requests
2021-06-29 12:26:15 +03:00
Petri Asikainen
8d4219759e
Support images and multipart requests
2021-06-29 12:25:47 +03:00
snipe
704eb728bc
Added livewire the login screen
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 02:16:57 -07:00
snipe
ebb0aa5532
Merge pull request #9766 from uberbrady/livewire_integration_v6
...
Livewire integration for Snipe-IT v6
2021-06-28 21:51:00 -07:00
Brady Wetherington
a6ac4f94f1
Breaking out field-listing into its own Livewire blade for use elsewhere
2021-06-28 21:00:20 -07:00
Brady Wetherington
ea1f1eb972
Get some basic Livewire going for 'edit model's default values.
2021-06-28 21:00:20 -07:00
Brady Wetherington
8e66abb926
Basic Laravel7 compatibility, starting getting Livewire going
2021-06-28 21:00:16 -07:00
snipe
4af247f845
Added additional boxes to the dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:36:15 -07:00
snipe
d4e46ee41f
Added comma in US currency format [ch16628]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:14:32 -07:00
snipe
68c751fe63
Break out name into first name and last name [ch1382]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 15:55:33 -07:00
snipe
a016f4ecd0
Applies PR #9761 to integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:11:22 -07:00
snipe
19413a63da
Make notes field searchable on status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:53:17 -07:00
snipe
a4fd0c9c6d
Fixed #9745 - added searchable, sortable notes field to status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:52:57 -07:00
Petri Asikainen
e0c5205e9b
save images
2021-06-28 08:11:33 +03:00
Petri Asikainen
695bf1e15f
save images
2021-06-28 07:58:08 +03:00
Petri Asikainen
0e2efb6573
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-06-27 14:38:55 +03:00
snipe
e44a25126d
Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification
...
Fixes #9666 Asset checkin via api doesn't send notification.
2021-06-23 14:35:07 -07:00
snipe
c801305c9b
Merge pull request #9681 from tulsaschoolsdata/9680-fix-statuslabels-asset-count
...
Fixed #9680 : Use Eloquent’s `withCount` method to count Statuslabel assets
2021-06-23 14:34:34 -07:00
Petri Asikainen
491a788cd0
testing image upload via api
2021-06-23 11:22:41 +03:00
snipe
dc157f8f78
Add components and users count to dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-19 16:16:18 -07:00
Petri Asikainen
ae2c77f97f
Allow to bulk update min_amt
2021-06-17 00:36:04 +03:00
GMS ICT 2
ea7f18d0e6
add CompanyableTrait
2021-06-15 15:32:44 +07:00
snipe
c407b52bbf
Updated Cors
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 00:23:30 -07:00
snipe
226b208f7c
Reset handler to stock for now
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 22:19:10 -07:00
snipe
c08f70b03c
Restore exeption handler functionality
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 21:51:28 -07:00
snipe
fa786e615e
Moved HasFactory
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 19:02:19 -07:00
snipe
3095a78664
Small tweaks to Dashboard controller
...
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:43:47 -07:00
snipe
a8123092af
Misc fixes for shift
...
// TODO - re-fix the exception handler
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:07:50 -07:00
Laravel Shift
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +00:00
Laravel Shift
104b441e0d
Shift to class based factories
2021-06-10 20:17:44 +00:00
Laravel Shift
9f43ce97e9
Convert deprecated $dates property to $casts
2021-06-10 20:17:18 +00:00
Laravel Shift
bdf23e472e
Shift to class based routes
2021-06-10 20:17:14 +00:00
Laravel Shift
ddc8b8648b
Shift service providers
2021-06-10 20:17:07 +00:00
Laravel Shift
4ed3d6afb8
Shift HTTP kernel and middleware
2021-06-10 20:17:04 +00:00
Laravel Shift
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
Travis Miller
4f6b1bb12d
Fixed #9680 : Use Eloquent’s withCount method to count Statuslabel assets
2021-06-09 11:52:04 -05:00
Ivan Nieto Vivanco
bb227cafb2
Added event to trigger the notification.
2021-06-08 13:16:13 -05:00
Ivan Nieto Vivanco
9f944ad497
Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].
2021-05-27 15:48:13 -05:00
snipe
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:32:23 -07:00
snipe
b8d413a6b8
Merge pull request #9632 from inietov/fixes/api_allow_duplicate_asset_tags
...
Fixes an issue that allows duplicate asset tags when the Asset is created via API.
2021-05-26 13:34:59 -07:00
snipe
200d0804ec
Merge pull request #9630 from kcoyo/develop
...
Fixed #9607 : Sessions expire for SAML/RemoteUser/LDAP
2021-05-26 13:04:13 -07:00
Ivan Nieto Vivanco
d9f5f1182a
Delete a couple lines that rewrites validation rules for asset tags in the model Asset.php:save() method.
2021-05-25 23:09:27 -05:00
kcoyo
cee6f0d579
Update LoginController.php
...
Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP
2021-05-25 16:37:34 -07:00
snipe
5b4550a6a8
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-05-21 16:56:15 -07:00
snipe
1a7edb3411
Accept webp in uploads (not just image files)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-21 16:56:11 -07:00
Brady Wetherington
94c1d36e08
The legacy 'logo.png' might not be a PNG, so switched to wildcard.
2021-05-21 15:55:37 -07:00
Brady Wetherington
e71bba441e
Several improvements to the snipeit:restore Artisan command
...
The output now focuses on files that were skipped. Wildcard support
was added for individual files. A progress bar fills as the files
are transferred from the ZIPball to the filesystem. A new command-line
switch can be used to disable the progress bar. Barcode restores are
now skipped (we'd probably prefer to regenerate them). A few missed
directories have been added in. Some logic to skip macOS resource-fork
files has been put in. Some bugs with array operations were fixed.
There's now a concept of 'valid' and 'invalid' files for wildcard
operations.
2021-05-21 15:23:23 -07:00
sh1hab
f43413bdc3
Feature snipe#9378 update
2021-05-21 10:19:04 +06:00
Marc Leuser
4030789786
fix LicenseSeatsController method documentation ( #9584 )
...
in an attempt to get the automatic API reference generation to work
2021-05-14 16:14:32 -07:00
Brady Wetherington
6066005aeb
[WIP] Initial rough stabs at the Backup Migrator. It kinda-sorta works? ( #9457 )
...
* Initial rough stabs at the Backup Migrator. It kinda-sorta works?
* Fix hardcoded mysql path var
2021-05-12 17:44:39 -07:00
Ivan Nieto Vivanco
6ed5dff1a5
Fix the target path to copy the demo logos in the database\seeds\SettingsSeeder.php. Also added the code that copies the demo logos to app\Console\Commands\ResetDemoSettings.php ( #9571 )
2021-05-12 16:41:49 -07:00
Thomas Misilo
18b1a155bf
Change from ENV to config value for PUBLIC_AWS_URL
...
When running config:cache the env('PUBLIC_AWS'URL') value disappears and isn't available, so it doesn't get added to the CSP Policy.
2021-05-11 09:51:35 -05:00
snipe
ded61614d1
Attempt to fix transient LDAP bug
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 18:13:04 -07:00
snipe
a704614397
Bumped max for country on model
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 16:42:26 -07:00
Tom Misilo
4e408cbc42
Fix CSP Always being Enabled unless in debug mode. ( #9543 )
2021-05-05 10:51:47 -07:00
Ivan Nieto Vivanco
36a43642d8
Changed the orderBy clause inside the custom reports function that forms the CSV to be 'id' so making it a unique value and don't causes repeated items. [ch14587] ( #9535 )
2021-05-04 23:50:02 -07:00
markbrule
6c1553167d
issue #9422 - pivot ID was being used as a user_id ( #9512 )
2021-05-04 22:27:01 -07:00
Tom Misilo
a6bbe1fec3
Delete file from assets folder, not just the ref. ( #9525 )
2021-05-04 22:18:22 -07:00
snipe
cee5eea121
Use 24-hour date format for audit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 15:37:39 -07:00
snipe
c6726015f7
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 14:52:08 -07:00
snipe
315bcb6b38
Added use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-23 14:26:57 -07:00
Steven
82f73eb9e2
Added user locale to REST API GET /api/users response; ( #9486 )
...
* Clearer reporting on import
Signed-off-by: snipe <snipe@snipe.net>
* Try adding text/x-Algol68 to import
Signed-off-by: snipe <snipe@snipe.net>
* Added user locale to REST API GET /api/users response;
Co-authored-by: snipe <snipe@snipe.net>
2021-04-23 12:09:00 -07:00
Brady Wetherington
72a813f23d
This fixes the controller signature error people are getting with LDAP logins ( #9466 )
2021-04-21 10:23:32 -07:00
snipe
d90abdf86f
Snipe codeacy workflow ( #9460 )
...
* Removed printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
Signed-off-by: snipe <snipe@snipe.net>
* fix ldap ad authentication filter query mechanism (#7441 )
* Create SECURITY.md
* Create codacy-analysis.yml
Co-authored-by: Istvan Basa <basipottom@gmail.com>
2021-04-20 22:17:37 -07:00
aranar-pro
5127727730
Fixed #9424 : import history adds asset model to assigned user and respects checkin date ( #9350 )
...
* Fixed #9294 : Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
* Fixed #9294 : whitespace and comment cleanup for merge
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
2021-04-20 21:25:17 -07:00
snipe
c17eaaad69
Check that the field is valid before checking to see count()
...
This mostly affects the demo, since the seeder updates info often
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:10:28 -07:00
snipe
e286ff0be3
Added show() redirect for CustomFields::show()
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:09:23 -07:00
Brady Wetherington
2a28f5e66c
(Maybe?) Fixes the problem where we always need LDAP enabled ( #9321 )
...
* I *think* this fixes the problem where we need LDAP even if we aren't using it?
* Pull the LdapAd dependency out of the AuthController constructor
2021-04-20 14:53:47 -07:00
Ivan Nieto Vivanco
36bc47c61c
Handle regex format when assigned from API ( #9443 )
2021-04-20 14:44:47 -07:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
snipe
2986765a68
Implements #9373
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 11:17:59 -07:00
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings ( #9416 )
...
* new branch, added manager as an additional field. Currently having DB issues
* WIP DB Issue with eloquent
* added department to LDAP sync
* removed unused variables
2021-04-14 10:17:57 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
snipe
e47e2e3754
Fixed #9404 - include note in accessory API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 10:57:30 -07:00
snipe
390403ddb7
Fixed #9370 - listbox custom fields not decryoted on edit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 05:59:31 -07:00
Serkan
0e34e43abb
The return early pattern applied to improve readability. ( #8894 )
2021-04-05 22:03:15 -07:00
Lars Kajes
49532e1cd6
Add option to force TLS connection ( #9327 )
...
Co-authored-by: Lars Kajes <lars.kajes@iusinnovation.se>
2021-04-05 21:56:25 -07:00
snipe
5c5fe2bd87
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-04-05 21:52:01 -07:00
Tetrachloromethane250
157d9e4ebb
Added #5977 : Add permission to view files attached to licenses ( #9264 )
...
* Add permission to view and modify files for licenses
* Actually use the permission
2021-04-05 21:51:47 -07:00
snipe
3ffa3534a0
Use environmental variables in memory limits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 21:47:57 -07:00
snipe
b9bab05ac3
Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/users/print.blade.php
2021-04-05 20:55:49 -07:00
Sxderp
f01c93e162
Extend #6229 to include superuser permission check ( #6772 )
2021-04-05 20:26:06 -07:00
snipe
df72f92bc0
Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 20:16:06 -07:00
AlexanderWPapyrus
a1f9642a18
Increases DPI of barcode for small lables ( #9344 )
...
solves issue #9293
2021-04-05 19:33:10 -07:00
Ivan Nieto Vivanco
90a24539b0
Fixes/cli importer issue ( #9199 )
...
* Added logic to handle the CLI importer.
* Fix bug introduced with the commit previous to the regression.
* Adds a validation for variable when is null, add comments to clarify where the class variable came from.
* Add support for when variable is an instance of User class.
2021-04-05 19:28:31 -07:00
Godfrey Martinez
5ea759f615
Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync ( #9318 )
...
* LDAP and Active Directory has plenty of other [ch15504]
* removed department id from ldap sync
* removed department id from ldap sync
* Update 2021_03_18_184102_adds_several_ldap_fields.php
2021-04-05 19:26:04 -07:00
Ivan Nieto Vivanco
eb0ae74ef8
Fixes typo that doesn't accepts 'textarea' as custom field type element. ( #9387 )
2021-04-01 18:23:05 -07:00
snipe
a199c75f5c
Added textarea and checkbox to validation rules
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:04:01 -07:00
snipe
618e4439e2
Fixed validation to include textarea
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:02:10 -07:00
snipe
6a8e761c5e
Added created_at and updated_at to presenter
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 08:57:20 -07:00
Marc Leuser
90b7d34c69
Added #6695 : add API endpoint for license seats ( #8058 )
...
* remove miselading comment line
* added dedicated API endpoint for license seats
* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway
* reduce amount of IFs
* add sanity checks to show()
* fix goofed logging logic
* add tests for action log entries
2021-03-29 19:41:26 -07:00
NMC
3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. ( #6891 )
...
* Add a way for a user to override the skin setting.
* Add site setting to allow user to change the skin.
* Fix skin list.
Co-authored-by: NMC <info@nmc-lab.com>
2021-03-29 19:09:23 -07:00
Raell Dottin
78cc47a859
Added sanity check to determine if a bind user account is set. ( #9340 )
2021-03-24 14:08:37 -07:00
Tom Misilo
7557879d4a
Add support for overriding the Time and Memory Limits ( #8389 )
...
This is similar to what exists for the LDAP Import, and adds support for
setting th Import and Report max execution time and memory limits
Co-authored-by: snipe <snipe@snipe.net>
2021-03-24 11:40:43 -07:00
snipe
0b41f9182a
Merge remote-tracking branch 'origin/develop'
2021-03-24 11:35:39 -07:00
Jo Drexl
0114373468
Fixing #9224 ( #9328 )
2021-03-22 12:57:26 -07:00
snipe
86fef3f40a
Set SAML errors to warning instead of error
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 22:30:26 -07:00
snipe
c90604b5ae
Merge remote-tracking branch 'origin/develop'
2021-03-17 22:19:24 -07:00
snipe
069e9e52fe
Try/catch barcodes so they don’t shit up the logs
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 22:19:10 -07:00
snipe
9f3a8a43cc
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
2021-03-17 19:41:02 -07:00
snipe
8fd8e716ac
Changed debug level on bad LDAP connection ( #9314 )
...
* Changed debug level on bad LDAP connection
TODO:
Unfuck all of this. It’s a mess and it really doesn’t work the way we think it does. AdLdap library strikes again. :(
Signed-off-by: snipe <snipe@snipe.net>
* Improved phrasing
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 19:24:28 -07:00
snipe
ab092fd209
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Providers/AppServiceProvider.php
# config/logging.php
# config/services.php
2021-03-15 12:29:29 -07:00
Brady Wetherington
c7626f8387
Add new StorageHelper and use it where it makes sense ( #9276 )
2021-03-15 12:26:39 -07:00
snipe
f164f0ea60
Fixed #9266 - set a colors_array variable even if other conditions are not met
2021-03-09 21:04:32 -08:00
snipe
c3871c98df
Updated rollbar package
2021-03-09 16:16:57 -08:00
snipe
cf4e97f103
Log namespacing
2021-03-09 13:39:53 -08:00
snipe
e9ee9ea2e9
Fixed rollbar integration
2021-03-09 12:40:00 -08:00
Ivan Nieto Vivanco
9ed226a0af
Fixes links in Models Actions, and to view the fieldset assigned to that Model. ( #9232 )
2021-03-01 13:08:29 -08:00
Ivan Nieto Vivanco
d64b35c348
Added a condition to ensure that only assets checked out to an user that is being deleted are updating their status ( #9233 )
2021-03-01 13:07:23 -08:00
Ivan Nieto Vivanco
ab7dd90602
Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. ( #9210 )
2021-02-26 12:56:04 -08:00
snipe
f37d5d3d03
Fixed #9085 - asset models not showing proper pagination
...
Huge thanks to @inietov for catching this one
2021-02-25 16:43:38 -08:00
johnson-yi
763e17f491
Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD ( #9187 )
2021-02-23 11:05:22 -08:00
Brady Wetherington
44eee019d9
Add variable declaration for $result ( #9168 )
2021-02-19 10:19:24 -08:00
snipe
5754f0aa3f
Revert "Added logic to handle the CLI importer. ( #9088 )"
...
This reverts commit 2e2d087639
2021-02-18 14:21:19 -08:00
Ivan Nieto
2e2d087639
Added logic to handle the CLI importer. ( #9088 )
2021-02-17 13:13:17 -08:00
Ivan Nieto
12ff465cdb
Added feature: Checkbox Custom Fields as list of values. ( #9112 )
...
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.
* Added the same functionality when the custom fieldset is encrypted.
* Added missing bits, so the edit custom assets view shows what values have been already stored in database
2021-02-16 17:20:29 -08:00
Ivan Nieto
f89d789832
Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. ( #9133 )
...
* Fixes the validation rules on Manufacturer Model
* Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it
2021-02-16 12:52:55 -08:00
Giuseppe Iannello
5edbb4b229
Support Google Cloud IAP ( #8768 )
...
Following up on 7c2da81700
2021-02-03 11:59:55 -08:00
snipe
985193ffff
Fixed #9082 - allow deployable status type on checkout
2021-02-03 01:29:54 -08:00
snipe
124343911f
Merge remote-tracking branch 'origin/develop'
2021-02-02 16:57:18 -08:00
Brady Wetherington
462f8c791f
Hotfix to develop to yank extraneous e() ( #9080 )
2021-02-02 16:44:54 -08:00
Brady Wetherington
9a224a07ba
Modified how we do Select2 dynamic drop-down menus to be more secure ( #9079 )
...
* Modified how we do Select2 dynamic drop-down menus to be more secure
As noted by the author of select2, the more-secure way of creating
rich Select-dropdowns is to use jquery to create HTML snippets and
carefully modify text attributes within there. This prevents any
XSS from being brought to the page. As a side-effect, the extra
escaping that we had to do in all of the internal selectlist calls
is now no longer necessary, and has been removed. Rebased and
squashed from the original.
* Rebuilt all assets, but this still feels like it's too much stuff in here.
* Whoops, need to run that in dev, not prod
2021-02-02 15:55:21 -08:00
Ivan Nieto
df4686bc96
Added a clause that lets the function that updates the department to fail gracefully if no dept. name is provided in the CSV passed to the Importer. ( #9078 )
2021-02-02 12:23:36 -08:00
snipe
b6c432a596
One more line of logging for purges
2021-02-02 02:20:30 -08:00
snipe
ef668317a9
Log user initiating a purge
2021-02-02 01:58:50 -08:00
snipe
fdb5b3baf1
Depreciation detail view fixes [ch15776] ( #9059 )
...
* Allow sorting by months for depreciation list view
* Added dataTableLayout to standardize the list display table
* Implement the dataTableLayout() on the list view blade
* Split the view into tabs so we can combine asset depreciations and license depreciations
* Updated depreciation view to use tabbed interface for assets and licenses
* Added asset models to depreciation details page
* Make asset model category sortable
* Added cateory as allowed to be sorted on
* Added category sort scope
* Removed offset variable
* Small fixes to asset modes display in depreciation to bulk edit models
2021-01-27 17:44:05 -08:00
Brady Wetherington
70e6a6ced6
Fix issue where users with edit permission cannot invoke LDAP sync ( #9058 )
...
* Fix issue where users with edit permission cannot invoke LDAP sync
* Make User::class consistent with usage elsewhere in the same directory
2021-01-27 15:36:43 -08:00
Ivan Nieto
6772835efc
Added support for radio buttons in Custom Fields. ( #9053 )
2021-01-27 14:41:58 -08:00
Ivan Nieto
6e83679528
Instead of return a JSON response, redirect back to the previous screen ( #9055 )
2021-01-27 12:01:42 -08:00
snipe
0031fab0fe
Added termination date, depreciation in license column selection [ch14505] ( #9052 )
2021-01-27 01:34:32 -08:00
snipe
9f7f1460e9
Simplified availableForCheckout() on asset
2021-01-26 22:12:24 -08:00
Evgeny
d8bb69533c
To eliminate 12/24hours ambiguity fix. This fix prevents loss of time accuracy. ( #8887 )
...
Its a tiny fix to eliminate 12/24hours ambiguity. Fix prevents time accuracy loss in field "last_audit_date" for assets.
2021-01-26 12:22:59 -08:00
snipe
01d3606c42
Merge remote-tracking branch 'origin/develop'
2021-01-26 12:20:57 -08:00
Vincent Lainé
d6ead5ae17
Added #8931 : add health controller without session ( #8978 )
...
* Added health controller
* Trying to move session middleware to web and api group to have health controller without session
* Fix health route store the session
Co-authored-by: Vincent Lainé <v.laine@dental-monitoring.com>
2021-01-26 12:10:54 -08:00
Ivan Nieto
2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report ( #8989 )
...
* Add 'Last Audit Date/Next Audit Date' filter to custom report
* Added a constraint: cannot require a report with a Last Audit Date in the future.
2021-01-26 12:05:31 -08:00
Ivan Nieto
79549dbfb9
Use the correct env variables in config/auth.php file. ( #9048 )
2021-01-26 12:04:41 -08:00
snipe
a48d09f37e
Fixed non-superadmin gate permissions for kits ( #9029 )
2021-01-26 11:56:42 -08:00
snipe
75a8639a20
Fixed weird checkbox display
...
TODO: fix the 500 on the save
2021-01-12 18:16:42 -08:00
snipe
bbcd215ea4
Suppress OAuth token errors
2021-01-12 08:58:40 -08:00
snipe
e6ba4a423d
Fixed #8721 - duplicate asset tags in select list when asset has name
2020-12-21 13:43:54 -08:00
snipe
cac78cdbf3
Use snipe-logo.png as default in settings seeder
2020-12-21 11:36:43 -08:00
Brady Wetherington
0329028e2c
Fixed #8926 , #8252 - introduce circular reference check for location parent_id - rebased from #8253 ( #8927 )
...
* Fixed #8252 - circular references in location parents
* Remove non-translated translation changes
* Fix typo
* Add loop limit to avoid unforseen infinite loops
* Remove check against parent_id in location controllers
* Remove the Location->id=null piece (no longer needed)
* Fix some formatting and whitespace
* Re-introduce accidentally merged-out language file
Co-authored-by: Travis Miller <milletr@tulsaschools.org>
2020-12-18 17:18:04 -08:00
snipe
5909860c5a
Updated exception handler
2020-12-15 17:25:05 -08:00
Evgeny
bbf7fbcff4
Localization digit separator feature. ( #8915 )
...
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
2020-12-15 11:49:13 -08:00
snipe
45bfec5cd3
Match setup admin on Quickstart password with min reqs for Settings model
2020-12-11 13:52:48 -08:00
snipe
055522510b
Fixed logo in seeder
2020-12-09 08:48:47 -08:00
Johnson Yi
1c4e20c712
Allow saml to be more easily debugged
2020-12-04 21:54:04 +11:00
snipe
71d0e6369e
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-12-02 11:01:10 -08:00
snipe
b27aeb1952
Added LDAP flag in users API for #8741
2020-12-02 11:01:05 -08:00
snipe
bec2b170ec
Only overwrite notes if the LDAP user is new
2020-12-02 11:00:18 -08:00
Brady Wetherington
34d5473553
Fixes 8472 (again) - LDAP sync was assigning a bad default location ( #8846 )
2020-12-01 21:26:52 -08:00
snipe
4ac15daee7
Fixed #8147 - allow webp image format for public file uploads
2020-12-01 19:06:53 -08:00
Brady Wetherington
93cf8d4e0a
Forward-port of the old LDAP sync system ( #8801 )
...
* Forward-port of the old LDAP sync system
* Need to rename the class to avoid classname conflicts
* Make 'classic' LDAP sync not add surrounding parens to filters that already have them
* Re-work Test LDAP button to return 10 sample users
* Remove useless debugging code
2020-11-30 17:11:44 -08:00
snipe
e83bc03d97
Switch backup files array order to show latest first [ch15486]'
2020-11-30 14:46:10 -08:00
snipe
705dd34f3e
Removed older SAML fields
2020-11-27 18:14:32 -08:00
snipe
6cf5426540
Removed unused validation rule
2020-11-25 11:00:28 -08:00
snipe
f475bdbb2d
Fixed #8797 - use html_entity_decode in fullName presenter for User
2020-11-25 08:54:23 -08:00
snipe
820a39cc90
Fixed #8814 - added App\Models\Recipients\AlertRecipient
2020-11-25 01:52:56 -08:00
snipe
72fc03aa50
Adds location to searchableRelations for asset model
2020-11-24 19:49:46 -08:00
snipe
c0d7564658
Fixed #8794 - Switched to firstOrCreate to create parents on import
2020-11-24 16:05:24 -08:00
snipe
973eacf6c3
Small fixes for SAML
...
The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it.
I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)
2020-11-24 13:51:02 -08:00
snipe
b2660002b9
Fixed #8781 - added asset count by status type ( #8806 )
2020-11-24 12:15:07 -08:00
snipe
2c0b9f959b
Comment with possible alternatve to the custom undeleted validator
2020-11-24 12:01:09 -08:00
johnson-yi
0cdd83aabf
Fixes #8584 , #8654 , #8727 - fixes and improvements for saml ( #8795 )
...
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing
* Improve ui of saml sp metadata by displaying it's url and a download button
2020-11-20 18:54:25 -08:00
snipe
8a38b9d018
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-11-20 14:34:35 -08:00
Brady Wetherington
734cb941dd
Fix for #8772 - initial LDAP import of users are deactivated ( #8776 )
2020-11-20 11:11:14 -08:00
snipe
c66f8c04c8
For for deleted user API
2020-11-18 14:57:44 -08:00
snipe
551e28eec9
Fixed #8749 - added more default colors to prevent missing index in pie chart math
2020-11-18 07:06:14 -08:00
Brady Wetherington
8457207c8f
Fix for 500-page on deactivated LDAP user trying to log in ( #8774 )
2020-11-17 22:31:22 -08:00
snipe
2ea805b7ed
Added search/sort by Location OU, added to listing
2020-11-17 22:17:07 -08:00
Brady Wetherington
3dda4c9116
Add a new UAC setting to valid User Accounts for Active Directory ( #8775 )
2020-11-17 19:25:49 -08:00
snipe
0286cf6d46
Prevent license categories from being deleted if there are licenses in that category
2020-11-17 19:22:10 -08:00
Brady Wetherington
de6f3f866f
Attempt to solve LDAP sync overriding administrator choices ( #8742 )
2020-11-17 00:11:00 -08:00
NMC
402fecd408
Fixed #7850 : allow xlsx file. ( #8386 )
...
Thanks!
2020-11-16 21:32:15 -08:00
Brady Wetherington
a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) ( #8757 )
...
* Start work on re-adding back the "Test LDAP logins" feature to develop
* Add back-end method to allow LDAP test users to try to log in.
2020-11-16 21:23:08 -08:00
snipe
fbaf6e2494
Fixed #8747 - upload path for uploaded images
2020-11-16 16:39:02 -08:00
snipe
1f5bcf2475
Added option to download activity report
2020-11-13 16:25:05 -08:00
snipe
052f8e2c42
Addresses - not fixes - #8740
...
More investigation here is needed
2020-11-13 12:34:42 -08:00
snipe
e9578ba8a1
Fixed #8737 - incorrect validation string for components update
2020-11-13 12:09:48 -08:00
snipe
644084658a
Merge remote-tracking branch 'origin/develop'
2020-11-13 04:30:03 -08:00
snipe
08784f9cc5
Make expected_checkin fillable
2020-11-13 03:22:26 -08:00
snipe
a87e615e7f
Fixed #8544 - escaping on maintenance notes
2020-11-12 23:55:16 -08:00
snipe
fc6a33ad38
Added some LDAP debugging - related to #8670
2020-11-12 22:19:16 -08:00
snipe
896ce3456e
Possible fix for #8670 - LDAP users deactivated on login
2020-11-12 22:18:49 -08:00
snipe
9db191f0b2
Fixes for #8732 - Flysystem paths, migrator script
2020-11-12 21:46:06 -08:00
snipe
c7d752fb65
Added S3 url into CSP
2020-11-12 19:50:01 -08:00
snipe
6dccf399a5
Fixed offset issue for #8732
2020-11-12 15:51:31 -08:00
snipe
d537fc5c32
Added linebreak to console confirmation
2020-11-12 15:21:00 -08:00
snipe
9164dda64f
Added artisan command to purge logins
2020-11-12 15:20:15 -08:00
snipe
5ea9c31eab
Removed debugging
2020-11-12 15:14:56 -08:00
snipe
c8572deb5c
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-11-12 15:13:50 -08:00
snipe
57d25ebb20
Fixed #8719 - use same convention for file names on licenses as we do on assets
2020-11-12 15:13:45 -08:00
Dampfklon
be114176a2
Refactor Expected Checkin Notification into markdown and enable translation ( #8236 )
...
Co-authored-by: snipe <snipe@snipe.net>
2020-11-12 15:09:40 -08:00
Dampfklon
4ef11c463c
Enable translations of checkin notifications ( #8235 )
2020-11-12 15:05:57 -08:00
snipe
f0e04ab9e4
Fixed #8726 - disallow archived assets to be checked out
2020-11-12 15:01:13 -08:00
snipe
8a65081768
Possible fix for #8732
2020-11-12 14:47:38 -08:00
snipe
c451fde466
Fixed exception namespace
2020-11-12 14:27:59 -08:00
Anthony Winstanley
cc79bb1449
Exclude blank LDAP attributes
...
Asking for '' attributes is an error for some LDAP servers.
2020-11-12 09:34:28 -08:00
snipe
7f7064c835
Make last_checkout fillable
2020-11-11 13:30:11 -08:00
snipe
7d708572fc
Slightly nicer formatting for query
2020-11-10 07:43:54 -08:00
snipe
ea68ff1284
Sigh. Typo
2020-11-10 06:51:40 -08:00
snipe
66ccf4da03
Merge remote-tracking branch 'origin/develop'
2020-11-10 06:44:10 -08:00
snipe
0b4a13156f
Added more detail and dryrun to assigned_to vs log checker script
2020-11-10 06:43:36 -08:00
snipe
a8a3962008
Merge remote-tracking branch 'origin/develop'
2020-11-10 06:17:04 -08:00
snipe
e110a7b15e
Experimental script to find mismatched IDs based on logs
2020-11-10 06:16:15 -08:00
snipe
30d68309a9
Add ability to checkout an asset if the user it’s assigned_to isn’t valid
...
This would only happen if a merge-users went wonky
2020-11-10 05:06:47 -08:00
snipe
547d1a5a93
Merge remote-tracking branch 'origin/develop'
2020-11-10 04:43:20 -08:00
snipe
a43fb060f4
Throw an error if the asset cannot be updated in the merge
2020-11-10 04:41:40 -08:00
snipe
c607d89817
Merge remote-tracking branch 'origin/develop'
2020-11-10 01:59:18 -08:00
snipe
044dfe2620
Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard
2020-11-10 00:54:39 -08:00
snipe
b7cc12a466
Merge remote-tracking branch 'origin/develop'
2020-11-09 22:53:23 -08:00
snipe
5abfbdd1d2
Allow API token expiration in years to be configured via env
2020-11-09 22:52:55 -08:00
snipe
31bbb2d035
Merge remote-tracking branch 'origin/develop'
2020-11-09 22:43:41 -08:00
snipe
460485d843
Make API tokens expire in 20 years
...
TODO: Make this configurable and report the expiration in the UI
2020-11-09 22:33:43 -08:00
snipe
63a8535de1
Merge remote-tracking branch 'origin/develop'
2020-11-09 19:11:37 -08:00
snipe
148b375ec2
Make 600 a string for ini_set
2020-11-09 19:11:00 -08:00
snipe
b026953190
Merge pull request #8688 from sanjay900/patch-1
...
Fix AD Accounts with delegation disabled
2020-11-09 16:13:13 -08:00
Brady Wetherington
966179290b
Restore the LDAP_TIME_LIM env var for ldap sync of very large directories
2020-11-09 11:11:42 -08:00
Sanjay Govind
ab6d2987a4
Include documentation from @uberbrady
...
Previously on v4 this was all documented, so i have copied that documentation across to v5
2020-11-06 12:31:33 +13:00
Sanjay Govind
45c140814f
Fix AD Accounts with delegation disabled
2020-11-06 12:02:19 +13:00
snipe
4d003ac97a
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# config/version.php
2020-11-03 11:49:34 -08:00
snipe
a8390ce4bd
Removed debugging
2020-11-03 11:45:19 -08:00
snipe
cfc1e1366c
Added new password complexity rules to forgot password
2020-11-03 11:42:42 -08:00
snipe
bbd7a752a0
Minor cleanup
2020-11-02 23:58:49 -08:00
snipe
a66a22ffb2
Updated passwordComplexityRulesSaving() signature so it isn’t nullable
2020-11-02 23:58:37 -08:00
snipe
c800662f0c
Use username for forgotten password
...
Since emails are not required to be unique
2020-11-02 23:57:00 -08:00
snipe
b828985151
Fixed strpos to !== FALSE in ProfileController for complexity eval
2020-11-02 22:28:56 -08:00
snipe
0c2800c7dd
Removed debugging line
2020-11-02 21:26:13 -08:00
snipe
63bb2de4d4
Derp. Check and make sure that setting is actually on
2020-11-02 20:13:54 -08:00
snipe
c4b2ef5660
Removed debugging code
2020-11-02 20:10:18 -08:00
snipe
296655542d
Added comments
2020-11-02 20:07:39 -08:00
snipe
a55694da2f
Added validation to disallow password to be the same as username, email, etc
2020-11-02 20:03:26 -08:00
snipe
6554903aeb
Removed “use slack” debugging code
2020-11-02 17:46:09 -08:00
snipe
502322be4b
Fixed v5 500 server error when requesting multiple [ch15345]
2020-11-02 16:08:38 -08:00
snipe
72facffcbe
Fixed demo settings value for support_footer
2020-10-26 15:09:02 -07:00
snipe
f42bd3a144
Fixed #8613 - Added deleted_at to user API response, added all=true to include deleted and not-deleted in one call
2020-10-26 14:58:45 -07:00
snipe
b9330cf6b1
Fixed #8613 - 500 error on deleted users API call
2020-10-26 14:55:18 -07:00
snipe
2844800caf
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-10-26 14:26:05 -07:00
Brady Wetherington
cce0739bb7
Clean up AdLdap2 integration to better handle paged result-sets
2020-10-26 12:53:45 -07:00
snipe
c93f4ef0d5
Merge remote-tracking branch 'origin/develop'
2020-10-23 19:50:56 -07:00
Brady Wetherington
0eda53c484
Add a new custom validator for Users to prevent someone from managing themselves
2020-10-23 16:55:10 -07:00
snipe
5f82214703
Merge remote-tracking branch 'origin/develop'
2020-10-23 14:24:24 -07:00
Brady Wetherington
d517e2fd61
Merge pull request #8594 from uberbrady/try_to_fix_ldap_oom
...
Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing
2020-10-23 14:23:53 -07:00
snipe
28612d8b61
Merge remote-tracking branch 'origin/develop'
2020-10-23 14:23:46 -07:00
snipe
6ee3d0eb97
Merge pull request #8605 from snipe/fixes/legacy_location_id_equals_zero
...
Fix for legacy location_id=0 issue that can cause failure to checkout/checkin
2020-10-23 14:22:53 -07:00
snipe
2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes
...
Fixes #8462 - move accessory notes into pivot table
2020-10-23 14:19:51 -07:00
snipe
9a1acced58
Fix for legacy location_id=0 issue
2020-10-23 14:00:04 -07:00
snipe
d74df93c48
Merge remote-tracking branch 'origin/develop'
2020-10-23 12:10:13 -07:00
snipe
4ccba5337a
Added https://gravatar address to CSP
2020-10-23 12:09:03 -07:00
snipe
8aae2b46cd
Merge remote-tracking branch 'origin/develop'
2020-10-23 11:56:10 -07:00
snipe
d03d4deef9
Temp fix for #8561 - manager_id validation error
2020-10-23 11:55:53 -07:00
snipe
21ceea0aed
Removed extra debugging
2020-10-23 08:19:04 -07:00
snipe
2219c9ccb5
Merge remote-tracking branch 'origin/develop'
2020-10-23 06:55:39 -07:00
snipe
f2aebe5f9a
Fixed #8558 - error on asset acceptance when no sig is required
2020-10-23 05:09:03 -07:00
snipe
40c0ba9a95
Merge remote-tracking branch 'origin/develop'
2020-10-23 04:46:44 -07:00
snipe
f5a0726f98
Fixed #8597 - Added leading slash to notifications console commands
2020-10-23 04:46:26 -07:00
snipe
88f03e6b55
Added last_checkout and notes from pivot for accessories
2020-10-23 00:44:26 -07:00
snipe
c3e8f64064
Merge remote-tracking branch 'origin/develop'
2020-10-22 23:24:56 -07:00
snipe
68cfbaab2e
Fixed signature issue on accepted assets - related to #8577
...
I have no idea how this ever worked? We didn’t rename that fieldname recently.
2020-10-22 23:20:55 -07:00
snipe
66ac5d05ad
Started migration to normalize note
2020-10-22 23:18:14 -07:00
Brady Wetherington
18012279f9
Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing
2020-10-22 21:51:23 -07:00
snipe
153f849ef7
Merge pull request #8581 from fashberg/iss8580
...
Fixed #8580 : ReportsController called method on NULL Object
2020-10-22 13:00:08 -07:00
Folke Ashberg
377c92a290
update
2020-10-22 14:33:24 +02:00
Folke Ashberg
5824ac3b28
Fix for #8580
...
Checking $asset->depreciation before calling $asset->depreciated_date()
2020-10-22 14:22:42 +02:00
Brady Wetherington
fad0ed6d5b
Add a dirtiness check to slim down JSON LDAP sync summaries
2020-10-21 15:13:36 -07:00
snipe
ec9c69323a
Merge remote-tracking branch 'origin/develop'
2020-10-21 13:58:58 -07:00
snipe
338106734a
Fixed #8562 - manufacturer logo upload failing
2020-10-21 13:57:56 -07:00
snipe
81fcb4c7b3
Merge remote-tracking branch 'origin/develop'
2020-10-21 13:33:04 -07:00
snipe
5ae65d5329
Fixed #8566 - PDF files displaying as ascii instead of downloading
2020-10-21 13:32:46 -07:00
snipe
12ae408830
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# resources/views/auth/passwords/reset.blade.php
2020-10-19 16:40:07 -07:00
snipe
e80b63b5c1
Fixed #8526 - skip cache for setup check
2020-10-19 12:33:38 -07:00
Brady Wetherington
b626b7895a
Ensure misdefined active flags will not prevent user syncing
2020-10-15 19:10:47 -07:00
Brady Wetherington
be4aa07d8c
Some logic bugs in the AD-specific code for logging in via AD/LDAP
2020-10-09 15:33:17 -07:00
snipe
0954ff0659
Fixed lost ldap password on save when nothing entered
2020-10-09 13:08:51 -07:00
snipe
33cf4896d8
Use password complexity rules on password reset
2020-10-08 19:28:21 -07:00
snipe
8a1136d80a
Use password security settings on password reset
2020-10-08 18:43:39 -07:00
snipe
292370b02f
Cleaned up validation
2020-10-08 18:43:23 -07:00
Brady Wetherington
b015cff8bd
Modify Snipe-IT v5 AD handling to use the same ldap_host, and improve OU handling
2020-10-06 18:31:06 -07:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07:00
snipe
98b9ee9b25
Only save LDAP settings if not in demo mode
2020-09-25 18:38:26 -07:00
snipe
01548ba39d
Add ad_append_domain to settings controller
2020-09-25 18:27:22 -07:00
snipe
da9896b59a
Remove SAML settings on demo reset
2020-09-24 19:13:31 -07:00
snipe
b508482441
Merge pull request #8438 from snipe/features/nicer_slack_ui
...
Nicer slack settings UI
2020-09-16 12:29:58 -07:00
snipe
81548e581d
Fixed #8443 - wrong value for array_key_exists on location import
2020-09-16 11:45:47 -07:00
snipe
ed3afd1e2e
Removed debugging
2020-09-15 23:19:52 -07:00
snipe
7736f12eb4
Switch to Guzzle for the Slack test
2020-09-15 23:05:27 -07:00
snipe
b1dda88c9d
Removed SlackTest notification
2020-09-15 23:05:05 -07:00
Ivan Nieto
501d5680ea
Fix [ch15188] 500 error
2020-09-15 03:51:10 -05:00
snipe
52848ca8d8
Fixed checkin/checkout notification crashing
2020-09-11 16:10:18 -07:00
snipe
a91e81fc42
Added checkin_email to category listing
2020-09-11 16:06:38 -07:00
snipe
514e7ca072
Added boolean has_eula to categories
2020-09-11 16:05:42 -07:00
Brady Wetherington
f3f7d714a6
Fix ldap test button for php 7.4 (suppressing errors)
2020-09-09 14:18:05 -07:00
snipe
cb5104c27d
Hopefully fixes #8418 - migrations on new install go wonky because of LDAP service provider
2020-09-08 21:13:24 -07:00
snipe
10648de9af
Bulk Checkin and Delete also edit users [ch15107]
2020-09-04 16:02:25 -07:00
snipe
1bea83ee5a
Fixed missing setting call
...
This is still broken further down the line in the event handler for license checkin, but this gets us closer
2020-09-04 15:44:37 -07:00
snipe
5f5b80acae
Added maintained and reassignable to license listing
2020-09-04 10:02:04 -07:00
snipe
69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller
2020-09-03 19:47:15 -07:00
snipe
249b9b7509
Fixed [ch15086] - [object object] in companies date displays
2020-09-03 19:40:17 -07:00
Ivan Nieto
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
snipe
8ec99ff433
Merge pull request #8374 from snipe/fixes/moar_flysystem
...
WIP - More Flysystem fixes
2020-08-31 09:45:27 -07:00
snipe
f2c60d055b
Updated docblock
2020-08-28 18:22:57 -07:00
snipe
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
snipe
5aaa2430b4
Fixes for backups
2020-08-28 14:10:43 -07:00
snipe
bc5a82e734
Small fixed for file mover artisan command
2020-08-28 14:10:28 -07:00
snipe
c23e28d0df
Merge pull request #8372 from snipe/fix_adldap_sync
...
Fix adldap sync
2020-08-26 13:34:07 -07:00
snipe
5abd85003c
Merge pull request #8371 from snipe/bushelpowered-develop
...
Fixed #7919 - LDAP Logins + query filters
2020-08-26 13:33:41 -07:00
Brady Wetherington
67a1d2fa5f
Remove hardcoding of LDAP Auth query to 'uid=', use setting instead
2020-08-26 12:25:10 -07:00
snipe
24be73f76b
Use image handling request for logo uploads
2020-08-26 12:17:50 -07:00
snipe
a86dc52695
Added fieldname to file name for better clarity on setting logos
2020-08-26 12:17:36 -07:00
snipe
1ff7e6b834
Use Storage facade for user presenter
2020-08-26 12:17:18 -07:00
snipe
fa2dfc3e87
Use updated request signature for models
2020-08-26 11:59:30 -07:00
snipe
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
snipe
139c874308
Fixed delete old image on upload
2020-08-26 02:48:07 -07:00
snipe
db385b5f6b
Fixed assetmodels selectlist
2020-08-26 02:32:39 -07:00
snipe
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe
de21f00771
Fixed assetmodels upload
2020-08-26 02:29:37 -07:00
snipe
37568ae9ec
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
...
Fixed #8338 - Added google maps to CSP
2020-08-25 20:49:37 -07:00
snipe
32ad9050cf
Added google maps to CSP
2020-08-25 20:48:53 -07:00
snipe
3c6883489c
Added assignedTo scope
2020-08-25 20:37:30 -07:00
Brady Wetherington
6c23e881c7
Merge branch 'develop' of https://github.com/bushelpowered/snipe-it into bushelpowered-develop
2020-08-24 21:42:04 -07:00
Brady Wetherington
b721a977c0
Fix PHP 7.4 deprecation warnings in ldap-sync script.
2020-08-24 21:35:00 -07:00
snipe
e5dd6035b9
Fixed the other upload handleUploads signatures
2020-08-24 18:32:40 -07:00
snipe
66686f8080
Added some debugging - will remove at RC
2020-08-24 18:32:15 -07:00
snipe
041fc20955
Fixed Companies and Categories uploads
2020-08-24 15:43:11 -07:00
snipe
b97ff4e907
Fixed Depts uploads
2020-08-24 15:10:26 -07:00
snipe
5aeac3c9e0
Fixed parse error
2020-08-24 14:30:43 -07:00
snipe
bcad49ce79
Try to better handle slack “too many requests” issue
2020-08-14 16:10:22 -07:00
snipe
b5acca89d7
Check for admin for slack notifications
2020-08-14 16:02:15 -07:00
snipe
e52919cf1b
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
...
Checkin license from all users cli tool
2020-08-14 15:35:15 -07:00
snipe
29f3a5c48f
Use more verbose annotation for Auth::user if/else
2020-08-14 15:27:40 -07:00
snipe
134e8e6fb9
Moved user email nulling until after the save
2020-08-14 15:25:07 -07:00
Brady Wetherington
4b7f6a95e3
Fix deprecation report for customers with many active assets
2020-08-14 15:07:59 -07:00
Brady Wetherington
5128992940
Fix deprecation report for customers with many active assets
2020-08-14 15:03:03 -07:00
snipe
0291323502
Use the user as the target
2020-08-14 14:57:58 -07:00
Brady Wetherington
262a964760
[WIP] fix ldap-sync for v5 with AdLdap2
2020-08-14 14:45:05 -07:00
snipe
e0f6f9b839
Artisan command to check in licenses from all users
2020-08-14 14:43:37 -07:00
snipe
f1a6308002
Check for Auth::user before trying to log id (for cli)
2020-08-14 14:43:07 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
Brady Wetherington
799c059070
Add internationalized version of LDAP error message
2020-08-11 16:39:02 -07:00
Brady Wetherington
c62d43a778
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
2020-08-11 16:39:02 -07:00
Brady Wetherington
e0644dbbf6
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
...
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
2020-08-10 17:22:31 -07:00
snipe
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
snipe
9a39cf721e
Merge pull request #8258 from ballertv/features/consumable-api
...
This looks great, thank you!
2020-07-31 12:18:49 -07:00
snipe
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-07-31 11:01:35 -07:00
Brady Wetherington
7410b16835
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
...
Add new useraccountcontrol value for valid AD users
2020-07-24 16:22:44 -07:00
andres
8994f3e15e
cleanup
2020-07-22 19:57:06 -04:00
andres
d23f1a77ca
implement checkout API
2020-07-22 19:56:31 -04:00
snipe
e955c983a3
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
...
Added address, city, state and country to importer and city to bulk editor
2020-07-22 13:43:29 -07:00
Brady Wetherington
b09e7d19b3
Add new useraccountcontrol value for valid AD users; document algorithm and values
2020-07-22 13:32:16 -07:00
Godfrey M
20c9ae5818
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
2020-07-22 10:21:19 -07:00
snipe
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
snipe
c17a06792a
Added address, city, state, country to user importer
2020-07-21 16:49:38 -07:00
snipe
4f76cc6cfb
I don’t actually know what this file is for
2020-07-21 16:46:13 -07:00
snipe
799a93c46a
Allow for email/username search on users
2020-07-17 12:11:32 -07:00
snipe
897757bd04
Removed added line for location
2020-07-16 17:43:44 -07:00
snipe
c7125c3937
Set location_id to rtd_location_id on asset creation
2020-07-16 16:34:39 -07:00
snipe
5320f5c67c
Disallow non-super users from editing their own permissions
2020-07-13 21:16:45 -07:00
Sean Borg
567a9639f4
Enhanced #5762 Able to bulk edit expected checkin date
...
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
2020-07-10 19:21:34 +01:00
Sean Borg
3d8823ede5
Added #5762 Modify expected checkin dates
...
It is now possible to edit expected checkin dates for assets in Actions > Edit Asset
2020-07-10 19:21:04 +01:00
snipe
dbbb7680d9
A few more fixes for the cli
...
Do not check out a piece of software if it’s already been checked out to the user
2020-07-09 21:12:50 -07:00
snipe
cf0dd5bbad
Small fixes for cli tool
2020-07-09 20:43:13 -07:00
snipe
89d433b41a
Removed duplicate seat call
2020-07-09 20:26:02 -07:00
snipe
e2570ada6f
CLI tool to checkout a license to ALL users
2020-07-09 20:04:05 -07:00
snipe
45afe725a1
Only try to get the company if there is an auth’d user
...
(Needed for command line tools, where no Auth::user() is present)
2020-07-09 20:03:47 -07:00
snipe
cc9f1577a4
Removed unused use directives
2020-06-25 17:43:53 -07:00
snipe
ab1fe8be0c
Added merge utility
2020-06-25 17:42:39 -07:00
snipe
339bdddc38
Fix for Vue js not loading due to CSP :(
2020-06-25 11:00:33 -07:00
snipe
35b9cf4b70
Fixed missing db prefix on scopeDueOrOverdueForAudit
2020-06-23 02:41:59 -07:00
snipe
7ccb41371e
Removed unoptimized images directive
...
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
2020-06-23 01:09:39 -07:00
snipe
2e60a457bf
Dumb fix for feature-policy being dumb.
2020-06-23 01:07:00 -07:00
snipe
00b051b8c7
Added a few more comments
2020-06-23 00:26:09 -07:00
snipe
05b3a9ad7e
Config variable for HSTS
2020-06-22 23:17:27 -07:00
snipe
4fb880384f
Changed comment
2020-06-22 22:37:14 -07:00
snipe
43042ad841
Consolidated ReferrerPolicy into new SecurityHeaders file
2020-06-22 22:35:59 -07:00
snipe
a716382ac4
Removed CSP middleware (it’s added in the general header)
2020-06-22 22:33:37 -07:00
snipe
36c8f7f4f1
Additional security headers
2020-06-22 22:31:01 -07:00
snipe
946129f206
Made quote style consistent
2020-06-22 20:45:20 -07:00
snipe
d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields
2020-06-22 20:29:19 -07:00
snipe
2ac1c1636c
Better handle the logic to determine if we should display the license checkout blade
2020-06-16 16:12:57 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
Peter Upfold
004ecad059
Force suppress deprecation warning on ldap_control_paged_result()
2020-06-03 08:59:50 +01:00
snipe
1267c68f28
Removed barcodes from S3 uploader
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 19:56:18 -07:00
snipe
262eb79471
WIP - this needs refactoring
...
We have to use Storage::get() if the filesystem is local, since the method does a file_get_contents() and the file isn’t accessible via a URL since it’s private and doesn’t live on the web root. (We do this slightly differently than Laravel out of the box)
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 01:59:01 -07:00
snipe
8ccc1c6515
Fixed weird merge in Bulk Users Controller
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 22:46:42 -07:00
snipe
d54acd908c
Made logo file have a better name for multiple tries in the same day
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 02:31:04 -07:00
snipe
d14ab7e3e1
Porting change from #8053 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 00:22:44 -07:00
snipe
f196b5bd94
Merge pull request #8077 from dmeltzer/more-paving
...
Sync paveit command with new database tables.
2020-05-26 21:18:22 -07:00
snipe
e0d9cc4e73
Merge pull request #8053 from CharlotteDunoisLabs/fix-gravatar
...
Take gravatar email into account in presenter
2020-05-26 19:58:45 -07:00
snipe
dee1f5ec35
Merge pull request #8078 from dmeltzer/wrong-id
...
Fix incorrectly named parameter.
2020-05-26 19:51:38 -07:00
Daniel Meltzer
b3fe47bfa7
Remove/Reorganize logic to make codacy happier.
2020-05-23 15:24:10 -04:00
Daniel Meltzer
1e5d40f32e
Clean up extra code in notifications files.
2020-05-23 15:24:10 -04:00
Daniel Meltzer
f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense.
2020-05-23 15:24:10 -04:00
Daniel Meltzer
136df9418f
Deadcode--
2020-05-23 15:24:10 -04:00
Daniel Meltzer
7ea862787c
Refactor controller to use one method that shows all modals based on name.
2020-05-23 15:24:00 -04:00
Daniel Meltzer
25d6ceee6e
Remove old code.
2020-05-23 12:18:27 -04:00
Daniel Meltzer
4fef065010
Refactor big switch to lookup in array. A bit cleaner/codacy happier.
2020-05-23 12:17:56 -04:00
Daniel Meltzer
fe74394ae6
Short circuit checkout logic to prevent iterating if we're not checking out to an asset
2020-05-23 11:48:02 -04:00
Daniel Meltzer
c70bd62a0f
Missing includes. Fix by using the request object instead of facade.
2020-05-23 11:36:16 -04:00
Daniel Meltzer
ad1db2c640
Fix incorrectly named parameter.
2020-05-23 10:26:56 -04:00
Daniel Meltzer
2e936a9883
Sync paveit command with new database tables.
2020-05-23 09:08:32 -04:00
snipe
f88683766b
Roll back previous change
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-14 00:55:47 -07:00
snipe
e4385c0f8c
Fixes #8051 regression
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-14 00:48:30 -07:00
Charlotte Dunois
7f8c6fe282
Take gravatar email into account in presenter
2020-05-13 20:30:47 +02:00
Daniel Meltzer
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
Daniel Meltzer
e4888b23e2
Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out.
2020-05-12 14:38:20 -04:00
snipe
274f82893f
Regenerate session ID on logout
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 10:38:00 -07:00
snipe
0550fe0ffa
Fix for session fixation vulnerability
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 10:31:54 -07:00
snipe
730632e2eb
Apply PR #8043 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 22:57:55 -07:00
snipe
95cc48e422
Added option to disable backup in import
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:41:10 -07:00
snipe
bb42109c0c
Added a clarifying comment
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:10:45 -07:00
snipe
b9e821c0e6
Small fix for Group Functional Tests
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:07:14 -07:00
Johnson Yi
3d8fce50d0
Removed unnecessary default saml settings
2020-05-09 01:51:48 +10:00
Johnson Yi
c1c37d521c
Allow downloading sp metadata without idp
2020-05-06 19:50:50 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
85712a1960
Only override fieldset_id with custom_fieldset_id if it’s present
...
This is mostly to support prior versions. I have NFC why we did this in the first place. I’m sure I had a stellar reason, but couldn’t tell you what it is today.
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 20:59:42 -07:00
snipe
e9cb17394c
Small validation fix on reset password
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 19:10:07 -07:00
snipe
8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes
...
Component checkout/checkin fixes.
2020-04-30 17:49:22 -07:00
snipe
b488cffc7e
Merge pull request #8006 from dmeltzer/api-test-fixes
...
Test fixes pt 2.
2020-04-30 17:46:25 -07:00
snipe
8bb3c01f78
Addressed merge issue for reset password for #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:45:05 -07:00
snipe
82e02490fd
Removed duplicate update method (per #7997 )
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:23:56 -07:00
Daniel Meltzer
441049d8ac
Sort license seats by their number only, making the sort order more logical
2020-04-30 10:34:30 -04:00
Daniel Meltzer
b28a4f3108
Add component unit test and unify some validation.
2020-04-30 09:50:12 -04:00
Daniel Meltzer
68224757f4
Validate when editing the quantity of a component that the new quantity is > the amount checked out
2020-04-29 13:25:04 -04:00
Daniel Meltzer
358609720a
Component checkout/checkin fixes.
...
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
2020-04-29 12:50:09 -04:00
Daniel Meltzer
1f8c3cc670
Test fixes.
2020-04-29 11:03:07 -04:00
Daniel Meltzer
f8d18a8eb0
Revert asset-checkout-different validation.
...
This was causing issues when trying to check an item out to a user or a
location because of the way laravel handles validation.
Instead, rely on the exception check we had in the controller. I moved
this exception up to the model checkout method so that it would work
for anywhere that that method was called, even if it avoided the
controller.
2020-04-29 10:59:00 -04:00
Daniel Meltzer
05187eb27f
Fix Functional Tests.
2020-04-28 11:39:53 -04:00
Daniel Meltzer
c74b904f14
Fix Location parent different validation on new location creation.
2020-04-28 11:39:52 -04:00
snipe
412caebf69
Fixed logo uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:22:52 -07:00
snipe
6847a331a7
Backport the column icon fix from master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 05:55:38 -07:00
snipe
e009fbe59f
Converted table heading icons in People to CSS glyphs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:04:53 -07:00
snipe
5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:47:19 -07:00
snipe
bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:39:32 -07:00
snipe
f66ce02756
Added debugging logs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:46:02 -07:00
snipe
c7b300a50d
Updated LDAP sync controller to use new Adldap2 connections
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:45:44 -07:00
snipe
c9ed205bb0
Added @throws to documentation
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 14:41:37 -07:00
snipe
cdd0e405be
Fixed weird merge
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:12:29 -07:00
snipe
b725e788ec
Applied new selectlist search to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:39:41 -07:00
snipe
fa5134603f
Added type casting and a few more validation rules
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:37:40 -07:00
snipe
69a1732245
Removed duplicate form request in asset models controller
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:51:10 -07:00
snipe
7e9e5214ef
Fixed status label create error
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:50:43 -07:00
snipe
7a33e335d4
Fixes PSR autoloading issue
2020-04-21 20:15:24 -07:00
snipe
c02adace61
Ensure at the model level that location.id/user.id and location.parent_id/user.manager_id cannot be the same
2020-04-21 19:51:20 -07:00
snipe
5dc64ea91b
Re-added EasySlugger to fix tests
2020-04-21 19:28:24 -07:00
snipe
29b05d2020
Fixed syntax error in image upload request from mangled merge
2020-04-21 06:29:57 -07:00
snipe
066e5588b5
Fixed slugging in custom fields to no longer use old library
2020-04-21 04:14:23 -07:00
snipe
c17106d1b3
Fixes for settings controller
2020-04-21 04:08:25 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
154db9a416
This literally never fucking worked. Ever. Shoot me.
2020-04-09 22:20:05 -07:00
snipe
cf9d0201e0
Catch weird edge case where target wouldn’t have an ID (?!)
2020-04-09 20:23:02 -07:00
snipe
5707df0239
Check that location isset in checkout
2020-04-09 18:32:34 -07:00
snipe
197a84be94
Commented out rtd_location_id override - why did we do that?
2020-04-09 14:17:39 -07:00
snipe
b4fa4c77d7
Check for rtd_location_id before trying to assign
2020-04-09 14:14:30 -07:00
snipe
cfec142c3b
Better handle models without a fieldset in the asset request [RB 9935]
2020-04-09 11:18:54 -07:00
snipe
f8a72db696
Changed LDAP 600 to 500, clearer error messages on LDAP test
2020-04-09 09:55:44 -07:00
snipe
206bd675f2
Pulled slack validation out of setting model validation so it doesn’t fail mysteriously on other pages
2020-04-08 15:07:02 -07:00
snipe
a0f7fdc57a
Merge branch 'fixes/accessibility_fixes'
...
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
2020-04-08 11:19:42 -07:00
snipe
79232fc434
Fixed #7947 - Added rtd_location_id to API search
2020-04-08 11:00:04 -07:00
snipe
0b3f511534
Fixed compact() errors
2020-04-07 17:26:56 -07:00
snipe
893944403e
Check for location_id being set before trying to set it on checkout via API
2020-04-06 15:54:40 -07:00
snipe
d7873f257d
Fixed CSP for importer
2020-04-06 14:18:45 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
e7c1418314
Fixed possible typo in CSP
2020-04-01 19:47:42 -07:00
snipe
4dcc1ffdbc
More form labels
2020-04-01 02:22:24 -07:00
snipe
7d466f3584
Update user uploads for more data to work with recport
2020-04-01 02:22:16 -07:00
snipe
6174f9b93f
Check that there is actually a filed ID submitted
2020-04-01 01:25:31 -07:00
snipe
a467a6999e
Use upload modal
2020-03-31 22:50:07 -07:00
snipe
f0ef06ebe1
Added more alt tags
2020-03-27 15:35:29 -07:00
Jared Biel
bbeb51461f
Fix LDAP logins
2020-03-24 16:27:14 -05:00
snipe
6066c249d5
Moved gate to the top of the method
2020-03-06 16:01:13 -08:00
Ivan Nieto
025ea93f05
Fix for when a user with the correct permissions couldn't update Manufacturers. ( #7882 )
...
* Changed the ability name from 'edit' to 'update'. Changed the order of execution: first checks if the manufacturer exists, then checks permissions
* Handles the update method, that also has the ability parameter as edit instead of update"
q
* Revert "Handles the update method, that also has the ability parameter as edit instead of update""
This reverts commit d7dc0e451e
2020-03-06 15:59:51 -08:00
snipe
54fd8f81ff
Added permissions on user api ( #7883 )
...
* Add permissions to user edit API
* Add user permissions on user create/update API endpoint
2020-03-06 15:28:46 -08:00
snipe
ca43554327
Fixes search by serial or tag even if they have slashes in them ( #7879 )
...
* Fixes search by serial or tag even if they have slashes in them
* Added support for url param byTag and bySerial
* Fixed typo comments
* Sojme additional comments to clarify use-cases
* Updated comments for clarity
2020-03-06 14:55:20 -08:00
snipe
039f5da0e1
Add image upload to user edit [ch10508] ( #7877 )
...
* Use correct Request include
* Updated to use additional form request
* Added SVG sanitizer
* Added response method to form request
* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete
* Fixed upload path for avatars
* Added fieldname variable to blade partial for image upload
* Added enctype="multipart/form-data" to form to allow uploads
* Added image field
* Updated Request::old() to use $request->old()
* Fixed derp in edit blade referring to $item when it should be $user
* Added svg+xml to image rule
2020-03-05 18:00:24 -08:00
snipe
8b2f8ef3cb
Spelling is hard :(
2020-03-04 22:19:59 -08:00
snipe
15518852aa
Added validation to reject email addresses over 250 characters
2020-03-04 22:08:07 -08:00
snipe
663c0f3713
Fixed typo
2020-02-11 22:09:46 -08:00
snipe
dfb9e430fa
Removed debug line
2020-02-11 22:09:37 -08:00
snipe
c33970e3e3
Added timestamp to uploaded files so they are unique and don’t overwrite
...
Laravel 6 now does this automaically, so we should switch to their way
2020-02-11 20:19:59 -08:00
Godfrey Martinez
0e0fe967e4
BadMethodCallException Method update does [ch10544] ( #7804 )
2020-02-10 19:27:23 -08:00
snipe
192917cc84
Slightly better fix for requestable import bug
2020-02-10 17:34:32 -08:00
snipe
60b271c6a8
Use import instead of direct model call
2020-02-10 12:36:40 -08:00
snipe
81880645ed
Possible requestable fix
2020-02-10 11:40:39 -08:00
snipe
9eb4b0dda7
Disallow 0 as a number for labels per page
2020-02-04 19:14:58 -08:00
snipe
2f0ed129f0
Use “invalid barcode” image and suppress errors when barcode format is wrong
2020-02-04 18:15:01 -08:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
snipe
3361b859c0
Changes offset to use the actual item count as override instead of 0 ( #7788 )
2020-02-04 12:32:24 -08:00
bigtreeEdo
e27a9b137b
added 'requestable' to fillable attributes. ( #7787 )
2020-02-03 19:37:03 -08:00
snipe
89e2a3ae3c
Fixed #7752 - reformat /api/v1/users/me to use transformer
2020-01-30 13:12:43 -08:00
snipe
5f85d8132b
Fix for weird JSON parsing in actionlogs ( #7753 )
...
* Fix for weird JSON parsing in actionlogs
* Removed debugging code
* Check for the meta array
(If no fields, no array)
2020-01-24 17:31:43 -08:00
snipe
56582614b6
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-01-22 16:07:46 -08:00
Ivan Nieto
313cacdb71
Select Import File fails in Develop [ch10598] ( #7718 )
...
* Delete an unused import, then replace a deprecated facade with the needed one for uploading files
* Added the needed use for the Request Facade
2020-01-17 16:12:51 -08:00
Ivan Nieto
75bf8f3d58
Remove not existent variable 'id' in the redirect causing [ch10602] ( #7732 )
2020-01-17 16:12:24 -08:00
snipe
324da7c0c8
Include correct license, asset, etc count on user show API call
2019-12-19 18:09:53 -08:00
snipe
779fc6d195
Added license endpoint for users
2019-12-19 18:00:36 -08:00
snipe
159acf6788
Removed extra space
2019-12-19 17:47:50 -08:00
Colin McNeil
db59106c3e
Move ldap import ini settings to config ( #7679 )
2019-12-19 11:51:55 -08:00
snipe
94ce8cad64
Make sure $user->item exists before trying to count on it
2019-12-11 14:43:46 -08:00
snipe
4d38c44a93
Fixed groups request
2019-12-11 11:26:58 -08:00
snipe
c31e150935
Use $request->input over Request::get()
2019-12-11 11:09:54 -08:00
snipe
a5b180a9c6
Fixed Call to a member function count() on null for location delete
2019-12-11 10:46:07 -08:00
snipe
a8bbb951bc
Use Request instead of Input
2019-12-10 22:05:49 -08:00
snipe
df778cdb80
Include storage in use statements
2019-12-10 22:03:15 -08:00
snipe
d7c51f1a2c
Added Request to use statements
2019-12-10 20:39:29 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
88fb1370f0
Added slightly friendlier error handling for assets without models
...
This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.
2019-12-06 18:17:03 -08:00
snipe
ff57f10e9f
Fix for searching on child location names ( #7646 )
...
* Fix for child locations
* Reverts temp changes to indenter
2019-12-06 13:14:10 -08:00
Ivan Nieto
9291e3ada3
Added a validation to Transformers/LocationsTransformer.php:transformLocations() in case location doesn't have children location ( #7640 )
2019-12-06 11:42:36 -08:00
Yorick Terweijden
2a6a381bc7
Return real Asset error ( #7054 )
2019-12-06 11:07:12 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
herroworrd
3fbfb0c658
Add requestable to asset model api results ( #7577 )
...
Nice, thanks!
2019-12-06 10:33:06 -08:00
Lorenzo P
7225b53986
fix syntax error in CustomFieldsetsController::show() ( #7595 )
...
That someone was probably me :D Thanks for this, good catch!
2019-12-06 10:31:00 -08:00
snipe
e71e57f16a
Fixed XSS vulnerability in SVG image uploads [ch10476] ( #7639 )
...
* Added enshrined/svg-sanitize
* Added modular image resizing/SVG cleaning method
(This already exists in v5, so I mostly ported it forward and added the SVG sanitizer.)
* Use improved handleImages method to upload/resize/clean images
* Removed $old_image
This is handled in the ImageUpload request now
2019-12-05 22:23:05 -08:00
snipe
ff8d98c97c
Update child assets to reflect asset parent location ( #7458 )
2019-12-04 16:19:25 -08:00
snipe
04cf8d7fbf
Removed Helper reference since it’s autoloaded
2019-12-04 15:56:55 -08:00
snipe
c635db0a76
Fixed upload parh for asset models
2019-12-04 15:23:49 -08:00
snipe
704c696711
Fixed parse error in settings controller
2019-12-04 14:54:36 -08:00
snipe
2fbbe430b5
Removed escaping on custom fields in presenter ( #7631 )
2019-12-03 17:42:13 -08:00
Godfrey Martinez
f0af750b0a
Fixed comment ( #7617 )
...
* Set theme jekyll-theme-hacker
* fixed commenty about scopebyDeprecationID being identified as a method to location ID
* fixed commenty about scopebyDeprecationID being identified as a method to location ID
2019-11-22 16:13:42 -08:00
snipe
88cf456386
Adding Dept to license seats ( #7609 )
...
* Adding Dept to license seats
* Added query scope to order by department
* Make license seat department sortable
* Disable license seat internal search - this never actually worked
2019-11-21 22:03:56 -08:00
snipe
dd40ddf5a5
Fixed an error on audit due list when no audit_warning_days had been set [ch9764]
2019-11-21 21:34:41 -08:00
snipe
5065164c40
Bumped Carbon version
2019-11-21 13:14:18 -08:00
snipe
8127fdc5bc
Min password requirement set to 8 characters
2019-11-18 21:17:51 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
snipe
957c7f4e79
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-11-18 19:01:35 -08:00
snipe
a73fd24695
Fix maintenances permissions check to allow users who can edit assets to edit maintenances
2019-11-08 17:02:17 -08:00
snipe
0290257734
Limit license seats to 999 to prevent latency
2019-10-28 13:48:18 -07:00
Marián Skrip
53eae6fbfd
Fix issues with update permission naming ( #7493 )
...
This solves an issue when admin would be able to create and delete
categories but not edit them.
2019-10-28 11:44:48 -07:00
Alexandr Hacicheant
a90149940a
Update UsersController.php ( #7528 )
...
Returned missed bracket after merge master to develop
2019-10-28 11:43:29 -07:00
snipe
4fe689dc5d
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-10-21 15:45:17 -07:00
snipe
0769f585ea
Disallow locations from being their own parents
2019-10-21 15:45:05 -07:00
snipe
04562e6d4a
Added 4260352 to ldapsync enabled account constraint
2019-10-18 17:48:50 -07:00
snipe
22d2ad9248
Fixes nested location selectlist ( #7483 )
...
* Rename child locations method
* Use Ajax dropdown for locations selectlist for edit/create
* Removed locations database call on edit/create blades for faster loading
* Updated locations controller to use the new iterator
* Increase pagination on locations controller to 500
We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.
* Fixed the else to make codacy happy
* Improve the design and performance of the nested location selectlist (#7484 )
* Improve the design and performance of the nested location selectlist
* Fixed parse errors
* Removed debugging code/comments
2019-10-02 03:56:56 -07:00
snipe
6deb26fafe
Remove unused variable
2019-09-30 19:37:52 -07:00
snipe
6c1de7ff05
Apply fix for #6642 to master
2019-09-30 19:21:57 -07:00
snipe
ab05a44e0b
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-09-30 19:18:54 -07:00
snipe
7f5f4a1297
Added softwarew support and hardware support to maintenance types
2019-09-24 01:34:23 -07:00
snipe
c68c0e1208
Account for limit if none is passed in the request
2019-09-03 20:28:49 -07:00
snipe
c256536d21
Math is hard
2019-09-03 14:29:58 -07:00
snipe
b8f7cd81eb
Limit API request results per page ( #7405 )
2019-09-03 14:02:08 -07:00
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07:00
snipe
b381528668
Added console rekey tool ( #7330 )
...
* Removed console command specifications, since they’re pulled dynamically now
* Added rekey console command
* Removed unused code
* Comment clarifiction
* Handle LDAP password
2019-09-03 11:03:32 -07:00
Logan Swartzendruber
4c8b26f732
Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. ( #7388 )
...
* Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view.
* Add conditional for including the asset number in the URL of the barcode image.
* Change case of variables to pass Codacy PR review standards.
2019-09-03 11:02:55 -07:00
Rick Heil
7b0b28aed0
Add #7393 - next_audit_date set on asset creation if an audit interval is configured in settings ( #7394 )
2019-09-03 10:58:51 -07:00
snipe
6d66d7e215
Removed withErrors on JSON response
2019-08-22 21:36:47 -07:00
snipe
0544164015
Fixed Eloquent Builder path in docblock
2019-08-20 18:10:36 -07:00
snipe
b6a188a87b
Removed erroneous linebreak
2019-08-20 18:10:21 -07:00
snipe
b5bf8e9a37
Smaller chunking for custom report, add max_execution_time
2019-08-15 06:14:25 -07:00
snipe
da52511bf9
Use asset tags
2019-08-14 23:13:23 -07:00
snipe
c5e6f06e9b
Revert import history to master version to fix errors
2019-08-14 22:27:17 -07:00
snipe
6db915b7f0
Removed serialize duplicate
2019-08-14 22:22:50 -07:00
snipe
a6d486ea8a
Fix invalidJSON exception
2019-08-14 22:18:48 -07:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
8b4a9aa382
Fixes to history importer
2019-08-13 18:15:42 -07:00
snipe
99cd552d5c
History importer fixes
2019-08-13 18:00:21 -07:00
snipe
e7b0ee2539
Added accessories checkout/checkin API endpoint
2019-08-02 15:08:26 -07:00
snipe
1608dba7dd
Commenting again?
2019-07-31 14:29:19 -07:00
snipe
c593b3645c
Added comments to the ByFilter query scope for clarity
2019-07-31 14:24:01 -07:00
Ivan Nieto
28ae90fa8a
Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database ( #7317 )
2019-07-31 13:55:21 -07:00
Ivan Nieto
f407b86aa8
Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database ( #7318 )
...
💥 Nice work, Ivan!
2019-07-31 13:54:55 -07:00
snipe
3dc2cc9f22
CORS for api ( #7292 )
...
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
2019-07-26 12:38:31 -07:00
snipe
ab86e42b2e
Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
2019-07-26 12:37:38 -07:00
snipe
250a797339
Fixed #7250 - permission issue for API fieldsets and fields endpoints
...
This applies the change from #7294 to master
2019-07-24 11:00:42 -07:00
Marián Skrip
8a1f6b74e8
Fix permission issue for API fieldsets and fields endpoints ( #7294 )
...
Close snipe/snipe-it#7250
2019-07-24 10:57:09 -07:00
snipe
74e647fea7
Apply fix from PR #7273 to master
2019-07-18 14:37:48 -07:00
snipe
55ee90b25d
Fixes #7252 form request changes ( #7272 )
...
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
2019-07-18 14:32:23 -07:00
snipe
eec445fcf5
Command to fix custom field unicode conversion differences between PHP versions ( #7263 )
2019-07-18 14:30:18 -07:00
Ivan Nieto
af1857b6ee
Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] ( #7273 )
...
* Added propper routes to the controller
* Logic to handle the not setted ->audit_warning_days variable
* Change the variable name for more clarity
* Got rid of the unnecesary if sentence in sake of brevity
* Adding the null coalesce operator so it can properly handle when the setting is null
2019-07-18 14:08:55 -07:00
snipe
cef22c3158
Caps asset warranty to 20 years
2019-07-18 09:49:58 -07:00
snipe
444e250609
Fixed countable() strings on user destroy
2019-07-17 17:51:13 -07:00
snipe
15bfd07f30
Cap warranty months to three characters
...
Filles rollbar 209
2019-07-17 12:13:15 -07:00
snipe
b4b6d6b571
Comment clarification on #7186
2019-07-15 15:31:09 -07:00
snipe
8c73a47afb
Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
2019-07-15 15:27:02 -07:00
snipe
f82ffe378c
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-07-15 14:11:18 -07:00
snipe
984c2a8fd4
Better log message for bad LDAP connection
2019-07-15 14:10:57 -07:00
Ivan Nieto
d409be6d43
Fix #6910 : Add logic to manipulate the eloquent query. ( #7006 )
...
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
2019-07-15 13:02:44 -07:00
Thomas Misilo
e1b33f3087
Spelling Correction ( #7206 )
...
Fixed Spelling for the word reqrite, to be rewrite.
2019-06-27 18:33:13 -07:00
Kasey
03a4512406
fixing previous commit's actual wiping of password ( #7183 )
...
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
2019-06-19 14:21:53 -07:00
snipe
de992e4df3
Fixed LDAP password blanking on save
2019-06-14 17:20:37 -07:00
snipe
a85251aa83
Fixed #7164 - change table name to permission_groups
2019-06-14 10:37:20 -07:00
Diogenes S. Jesus
4c61d330e6
fix Paginator ( #7157 )
2019-06-14 09:54:09 -07:00
snipe
30904dd019
Reduce minimum group name length to 2 (from 3)
...
eg: IT
2019-06-12 15:56:19 -07:00
snipe
1d0d25db37
Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
2019-06-12 15:51:47 -07:00
snipe
cbff66c9db
Improved error checking in locations importer
2019-06-10 18:50:41 -07:00
snipe
27231d49ea
Small fixes for phpleague CSB reader v9
2019-06-03 22:05:16 -07:00
snipe
49a255c8fb
Changed has to filled to fix bulk asset editing
2019-05-31 14:11:43 -07:00
snipe
d2bbc09892
Increased throttle to 120 requests per minute
2019-05-31 11:57:57 -07:00
vicleos
c6039cbc1d
Vicleos fix storage namespace ( #6901 )
...
* Update CompaniesController.php
fixed companies destroy error
* fix Storage namespace loss
2019-05-30 19:10:04 -07:00
snipe
74a2c29bc2
Fixed #7100 - Check if $user isset on checkin
2019-05-30 19:06:30 -07:00
snipe
2c64739e8f
Removed old comments
2019-05-30 19:02:20 -07:00
snipe
829d44bd27
Fixed #7098 - updated backup config for deleteFile() method
2019-05-29 14:47:55 -07:00
snipe
a014af4c47
Fixed #7083 - Removed user_exists constraint on department save
...
If the user has been deleted, this prevented the department from being successfully saved on edit
2019-05-28 13:18:31 -07:00
snipe
2dd31544fe
Increased image size to 800px, added lightboxes
2019-05-24 19:11:08 -07:00
snipe
237acdcff0
Show accessory image on view page
2019-05-24 18:22:57 -07:00
snipe
b2c9a38db8
Fixed casing in sync command
2019-05-24 16:12:43 -07:00
snipe
6dcdb5abae
Only display the file if the log record can be found
2019-05-24 16:06:52 -07:00
snipe
56576d9e45
Fixed more camel-casing -> snake-casing
2019-05-24 16:01:12 -07:00
snipe
d5c3ee5ed0
Only try to get fieldset if model is valid
2019-05-24 15:44:54 -07:00
snipe
18db0a50f1
Only gtry to delete the file if a record is found in the log
2019-05-24 15:44:40 -07:00
snipe
d596ced0a0
Fixed free_seats_count variable name
...
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
2019-05-24 15:44:18 -07:00
snipe
78fb2b2239
Only build the log upload destination path if there is a matching record
...
Fixes [ch1232]
2019-05-24 15:28:53 -07:00
snipe
1472e9d5b5
Check for valid model before attempting to access fieldsets
...
Fixes [ch1249]
2019-05-24 15:03:15 -07:00
snipe
fcbc7e4540
Fixed Undefined variable user in $backto if checked out to a non-user
...
Fixes [ch9194]
2019-05-24 14:51:27 -07:00
snipe
93bf541ce7
Fixed missed consumables_count withCount() statement
2019-05-24 14:21:53 -07:00
snipe
1e6c85da41
Removed custom fields from AssignedSearch to prevent confusing data in selectlist
...
Fixes [ch9193]
2019-05-24 13:50:11 -07:00
snipe
c5a23e8f5e
Fixed bug where sorting by company name in Users API did not work
...
Fixes [ch9200]
2019-05-24 13:37:20 -07:00
snipe
b6d2392303
Small fix for reordering fields
...
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
2019-05-24 12:05:52 -07:00
snipe
d6f251e992
Updated importer to work with newer CSV Reader::getRecords() method
2019-05-24 11:44:57 -07:00
snipe
4be95eac4b
Removed extra escaping on checkin
2019-05-24 11:44:39 -07:00
snipe
8914d14681
Tidied up license check
2019-05-24 05:26:52 -07:00
snipe
d4725b61be
Check that a model exists before trying to fiddle with fieldsets
2019-05-24 04:48:04 -07:00
snipe
aa0b627fe7
Fixed missing asset validation
2019-05-24 04:47:35 -07:00
snipe
5be5e3271d
Trying to fix ajax asset validation
...
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
2019-05-24 03:55:31 -07:00
snipe
dd5d5cc07c
Handle JSON validation errors like 5.4
2019-05-24 01:12:38 -07:00
snipe
84c3709161
Handle JSON validation errors like 5.4
2019-05-24 01:12:21 -07:00
snipe
96e2d74ae3
Handle JSON validation errors like 5.4
2019-05-24 00:46:30 -07:00
Steffen
27dcb4d27b
Allow empty filter (=== '' doesn't work) ( #6999 )
2019-05-23 19:59:27 -07:00
sreyemnayr
f85ac97d8c
Feedback for Kits; Fix checkins for accessories ( #7060 )
...
* Kits feedback
* Fix accessory checkin
2019-05-23 19:39:30 -07:00
snipe
bf93e8cc32
Use getReader instead of fetchAssoc for CSV parser
...
https://csv.thephpleague.com/9.0/upgrading/
2019-05-23 19:09:58 -07:00
snipe
2d036c64e9
Change ->has() to ->filled()
2019-05-23 17:39:50 -07:00
snipe
8db2470ac4
Switch has() to filled()
2019-05-23 17:17:46 -07:00
snipe
12ec2d1f7a
Fixed custom field edit screen
2019-05-22 01:07:14 -07:00
snipe
6cd25fbdeb
Updated backup path in backup admin
2019-05-22 00:56:14 -07:00
snipe
4be8ba9f17
Updated withCount to use manual naming
2019-05-22 00:52:51 -07:00
snipe
df8008f1ed
Renamed fire() to handle()
2019-05-22 00:52:32 -07:00
snipe
77547c528b
Added the command loader to console kernel
2019-05-22 00:52:14 -07:00
snipe
bfb910f375
Set the serialization
2019-05-22 00:51:43 -07:00
snipe
b2eacb147b
Fixed #7046 - added user website url back into UI
2019-05-21 18:55:12 -07:00
snipe
0358d13ddb
Fixed #7044 - API update deleted custom fields if they are not re-presented
2019-05-20 11:49:18 -07:00
Bob Clough
096393389c
Fixes #5054 : LDAP users deactivated for none-ad ( #7032 )
...
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
2019-05-16 09:31:55 -07:00
snipe
9eb7b668d1
Fixed #6880 - correctly encrypt encrypted fields via the API
2019-05-15 19:33:30 -07:00
snipe
6728089106
Fixed #6883 - remove escaping of fields on LDAP import
2019-05-15 19:15:41 -07:00
snipe
888bdbdb68
Added ability to update groups via API
...
Fixes [ch9139]
2019-05-15 16:39:34 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
d67c931f6a
Import locations from CSV via command line ( #7021 )
...
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
2019-05-13 02:27:19 -07:00
snipe
d016076806
Fixed #6956 - viewKeys policy inconsistent ( #7009 )
...
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
2019-05-08 08:14:49 -04:00
snipe
23fa5d0bf4
Fixed #7003 - crash when warranty months or purchase date is null
2019-05-07 15:33:57 -04:00
Joris van Eijden
486c708911
Leave the activated state for users alone in normal LDAP synchronisation. ( #6988 )
2019-05-06 09:40:53 -04:00
snipe
407445456a
Merge branch 'features/6204_email_audit-alerts' into develop
...
# Conflicts:
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/LicensesController.php
# composer.json
# composer.lock
# config/version.php
# resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits ( #6992 )
...
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
2019-05-05 22:32:52 -04:00
snipe
a86409868e
Derp. Wrong version
2019-05-05 22:31:43 -04:00
snipe
e4a298ca2a
Added scope for both overdue and upcoming
2019-05-05 22:13:30 -04:00
vicleos
ab8792a13d
Update CompaniesController.php ( #6900 )
...
fixed companies destroy error
2019-05-05 20:57:28 -04:00
snipe
7497eaf302
Removed unused setting variable
2019-05-05 19:58:08 -04:00
snipe
7d416d1175
Fixed :threshold placeholder
2019-05-05 19:57:23 -04:00
snipe
7b194c678c
Cleanup on audit due/overdue console command
2019-05-05 19:22:08 -04:00
snipe
05a85c628f
Added audit presenter
2019-05-05 19:20:17 -04:00
snipe
0f0ffd39a8
Added ability to pass audit specs to main API asset search method
2019-05-05 19:19:56 -04:00
snipe
996a4cc29b
Added audit due console command to kernel
2019-05-05 19:15:24 -04:00
snipe
0e234bac70
Added query scopes for due and overdue audits
2019-05-05 19:14:02 -04:00
snipe
ab060288fa
Controller/API methods for due/overdue audits
...
We could probably skip this and just handle it via view in the routes…
2019-05-05 19:13:37 -04:00
snipe
e46cccdf90
Added upcoming audit report
...
TODO: Fid diff/threshold math
2019-05-04 17:52:17 -04:00
ajsy
9b3a8c046c
Update LocationsController.php
2019-05-03 15:21:57 +03:00
snipe
ce16eae508
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-05-02 15:20:52 -07:00
snipe
dc73dbfbfd
Fixed #6911 - note must be a string on license checkin
2019-05-02 15:20:47 -07:00
ajsy
38e8028300
Update LocationsController.php
2019-04-19 13:20:37 +03:00
snipe
dae26e0378
Remove “Imported from LDAP” note override
2019-04-18 17:56:08 -04:00
snipe
1bb1f7342f
Fixed #6922 - date_add crashing if EOL is null
2019-04-18 15:49:59 -04:00
snipe
420e8bc85a
Allow phone number to be changed in Profile
2019-04-18 14:13:50 -04:00
snipe
fe553aec02
Added first-initial dot lastname format for usernames/email
...
Fixed [ch1379]
2019-04-02 18:21:54 -07:00
Ivan Nieto
b1f96448af
Remove old redundant code in LicensesController, added an offset to AccessoriesController for pagination to work correctly ( #6847 )
2019-04-02 10:13:58 -07:00
Martin Meredith
b779e274cc
Fix usage of Google2FA Facade ( #6864 )
2019-03-27 22:01:38 -07:00
Martin Meredith
83257af267
Fix imports for 2FA Login ( #6855 )
2019-03-26 14:10:56 -07:00
snipe
109a29b5fc
Fix error in tests
2019-03-20 04:39:50 -07:00
snipe
acb90c7aee
Horrible master -> dev merge that makes baby jesus cry :(
...
# Conflicts:
# app/Http/Controllers/Auth/LoginController.php
# composer.json
# composer.lock
# resources/views/auth/two_factor_enroll.blade.php
2019-03-20 02:24:23 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
snipe
da015ec4a8
Fixed #6834 and #6402 - use inline QR code generation for 2FA ( #6840 )
...
* Fixed #6834 and #6402 - use inline QR code generation for
* Update auth controllers to use translations
* Updated composer lock
* Added comments
* Moar comments
* Typo
2019-03-20 01:24:31 -07:00
snipe
335e8ffaaa
Typo
2019-03-20 01:22:20 -07:00
snipe
8d0ee9e531
Moar comments
2019-03-20 01:21:34 -07:00
snipe
cc5c7d33e7
Added comments
2019-03-20 01:14:58 -07:00
snipe
5699e021de
Update auth controllers to use translations
2019-03-20 00:50:09 -07:00
snipe
cf92618c70
Fixed #6834 and #6402 - use inline QR code generation for
2019-03-20 00:49:44 -07:00
snipe
a874dbb0d0
Working attempt, but will try with old library for mininal footprint
2019-03-19 23:18:16 -07:00
snipe
8ed268819e
Fixed XSS
2019-03-18 21:09:57 -07:00
snipe
dee92cfc6c
Fixes XSS vulnerabilities ( #6831 )
...
* Properly escape log_meta values
* Vue syntax fix to allow npm run dev to work again
* Janky fix for Select2 bug
* Compiled production assets
* Escape user’s last name in API
* Removed duplicate alertClass
* Compiled production assets
2019-03-18 20:49:32 -07:00
snipe
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list ( #6822 )
...
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced
I also updated the language in the user’s listing table to clarify what “activated” means
* Added login enabled info to user view
* Clarified comments
* Added info about 2FA on user profile
Because why not
* Added nowrap to table, and added 2FA reset for superadmins
2019-03-18 11:59:02 -07:00
snipe
7b33f95e83
Fixes/import permissions mask ( #6826 )
...
* Check for empty headers in import
* Added import permission
* Fixed model path in docblock
* Added import gate to default blade
* Check if the user is an admin OR idf they have import permissions
* Walked back that admin permission
Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
2019-03-18 11:58:08 -07:00
Ivan Nieto
bebdbdfb87
Fix #6763 . Import Stuck Processing - Error - Can only flip STRING and INTEGER values! ( #6804 )
...
* Added validation for errors when the Import Field to map isn't setted
* A slightly correction to the error message
* Added the translation strings for the Error Message
2019-03-14 12:32:40 -07:00
snipe
26c0cf5d33
Allow null for logCheckin $action_date
2019-03-14 01:22:29 -07:00
snipe
239f21b0d7
Set null option for $action_date
2019-03-14 01:09:16 -07:00
snipe
96f069c417
Change action_datwe to datetime in transformer
2019-03-13 21:57:06 -07:00
Ivan Nieto
c7f48951a9
Valo/checkin date in history of asset ( #6733 )
...
* To see checkin/checkout Date in History of Asset
* Added some logic to get today's date if the checkin_at input is blank
* Updating the action_date taking the value from the action_log table
* Hide created_at field and rename 'Action Date' as only 'Date'
2019-03-13 21:36:32 -07:00
Marián Skrip
8d63533205
Add write-only image_source field for asset create/edit API endpoint ( #6146 )
...
`image_source` should contain base64 encoded image data with mime-type.
2019-03-13 21:00:40 -07:00
Ivan Nieto
8c65214b1f
Ignore the soft deleted assets in the eloquent query ( #6824 )
2019-03-13 20:14:30 -07:00
Martin Meredith
e3e0d57f56
Minor code cleanup bits and bobs ( #6805 )
...
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
snipe
858d382e26
Changed logging to info level for LDAP
2019-03-13 15:14:03 -07:00
snipe
de16fee00a
Change image unlink error log to info from error
2019-03-13 12:22:12 -07:00
snipe
8efbde61c9
Merge branch 'fixes/kit_fixes' into develop
2019-03-13 12:16:20 -07:00
snipe
1b0d855c00
Added translation, removed commented out code
2019-03-13 12:15:48 -07:00
Martin Meredith
f403db274a
(develop) Fix asset auto-incrementation ( #6806 )
...
* Fix auto-increment not updating
This is due to the addition of caching for settings. If we're not
explicitly saving the Settings model, then the cache isn't getting
updated, causing the asset tag auto-increment to get an old cached
version with the wrong number
* Move Setting cache clear to an observer
2019-03-13 10:58:35 -07:00
Martin Meredith
a462e91983
(develop): Fix failing Unit Tests ( #6807 )
...
* Reference correct class for Licence Model
* Make sure we activate users in test to send Welcome Notification
2019-03-13 10:57:43 -07:00
ajsy
57c0f69286
Update LocationsController.php
2019-03-09 13:45:19 +03:00
ajsy
311dd18443
Update LocationsController.php
2019-03-09 11:34:47 +03:00
snipe
61afdeac2e
Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop
2019-03-08 16:18:48 -08:00
Martin Meredith
0840ab41d5
Hotfix: Fix ability to create assets ( #6790 )
2019-03-06 16:37:58 -08:00
snipe
5293cb30bd
Merge branch 'fixes/only_present_image_url_if_image_present_in_profile_api' into develop
2019-03-05 23:54:08 -08:00
snipe
6d98bd6846
Fixed error if item requested or request was deleted ( #6786 )
...
ch628
2019-03-05 23:47:36 -08:00
snipe
0b0813b260
Fixed error if item requested or request was deleted
...
ch628
2019-03-05 23:46:40 -08:00
snipe
6f1a70ee09
Fixed ch1086 - Merge branch 'fixes/search_consumables_by_item_number' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
2019-03-05 23:23:46 -08:00
snipe
58768e5aee
Added ability to search consumables by item number ( #6785 )
...
Fixes ch1086
2019-03-05 23:21:22 -08:00
snipe
3b41aa52c8
Added ability to search consumables by item number
...
Fixes ch1086
2019-03-05 23:20:16 -08:00
snipe
28a450ea25
Added ability to do full name search in user dropdown selectlist ( #6784 )
2019-03-05 21:13:39 -08:00
snipe
6696685d0b
Merge branch 'fixes/full_name_search_user_selectlist' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# routes/api.php
2019-03-05 20:57:10 -08:00
snipe
f065bd7784
Added ability to do full name search in user dropdown selectlist
2019-03-05 20:40:05 -08:00
Steffen
de39906cae
Put file contents instead of file object (creates subdirectory with a single file) ( #6760 )
2019-03-05 12:08:18 -08:00
snipe
288cc01c41
Merge branch 'features/accessories_users' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# config/version.php
# routes/api.php
2019-03-01 17:30:03 -08:00
snipe
9575cd2651
Add accessories endpoint to user API ( #6775 )
2019-03-01 17:21:03 -08:00
snipe
348c13f318
Add accessories endpoint to user API
2019-03-01 16:31:22 -08:00
Steffen
e1907e30b1
Allow multiple upload fields and add logo option to labels ( #6736 )
...
* Change upload js to work with multiple upload elements on a single page
* Change uploadFile in upload modal and form partial
* Change uploadFile to js-uploadFile to avoid potential issues in the future
* Remove duplicate style attribute causing webpack to fail
* Missed a css class in rename to js- prefix
* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
* Add more css classes to labels
* Allow unescaped " (quot) in css ouput
* Add max size param to partial, set defaults for allowedType and size
2019-03-01 15:25:42 -08:00
Dmitrii Minaev
16bb784e78
Codestyle & bug fixes
2019-02-28 01:37:58 +03:00
Dmitrii Minaev
d3c320e56f
Code comments and format
2019-02-23 22:44:03 +03:00
Dmitrii Minaev
5f3a0bdea5
app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php
...
add accessories and consumables tables
add selectlist api to:
app\Http\Controllers\Api\AccessoriesController.php
app\Http\Controllers\Api\ConsumablesController.php
app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
2019-02-19 22:19:00 +03:00
snipe
0242b3ec74
Handled JS cookie offset issue on the server side
...
We may want to handle this via the blades instead, as I’m not sure if API users will run into weirdness here.
2019-02-14 15:01:34 -08:00
snipe
b26fbf986f
Fixed issue where offset could be greater than total items, resulting in “No results” confusion
2019-02-14 14:49:08 -08:00
snipe
5c9b1ed43a
Fixed #6676 - consumables API not respecting category id
2019-02-14 14:48:43 -08:00
snipe
0000f487ac
Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop
...
# Conflicts:
# config/version.php
2019-02-13 23:02:21 -08:00
snipe
35ebe33e4e
Fixed #6703 - fixes password confirmation ( #6711 )
...
* Fixed #6703 - fixes password confirmation
* Removed debugging
* Fixed tests
* I guess we use 10 as the settings for password min in tests
* One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 23:01:19 -08:00
snipe
d893837c86
Removed debugging
2019-02-13 21:32:26 -08:00
snipe
230c9da1df
Fixed #6703 - fixes password confirmation
2019-02-13 21:30:15 -08:00
snipe
9247dc592b
Removed debugging statements
2019-02-13 07:09:49 -08:00
snipe
cd333fa93b
Fixed wonky merge :(
2019-02-13 06:52:36 -08:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
f1fa5bdaa9
Fixed (develop) #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:56:13 -08:00
snipe
aa1e06f021
One more time…. Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:46:19 -08:00
snipe
30b1cfabf5
Fixed dumb formatting
2019-02-13 04:45:21 -08:00
snipe
e75d22ab73
Revert "Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets"
...
This reverts commit b1e17743b8
2019-02-13 04:44:19 -08:00
snipe
b1e17743b8
Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:35:55 -08:00
snipe
1e1d32dc85
Make user notes field editable via API
2019-02-13 01:32:00 -08:00
snipe
b317fb8d83
Fixed #6367 - pass table name and column_id to scopeCompanyables
2019-02-13 01:29:53 -08:00
snipe
e2c0f01a10
Fixed #6367 - pass table name and column_id to scopeCompanyables
...
Solves error: Integrity constraint violation: 1052 Column 'company_id' in where clause is ambiguous
2019-02-13 01:26:11 -08:00
snipe
f88fee0f21
Make user notes field editable via API
2019-02-12 23:58:30 -08:00
snipe
245b3ca09f
Fixed #6061 - Assigned user group cannot be removed
2019-02-12 23:49:42 -08:00
snipe
f3c12f38b6
Fixed #6061 - Assigned user group cannot be removed
...
This bug was a result of attempting to check if the groups field had a value, and only THEN trying to sync the groups. This meant that uf you were removing ALL groups, the sync wouldn’t be triggered.
This still needs to be updated in the API.
2019-02-12 23:43:38 -08:00
snipe
da34b82b3e
Do not count deleted locations in managedLocation check on user delete
2019-02-12 23:33:01 -08:00
snipe
5e19178a30
Do not count deleted locations in managedLocation check on user delete
2019-02-12 23:32:10 -08:00
snipe
8e358faebc
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API
2019-02-12 22:15:32 -08:00
snipe
90cddb7aee
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API ( #6693 )
...
Need to confirm that re-enabling `\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,` won’t mangle anything. I know we ran into some issues when testing a long time ago, but not sure those issues apply anymore, and I can’t remember what they were.
2019-02-12 22:08:38 -08:00
herroworrd
3f7d2aebc7
Fixed #6634 : Asset Import History fixes and optimizations ( #6657 )
...
* Starting work on asset history importer.
* Starting work on asset history importer.
* Added checkin target.
* Last change... importing history should also probably be an admin only task.
* Added caching for user and asset queries.
* Updated cache keepalive time to DateTimeInterface
* Updated cache keepalive time to DateTimeInterface
2019-02-08 16:05:56 -08:00
Steffen
5624ea14e7
Fix accessories edit error ( #6698 )
...
* Add accessories_upload_path singleton (used in accessories/edit)
* Fix indent
2019-02-08 15:43:11 -08:00
Steffen
3530603797
Simplify slack channel regexp and allow private (no # prefix) channels and direct messages (@ prefix) ( #6699 )
2019-02-08 15:41:54 -08:00
snipe
4fd469e07b
Prevent editing special users demo mode
2019-02-04 19:13:55 -08:00
snipe
59cb1e561e
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-02-04 18:59:53 -08:00
snipe
4fe63d2966
Fixed #6633 - return 200 status code on asset API
2019-02-04 18:59:49 -08:00
snipe
971fcf5800
Fixed #6633 - return 200 status code
2019-02-04 18:58:28 -08:00
Ivan Nieto
9ac40f705c
Valo/ch37/cannot log in with generated password from ( #6655 )
...
* Cannot log in with generated password from [ch37]
* Cannot log in with generated password from [ch37]. Light cleanup
* Added the fetchHumanBoolean() method.
* Cleaning up the ternary
2019-01-31 19:58:54 -08:00
Colin Campbell
ef8e20f66b
Alpine linux docker image ( #6645 )
...
* docker-alpine: Alpine linux container + apache 2.4 support
* docker-alpine: Force passport migrations (production mode Exception)
* docker-alpine: Copy default env in Dockerfile
2019-01-30 14:45:36 -08:00
Dmitrii Minaev
e01e0c5596
Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php
...
Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js
Some design fixes resources\views\kits\edit.blade.php
Add default value to form (template) resources\views\modals\kit-model.blade.php
New routes for kit accessories and kit consumables routes\api.php
New routes for kit models, kit accessories and kit consumables routes\web\kits.php
New templates
2019-01-27 23:19:24 +03:00
Ivan Nieto
79b41ee662
Importing with CSV into Encrypted Custom [ch86] ( #6642 )
2019-01-25 14:26:59 -08:00
snipe
c1a4fbee16
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-01-25 13:34:57 -08:00
Colin Campbell
8c632f63b0
Misc ldap fixes ( #6631 )
...
* misc_ldap_fixes: Map location from OU, not group
* misc_ldap_fixes: Ensure ldap is initialised for import
* misc_ldap_fixes: Import Job Title
* misc_ldap_fixes: Import telephone, fix field select from schema
* misc_ldap_fixes: Cleanup login error-handling, fix boolean tests
2019-01-24 16:15:44 -08:00
snipe
ec4161a959
Fixed typo
2019-01-24 15:21:38 -08:00
snipe
a371e8d53f
Added calibration as a maintenance type
...
Should just make these custmizable options
2019-01-24 15:17:33 -08:00
snipe
8f09cca043
Fixed incorrect group route
2019-01-24 15:17:11 -08:00
snipe
b326d8593b
Fixed bad groups route on error
2019-01-24 14:56:47 -08:00
snipe
d1fe7abb18
Replaced custom deleted query scopes with onlyTrashed()
2019-01-24 14:47:44 -08:00
snipe
39bca49e8f
Specify table name in deleted user display
2019-01-24 14:38:18 -08:00
snipe
b8269020ae
Specify table name in deleted user display
2019-01-24 14:37:39 -08:00
snipe
ffc51d6db6
Specify table name in deleted user display
2019-01-24 14:33:54 -08:00
snipe
394e51029e
Only try to upload the audit file if one is provided
2019-01-24 14:04:06 -08:00
snipe
4b8f9d810b
Fixed #6625 - include fully depreciated date in custom asset report
2019-01-24 12:38:17 -08:00
bricelabelle
5281713fd9
Added #6617 : View licenses checked out to an asset with the hardware API ( #6621 )
2019-01-22 14:47:40 -08:00
snipe
7982b3f237
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-01-22 14:13:39 -08:00
snipe
07eead2dbf
Fixed bug where assets could be deleted without being checked back in [ch38]
2019-01-22 14:13:30 -08:00
Ivan Nieto
3fa5976315
Language of mail doesn't show as intended by the settings. [ch87] ( #6619 )
...
* Fixes #5554 . Language of mail doesn't show as intended by the settings.
2019-01-22 14:02:08 -08:00
NMathar
66f557d436
add user license api endpoint fix #6241 ( #6616 )
2019-01-22 13:48:15 -08:00
snipe
fdd6ddf61b
Fixed favicon upload
...
[ch309]
2019-01-18 14:05:52 -08:00
Ivan Nieto
310ed0f1d3
Fix an issue when trying to checkin a license seat. [ch46] ( #6599 )
...
* Fix an issue when trying to checkin a license seat.
* Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.
2019-01-17 20:36:40 -08:00
snipe
b293d00699
Switch LDAP error to debug, to avoid crapping up the logs
2019-01-17 20:18:03 -08:00
snipe
1eace04ad9
Handle asset maintenances that do not have a valid asset associated
2019-01-16 02:26:42 -08:00
snipe
75a0cf97e2
Return an error if asset maintenance is associated with a non-existant asset
2019-01-16 02:19:57 -08:00
snipe
a1f93e733c
Fixed undefined error when maintenance is associated with a deleted asset
2019-01-16 01:45:51 -08:00
Steffen
74c099f0b3
fix LDAP/AD sync: function calls for password creation ( #6581 )
...
* - change generatePassword to be more secure (allow duplicate chars)
- move generatePassword from trait to helper
- fix summary output for sync command
* - Don't treat ldap_active_flag as boolean - fixes sync not working at all when ldap field is set
- Sync non activated users (But set activated=0)
* - Read user first before checking against user settings
* Fix failed logins to not throw exceptions
2019-01-15 14:05:47 -08:00
fanta8897
49073742b5
Updating LDAP such that each user is not required to be bindable to LDAP ( #6571 )
...
* Update Ldap.php
* Update Ldap.php
* Update Ldap.php
* Update Ldap.php
* Update Ldap.php
Updating LDAP.php such that the admin bind will ONLY occur if the user attempting auth cannot bind. If that is the case, it will attempt to bind as admin and search for that user, prior to failing.
2019-01-15 14:04:21 -08:00
snipe
125938762b
Patched #6565 to develop
2019-01-15 14:02:10 -08:00
Sxderp
187206cb88
Fix saving of REMOTE_USER setting broken by 1a64879b6 ( #6565 )
...
The previous commit made it such that remote user login could only
be enabled if two factor authentication was also enabled. Unnest
the configuration so that the setting can be applied without.
2019-01-15 13:59:36 -08:00
Hubert
8420cb7ec1
Fixed problem with import when using snipeit:import command ( #6550 )
2019-01-15 13:58:23 -08:00
Steffen
61c619660d
Initialize customFormat to prevent Blade error when creating new fields ( #6596 )
2019-01-15 13:56:56 -08:00
Steffen
1de9087427
LDAP fixes ( #6533 )
...
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder
* php 7.3 collect() fix (undefined variable)
* Fix travis ci
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder
* php 7.3 collect() fix (undefined variable)
* change LDAP implementation from model to (singleton) service
* Re-apply check for content in ldap_server variable before parsing
* Update LDAP implementation
* Switch iCheck to minimal as referenced in js
* Don't init on load but on first access via init (returns ldap enabled status)
* Re-Enable notifications
* Re-add missing test target php versions
* Only init() once (singleton class, so ldap variable is already set)
2019-01-10 13:20:43 -08:00
Brady Wetherington
1fdb057199
New LDAP system tries to load LDAP configuration before determining ( #6512 )
...
whether or not LDAP is actually enabled
2018-12-17 14:04:35 -08:00
Ivan Nieto
876ff2ef72
Fixes #6341 . Some style changes in this fix. ( #6492 )
2018-12-14 18:08:33 -08:00
KeenRivals
f5ba2106cd
Fix snipeit:unescape not unescaping quotes ( #6506 )
2018-12-14 18:08:00 -08:00
snipe
67f6df2be3
Fixed (develop) #4568 - escaping values in custom report
2018-12-12 19:40:15 -08:00
snipe
8f6ea84fca
Fixed #4568 - escaping values in custom report
2018-12-12 19:38:24 -08:00
snipe
ea1b792a93
Fixed #6491 - cleaner return methods for PHP 7.3 compact()
2018-12-12 18:23:39 -08:00
snipe
426dae0310
Fixed methods for PHP 7.3 compact()
2018-12-12 18:16:39 -08:00
snipe
86cc1a228d
Fixed typo
2018-12-12 16:45:49 -08:00
snipe
394d265b96
Added XML to uploadable file type - re: #6099
2018-12-12 16:45:09 -08:00
snipe
6a6923b1d8
Fixed parse_url() expects parameter 1 to be string, null given
2018-12-12 16:37:27 -08:00
Steffen
28edf13457
WIP develop ldap fixes (errors, check if disabled, parsing in one place) ( #6500 )
...
* Fix errors and exception when ldap settings are empty (even with ldap disabled)
* Re-add newline at the end of file
2018-12-11 21:01:11 -08:00
snipe
93947b09c5
Small fix for #6484 - corrected LDAP sync command name
2018-12-11 15:18:30 -08:00
snipe
8b8ce256f5
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-12-11 13:07:48 -08:00
snipe
8313a069bf
Temp fix for blank LDAP values when LDAP is disabled
2018-12-11 13:07:14 -08:00
Wes Hulette
b38d07064b
Fixed : #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" ( #6381 )
...
* Fixed missing oauth tables during setup.
* Custom fields of type "CUSTOM REGEX" are always saved as "ANY"
Fixes #5896
* Updated per PR
Fixed spelling
* Fixed logic error
Moved conditional code from view to controller
Added getFromatType function for dropdown
2018-12-06 20:05:04 -08:00
snipe
a874cc32a8
Fixed bonked merge conflict
2018-12-06 14:20:01 -08:00
Wes Hulette
34246ee4ef
[WIP] v5 Develop: New LDAP implementation ( #6352 )
...
* Fixed missing oauth tables during setup.
* WIP New LDAP implementation
* WIP New LDAP implementation
* WIP New LDAP implementation
Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP
* WIP New LDAP implementation
Added Adldap2 to handle ldap intergration.
* Updated per PR quality review
* Added specific LDAP settings method
* Corrected version number
* Added return documentation
* Added imports
* Changed class to be injected into controller
* Updated with PR suggestions
2018-12-06 14:05:43 -08:00
snipe
3ed2f55696
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-12-05 19:56:18 -08:00
snipe
09c4dd4891
Added ability to upload favicon and email logo
...
todo: refactor the image upload/resize for less copypasta
2018-12-05 19:56:12 -08:00
snipe
fb502df089
Fixed dumb code indenting
2018-12-05 18:36:39 -08:00
Ivan Nieto
f91e340178
Fixes #6341 . Adding condition that checks offset of licenses seats when the user looks other page than the first. ( #6392 )
2018-12-05 18:09:54 -08:00
snipe
f6c0e7cc9c
Fixed #6464 - added company name to searchable field in user search
2018-12-05 17:20:22 -08:00
Wes Hulette
d023f61bc4
Fixed missing importer ( #6413 )
...
Fixed missing manager_id
Fixed missing department_id
2018-12-04 13:06:12 -08:00
Minaev Dmitriy
0bbe499414
Kits checkout. But only with models.
2018-11-13 20:33:32 +03:00
snipe
dd5ca73602
Set support footer and version footer to on when resetting the demo
2018-11-08 12:52:37 -08:00
snipe
2632f730d1
Sets activated to 0 in UserImporter if the activated column isn’t set
2018-11-07 22:36:58 -08:00
snipe
24c158bfe6
Added missing use statement for departments in importer
2018-11-07 18:33:43 -08:00
snipe
3d4a5a8066
More importer tweaks for dept and manager
2018-11-07 18:05:53 -08:00
snipe
db7e0b56f2
Fixed department id on asset import with users
2018-11-07 17:36:34 -08:00
snipe
f2478d813c
Fix manager id if no manager is given in importer
2018-11-07 17:33:27 -08:00
Minaev Dmitriy
79d979f47f
Full kits manipulation without users intagration
2018-11-06 19:27:28 +03:00
snipe
b6daad7573
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-11-02 17:15:08 -07:00
snipe
67d2953080
Fixed #6386 - licenses not searching on category name
2018-11-02 17:15:04 -07:00
snipe
192aa9eb71
Fixed #6386 - licenses not searching on category name
2018-11-02 17:14:08 -07:00
Wes Hulette
0d2eef5894
v5 Develop Fixed: Setup error because setting table does not exist ( #6390 )
...
* Fixed missing oauth tables during setup.
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
* Fixed error during setup when settings table is not present
2018-11-02 12:23:41 -07:00
Wes Hulette
88b1da4260
Added: Caching of settings ( #6378 )
...
* Fixed missing oauth tables during setup.
* Cache settings
Cache the setting to reduce unnecessary database calls
2018-11-01 19:59:50 -07:00
Wes Hulette
0730685c29
v5 Develop Fixed: LDAP Settings Password being updated when field is empty ( #6384 )
...
* Fixed missing oauth tables during setup.
* Fixed password saving
Previous Input::has always returned true, even if password was an empty string.
2018-11-01 13:36:30 -07:00
snipe
ea91d59ffc
Use username instead of email address in password reset ( #6382 )
...
* Switch to use username instead of email
* Fixed indenting
* Updated password language
* Updated blades to reflect username instead of email
* Changed password/reset controllers to use username instead of email
* Redirect to login page instead of repeating the password reset form
2018-10-31 18:03:24 -07:00
snipe
65aef11ae3
Fixed #5879 - added user department filter for custom report
2018-10-31 15:19:13 -07:00
snipe
8f22cf7c3c
Added dept update API endpoint
2018-10-31 14:31:57 -07:00
Minaev Dmitriy
9d5cd27575
New save mechanic
2018-10-31 16:06:38 +03:00
snipe
81f8fe34cd
Removed debugging line
2018-10-30 18:11:27 -07:00
snipe
f744696043
Fixed #6375 - lowercase keys on findAndBindUser to address LDAP syncing issue
2018-10-30 13:12:10 -07:00
snipe
29b0780c6c
Added company info to asset maintenances transforrmer
2018-10-30 00:20:16 -07:00
Wes Hulette
6b3b673daa
Changed NULL coalesce from ?? ( #6353 )
...
PHP 5 does not have the double question mark null coalesce support.
2018-10-26 15:53:18 -07:00
snipe
e443a576f7
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-19 16:46:53 -07:00
snipe
20b26effdb
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:46:46 -07:00
snipe
1a10aa0dda
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:43:28 -07:00
Minaev Dmitriy
f1f7694835
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2018-10-19 19:00:53 +03:00
Minaev Dmitriy
0e66c3cb56
Predefined kits test
2018-10-19 17:30:25 +03:00
snipe
09a102fea8
Only try to return a department if there is a matching field
2018-10-19 01:44:45 -07:00
snipe
304fce73fc
Null if blank on user import
2018-10-19 01:38:14 -07:00
snipe
295a68bb7a
Try false instead of null
2018-10-19 01:36:15 -07:00
snipe
3aeb521782
Patch PR #6335 to master
2018-10-19 01:30:05 -07:00
snipe
f587d2248b
WIP: Better handle activation column in importer ( #6290 )
...
* Better handle activation column
* Added comments for clarity on importer methods
2018-10-19 00:23:12 -07:00
Wes Hulette
a975117eaf
Fixed : #6325 & #6317 ( #6335 )
...
* Fixed missing oauth tables during setup.
* Fixed missing manager_id and department_id
2018-10-17 13:38:13 -07:00
Wes Hulette
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe
8579c5a68a
Allow 0 as a consumable min amt
2018-10-15 17:04:51 -07:00
snipe
9797412d23
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-15 17:02:39 -07:00
snipe
78b6e84774
Allow min:0 for consumables
2018-10-15 16:52:20 -07:00
Joe Ferguson
704209de9c
Fixed #6301 : Do not allow duplicate asset tags ( #6324 )
...
* Fixed #6301 : Do not allow duplicate asset tags
* Display error message for single asset_tag failure
2018-10-11 17:15:09 -07:00
Ivan Nieto
5516978f2e
#5696 proposed fix ( #6314 )
...
* Another 'or' caught in a blade template
* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.
* Getting right the permission in the view checkout-license
2018-10-11 14:08:09 -07:00
Wes Hulette
b8a37a0c73
Fixed Expiring Assets Email ( #6321 )
2018-10-11 14:03:00 -07:00
snipe
c7596e7741
Fixed image not uploading on asset create
2018-10-09 17:31:52 -07:00
snipe
d4fa81301d
Check if user can see assets in statuslabels gate
2018-10-09 16:34:12 -07:00
snipe
a516e4278e
Remove company select option if the user is not an admin and FCS is enabled
2018-10-05 07:30:42 -07:00
snipe
ecb8204c3c
Associate serials with multiple asset creation
2018-10-05 05:30:13 -07:00
snipe
476b58632b
Handle array of asset tags
...
TODO: figure out how to display validation errors more sanely
2018-10-05 04:34:47 -07:00
snipe
de76e8db5f
Re-enable rollbar
2018-10-04 12:11:36 -07:00
snipe
b5211b2dd5
Fixed #6291 - send-welcome argument in cli importer
2018-10-04 04:44:12 -07:00
snipe
4db1dd8afc
Fixed #6291 - send-welcome argument in cli importer
2018-10-04 04:43:06 -07:00
snipe
890b613f71
Temporarily suppress rollbar
2018-10-03 15:47:56 -07:00
snipe
84848fabd7
Fixed #6284 - missing checkout information on Status Labels API assets endpoint
2018-10-03 10:30:24 -07:00
Wes Hulette
4a88e155c4
Fixed : #6263 V5 (develop) - Missing oauth tables when using the setup wizard ( #6268 )
...
* Fixed missing oauth tables during setup.
* Merged develop changes
Removed PHP_CS file
2018-10-03 10:06:24 -07:00
snipe
c8ad45b11e
Port import manager code to develop
2018-10-03 00:52:29 -07:00
snipe
8937edb97e
Better validation for manager_id
2018-10-03 00:26:51 -07:00
snipe
c8bff3ef38
Features/add manager and dept to importer ( #6277 )
...
* Ignore the simlink for public storage
* Added manager and department to user import
* More UI importer tweaks
* Fisxed typos
2018-10-02 15:43:54 -07:00
Djamon Staal
80393d73ae
Public function save() missing array. ( #6276 )
...
The class was missing as a result that the composer was unable to update and the site returned a 500 error
```
$ composer update
Loading composer repositories with package information
Installing dependencies (including require-dev) from lock file
Nothing to install or update
Package guzzle/guzzle is abandoned, you should avoid using it. Use guzzlehttp/guzzle instead.
Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover
In Asset.php line 30:
Declaration of App\Models\Asset::save($params = Array) should be compatible
with Illuminate\Database\Eloquent\Model::save(array $options = Array)
Script @php artisan package:discover handling the post-autoload-dump event returned with error code 1
```
2018-10-02 04:40:20 -07:00
snipe
79367642b1
[WIP] Added #5957 - Flysystem support ( #6262 )
...
* Added AWS url to example env
* Upgrader - added check for new storage path and attempt to move
* Ignore symlink
* Updated paths for models
* Moved copy methods
* Added AWS_URL support
For some reasin, Flysystem was generating the wrong AWS url (with a region included)
* Switch to Flysystem for image uploads
* Nicer display of image preview
* Updated image preview on edit blades to use Flysystem
* Twiddled some more paths
* Working filesystems config
* Updated Asset Models and Departments to use Flysystem
* Janky workaround for differing S3/local urls/paths
* Try to smartly use S3 as public disk if S3 is configured
* Use public disk Storage options for public files
* Additional transformer edits for Flysystem
* Removed debugging
* Added missing use Storage directive
* Updated seeders to use Flysystem
* Default logo
* Set a default width
We can potentially override this in settings later
* Use Flysystem for logo upload
* Update downloadFile to use Flysystem
* Updated AssetFilesController to use Flysystem
* Updated acceptance signatures to use Flysystem
* Updated signature view to use Flysystem
This isn’t working 100% yet
* Use Flysystem facade for displaying asset image
* Set assets path
Should clean all these up when we’re done here
* Added Rackspace support for Flysystem
* Added Flysystem migrator console command
* Added use Storage directive for categories
* Added user avatars to Flysystem
* Added profile avatar to Flysystem
* Added the option to delete local files with the migrator
* Added a check to prevent people from trying to move from local to local
* Fixed the selectlists for Flysystem
* Fixed the getImageUrl method to reflect Flysystem
* Fixed AWS copy process
* Fixed models path
* More selectlist updates for Flysystem
* Updated example .envs with updated env variable names
* *sigh*
* Updated non-asset getImageUrl() methods to use Flysystem
* Removed S3 hardcoding
* Use Flysystem in email headers
* Fixed typo
* Removed camera support from asset file upload
We’ll find a way to add this in later (and add that support to all of the other image uploads as well)
* Fixed path for categories
* WIP - Switched to standard handleImages for asset upload.
This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now.
* Fixed css URL error
* Updated Debugbar to latest version (#6265 )
v3.2 adds support for Laravel 5.7
* Fixed: Missing CSS file in basic.blade.php (#6264 )
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
* Updated composer lock
* Added AWS_BUCKET_ROOT as env variable
* Use nicer image preview for logo upload
* Removed AssetRequest form request
* Removed asset form request, moved custom field validation into model
* Added additional help text for logo upload
* Increased the size of the image resize - should make this a setting tho
* Few more formatting tweaks to logo section of branding blade preview
* Use Flysystem for asset/license file uploads
* Use Flysystem for removing images from models that have been deleted
* Enable backups to use Flysystem
This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3
* Use Flysystem to download license files
* Updated audits to use Flysystem
2018-09-29 21:33:52 -07:00
snipe
32951bbc90
Make CustomFieldset rules public instead of protected
2018-09-28 15:18:23 -07:00
snipe
eea65a3f26
Fixed manufacturers item count
2018-09-28 12:03:27 -07:00
snipe
68a04c7a23
Fixed #4151 - Undefined index: samaccountname on LDAP import
2018-09-27 16:13:27 -07:00
snipe
75032def9e
Fixed #4151 - Undefined index: samaccountname on LDAP import
2018-09-27 16:11:09 -07:00
snipe
e5d0f74ba7
Fixed #6248 - add free seats to licenses API endpoint
2018-09-27 12:07:13 -07:00
snipe
3a0f738fb0
Added some hepful comments
2018-09-26 19:20:50 -07:00
snipe
55846cc717
Changed LOG:: to Log::
2018-09-26 19:06:31 -07:00
snipe
afac0bc441
Removed old isActive model (unused)
2018-09-26 19:05:42 -07:00
snipe
ffbee77f6f
Patch for 5965 - multiple email recipients no longer working ( #6238 )
2018-09-26 15:47:53 -07:00
Wes Hulette
16e56646b8
Fixed #5965 : Allow multiple alert email addresses ( #6233 )
...
* Fixed #5965 : Allow multiple alert email addresses
* Style changes based on PR feedback.
2018-09-26 14:07:41 -07:00
snipe
bcf9d2f75c
Don’t require statuslabel view to check for deployable status
2018-09-25 13:39:54 -07:00
nix
f85e3edfc7
fixed checking permissions for users with no permissions set ( #6229 )
...
When a user has no permissions set (=NULL) in the database (like after an
LDAP import) but is a member of a group with permissions, those group
permissions would not have be applied, effectively denying every access
regardless of group permissions.
2018-09-25 13:24:50 -07:00
snipe
9108ff8caa
fixed typo
2018-09-24 19:06:12 -07:00
snipe
d5cf0f1fbd
Prevent deleting manufactureres via API if they have items/models
2018-09-24 19:04:00 -07:00
Brady Wetherington
c97db3259f
Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending
...
Refactor: Decouple checkin/checkout notifications from logging
2018-09-21 18:18:27 -07:00
snipe
4b2093b485
Added counts to location show() API method
2018-09-21 15:51:26 -07:00
snipe
b69b5fdf84
Added counts to location show() API method
2018-09-21 15:50:14 -07:00
snipe
d84366c6c5
Add empty array to groups if none filled in
2018-09-19 17:24:34 -07:00
Ivan Nieto
b692f67779
Revision of #5471 ( #6148 )
...
* Search functionality in accessories/{accessory} issue #5471 :
From the collection of users displayed just filtered the data with the method where() and concat()
for the user can search for first name or last name. The solution is case sensitive.
* A better fix to issue #5471 . Now using the established relationship to querying for the users. Also Case-insensitive.
* Fixed previous commit that has magic number in the find method parameter of AccessoriesController.
2018-09-12 22:50:45 -07:00
Juho Taipale
05b03df600
Fix for issue #6165 ( #6168 )
...
* Fix problem when using ValidatingTrait
* Checking that email alerts are enabled when trying to send expected check-in alerts (fix for issue #6169 )
2018-09-12 22:49:50 -07:00
Till Deeke
86f49d34c3
Redirects users from old acceptance screen to new overview
2018-09-10 17:13:16 +02:00
Till Deeke
007e8fbdf9
simplified checkout event handling per @uberbrady’s suggestion
...
This generalizes the checkout events into the CheckoutableCheckedOut and CheckoutableCheckedIn events.
2018-09-10 16:40:26 +02:00
snipe
adf6e7d1cd
Added group support for user API
2018-09-07 18:25:58 -07:00
snipe
05ea61421f
Added manager_id to fillable for locations API
2018-09-07 18:11:38 -07:00
snipe
10d19be66c
Added manager ID to validation
2018-09-07 17:27:31 -07:00
snipe
b903ca05f7
Added manager ID to fillable fields in Location model
...
This should enable the API to update manager ID
2018-09-07 17:27:19 -07:00
snipe
ff879e2018
Added the ability to update asset location when auditing - per #5854
2018-09-07 05:39:41 -07:00
snipe
181e75adb4
Apply hotfix for fixed category model scope
2018-09-07 03:56:17 -07:00
snipe
51d3d130e4
Fixed Not unique table/alias: 'models' on custom report triggered when category is selected
2018-09-07 03:19:54 -07:00
snipe
827a86b2ef
Only send inventory report to users if they have things checked out to them
2018-09-07 03:08:32 -07:00
snipe
77cdb2f409
Added console command to send inventory reports to users
2018-09-07 02:24:41 -07:00
snipe
26fd7f7e79
I have no idea why this was necessary suddenly
2018-09-06 14:28:04 -07:00
snipe
b80b91514d
Fixed Laravel 5.7 compatibility issue re: boot() method
...
This was causing the error: Undefined index: App\Models\CustomField (View: /Users/snipe/Sites/snipe-it/snipe-it/resources/views/hardware/index.blade.php)
and pointed to the Eloquent model library method:
```
protected function initializeTraits()
{
foreach (static::$traitInitializers[static::class] as $method) {
$this->{$method}();
}
}
```
Thanks to https://github.com/laravel/framework/issues/25455 for the clue.
2018-09-05 19:27:37 -07:00
Ivan Nieto
0014ef054b
Search functionality in accessories/{accessory} issue #5471 : ( #6070 )
...
From the collection of users displayed just filtered the data with the method where() and concat()
for the user can search for first name or last name. The solution is case sensitive.
2018-08-28 13:25:16 -07:00
Wes Hulette
3831ee9f5a
Fixed #5811 - Non US Characters in user export ( #6132 )
...
* Added Freebsd as vagrant machine for development
* Ran npm audit fix
Manually added peer depenencies
* Added charset=UTF-8 to content-type
Removed reference to throttle model as is is not longer included.
2018-08-28 12:37:58 -07:00
Dmitriy Minaev
bc8fa31eb2
Add depreciation with half-year convention. Fixed #1237 ( #6128 )
...
* Add half-year convention in depreciation for Models/Depreciable.php
* Add a setting for the depreciation method
* Integrate half-year convention inside working output
* fix: add more checks at Depreciable.php
* depreciation value rounding
* Codestyle fix
2018-08-28 12:32:46 -07:00
snipe
5b8cbe29e1
Possible fix for #5054 - OpenLDAP (non-AD) LDAP users being deactivated
2018-08-27 14:51:37 -07:00
snipe
e4f6aefdad
Added self-checkout permission option
2018-08-21 23:26:12 -07:00
snipe
771265113e
Added cookie serialization for Laravel v5.6.30
2018-08-21 22:40:14 -07:00
snipe
db907815ff
Removed check for active in password reset form
2018-08-21 18:40:27 -07:00
snipe
aed769c0be
Honor active status for forgotten password request forms
2018-08-14 20:05:57 -07:00
snipe
ae6abdddad
Check the user is active before displaying password reset
...
This would only come into play if an inactive user already received a password reset email and then the system was upgraded to prevent those emails from being sent to inactive users
2018-08-14 19:04:47 -07:00
snipe
63c9fbe10c
Temporarily disbable notifying users on import
2018-08-14 18:27:46 -07:00
snipe
1543cdbc61
Set activated checkbox to 1 by default on new user
2018-08-14 18:17:37 -07:00
snipe
5db5134ae0
Set activated to default on when new user is created
2018-08-14 18:14:41 -07:00
snipe
05b2b8fb59
Tweaked code/language for password reset
2018-08-14 18:09:33 -07:00
snipe
25097bce31
Only allow activated users to reset their password
2018-08-14 18:04:27 -07:00
snipe
0100c56046
Only allow password reset if user is active
2018-08-14 17:46:29 -07:00
Till Deeke
62195a805a
Adding some comments
2018-08-06 14:47:26 +02:00
Till Deeke
8c96e8fd4b
Updates asset acceptance report to show unaccepted assets
2018-08-06 14:47:26 +02:00
Till Deeke
1bdf71b584
Handle side effects of accepting/declining
...
When declining an asset, it gets checked in.
2018-08-06 14:47:26 +02:00
Till Deeke
8648d53d25
Adds checkout acceptances
...
A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature
2018-08-06 14:47:26 +02:00
Till Deeke
6b05106dcb
Moves license checkout stuff to the license seat
...
Since we are really checking out a license seat instead of the whole license, we operate the checkin/checkout on the license seat instance.
2018-08-06 14:47:26 +02:00
Till Deeke
43437aac14
Adds acceptable contract to asset
2018-08-06 14:46:10 +02:00
Till Deeke
830a6cf67e
Adds accepting/declining to new controller
2018-08-06 14:46:10 +02:00
Till Deeke
39e6b59335
Fixes some typos
2018-08-06 14:46:10 +02:00
Till Deeke
72b43b6526
Updates checkout notifications to use new routes for accepting
2018-08-06 14:46:10 +02:00
Till Deeke
e0423418d2
Moves logging checkin/checkout to separate listener
2018-08-06 14:46:10 +02:00
Till Deeke
e24f292a1a
Updates checkout events to not depend on log
2018-08-06 14:46:10 +02:00
Till Deeke
17fc59f989
Adds back the checkin/checkout events after #5916
2018-08-06 14:46:10 +02:00
Till Deeke
775e46288e
Cleanup of model attributes
2018-08-06 14:46:10 +02:00
Till Deeke
722f032895
Remove notification sending from loggable trait
2018-08-06 14:46:10 +02:00
Till Deeke
112a532618
Listen for checkout events and send appropriate notifications
2018-08-06 14:46:10 +02:00
Till Deeke
ef76908fce
Listen for checkin events and send the appropriate notifications
2018-08-06 14:46:10 +02:00
Till Deeke
4a71542f23
Cleanup checkin notification constructors
2018-08-06 14:46:10 +02:00
Till Deeke
ea64abc607
Adds checkout events
2018-08-06 14:46:10 +02:00
Till Deeke
f0acf47101
Adds checkin events
2018-08-06 14:46:10 +02:00
Till Deeke
92a2a5ccbc
Adds listeners for checking/checkout events
2018-08-06 14:46:10 +02:00
Daniel Meltzer
2d0df24ef3
Check for an existing username before getting creative. Fixes #6016 ( #6039 )
2018-08-03 16:35:13 -07:00
snipe
1a660911e7
Check for minimum PHP version in setup
2018-08-02 21:36:18 -07:00
Daniel Meltzer
e368a20427
Use filled instead of has. ( #6033 )
...
I think this merged in a weird order and was missed by the global
find/replace. This fixes bulkassets/bulkusers editing.
At some point we should look at refactoring BulkAssetsController@edit to
only run one DB query, rather than one per item.
2018-08-02 09:54:19 -07:00
Daniel Meltzer
2637ce56a1
Allow importcontroller to return 200 for failed delete. ( #6034 )
2018-08-02 09:53:54 -07:00
snipe
f5a5d830a5
Better handling for deleting imports where the files may have been moved
2018-08-01 20:49:55 -07:00
snipe
9168979d9e
Fixed #6027 - added model to asset maintenances listing
2018-08-01 18:24:52 -07:00
snipe
3f394f42c7
Partial fix for better UI on deleting files
...
Still needs Vue stuff
2018-08-01 18:01:16 -07:00
snipe
b2c99c88bb
Fixed #6028 - added supplier url to list view
2018-08-01 17:37:58 -07:00
snipe
694166862e
Added attempted logins admin screen ( #6018 )
...
* Added attempted logins admin screen
* Smaller table spacing
2018-08-01 03:51:59 -07:00
snipe
911c2398ef
Fixed #6004 - set a default next_audit_date if none provided
2018-08-01 03:04:29 -07:00
snipe
2c38036123
Improvement: Better documentation, small refactors ( #6017 )
...
* Better documentation, small refactors
* Small comment fixes
2018-08-01 00:06:41 -07:00
snipe
b1b5eeecba
Fixed #6013 - add accessory checkout notes to detail page
2018-07-31 16:00:38 -07:00
snipe
400913631c
Use language strings for bulk password reset
2018-07-30 20:37:19 -07:00
snipe
006a3adea0
Added ability to trigger forgotten password emails for users
2018-07-30 20:31:02 -07:00
Daniel Meltzer
248fcfa869
Move findLicenseSeatToCheckout back to controller. ( #5970 )
...
* Move findLicenseSeatToCheckout back to controller.
After discussion, move findLicenseSeatToCheckout method back to
controller from form request. Also cleanup one tiny bit more with null
coalesce operator (Yay php 7).
* Revert Earlier change.
$target only exists in the checkoutTo* methods. Need to log the
checkout individually in each of those.
2018-07-27 12:03:04 -07:00
Daniel Meltzer
b58c77c8b8
Feature: Import users department. ( #5987 )
...
Maps to the "Department" header key by default. Bug: #5382
2018-07-27 12:02:18 -07:00
Daniel Meltzer
94c79fa69a
Fixed #5964 - Feature: Group IDs can be passed to User Create. ( #5990 )
...
Also added to update, and adjusted api tests to confirm. Long term it
might be nice to look at support for passing group names instead.
Bug: 5964
2018-07-27 12:01:59 -07:00
Daniel Meltzer
a3811f632d
Licence != License ( #5993 )
2018-07-27 12:01:25 -07:00
snipe
d8f0102204
Merge branch 'features/restore_deleted_cmd' into develop
...
# Conflicts:
# config/version.php
# resources/views/layouts/basic.blade.php
2018-07-27 02:48:13 -07:00
snipe
524c6c502e
Features/restore deleted cmd ( #5982 )
...
* Delete content from login attempts table
* Script to restore deleted users and put their asset assignments back
* Uncomment backup
2018-07-27 02:42:55 -07:00
snipe
6b013724aa
Uncomment backup
2018-07-26 18:11:51 -07:00
snipe
8774f0cf45
Script to restore deleted users and put their asset assignments back
2018-07-26 18:08:49 -07:00
snipe
8762e158c4
Delete content from login attempts table
2018-07-26 18:08:25 -07:00
Daniel Meltzer
49d95892e3
Port asset history importer to league/csv9 ( #5972 )
2018-07-26 12:04:21 -07:00
snipe
9618878023
Restrict users asset listing to just assets checked out to users
2018-07-25 21:40:33 -07:00
snipe
614e858e44
Restrict users asset listing to just assets checked out to users
2018-07-25 21:38:14 -07:00
snipe
373885ebd1
Use Storage for file uploads (not model images)
2018-07-25 11:57:49 -07:00
snipe
a9fd9c9e59
Moved gates to individual controller methods to fix “This action is unauthorized” in route:list
2018-07-25 10:45:32 -07:00
snipe
63bf71b071
Use Storage methods for asset/license files
2018-07-25 09:48:50 -07:00
snipe
7a9a78ec53
Make Codacy happy by reversing the signature params
2018-07-25 07:14:16 -07:00
snipe
91a9e410df
Fixed weird whereNULL
2018-07-25 06:46:06 -07:00
snipe
501f096a2c
Updated spatie backup config file for their latest version
2018-07-25 01:36:30 -07:00
snipe
47ed328f0e
Change fire() to handle() for Laravel 5.5
2018-07-25 01:28:44 -07:00
snipe
7af633177a
Fixed filledFile back to hasFile
2018-07-24 22:52:49 -07:00
snipe
86c1f11bec
Change $request->has to $request->filled unilaterally
2018-07-24 22:51:31 -07:00
snipe
0714ac4248
Update withCounts because Laravel 5.5 :(
2018-07-24 22:40:05 -07:00
snipe
e6dd90e055
Added footer settings to settings reset
2018-07-24 22:21:16 -07:00
snipe
b2968ea6c6
Fixed paths to Aurhorizable/Authenticatable contracts
2018-07-24 21:29:08 -07:00
snipe
3d3ed6ab03
Logging updates for 5.6
2018-07-24 21:13:02 -07:00
snipe
7bb50a61a7
Applying @dmeltzer’s changes from afc8ac5e72
2018-07-24 21:13:02 -07:00
Daniel Meltzer
64d649be7f
Monster: Cleanup/Refactor http controllers. ( #5916 )
...
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods.
* Use same image upload/layout in accessories as consum+components.
* Monster: Cleanup/Refactor http controllers.
This cleans up docblocks, pulls most non-crudy actions into their own
controllers, and does general cleanup/logic refactoring. There /should/
be no functional changes, but we all know how should works..
Extract checkin/checkout functions to a separate controller for accessories.
Move controllers to subdirectory.
Cleanup AssetModelsController
Extract component checkin/checkout
Assorted cleanups/doc/formatting in controllers.
Refactor LicenseController.
Refactor UsersController
Update viewassetscontroller.
* Codacy cleanups
* More codacy cleanups. Extract a LicenseCheckout Form request as well.
* A bit more refactor/cleaning of the license checkout method.
* Review Related Cleanups
* Fix most of the item_not_found translations. In many cases, the
string being generated did not even use the id parameter. Where it
does, pass it as id instead of as a different value.
* Remove some old $data arrays from when we manually sent emails from
the controllers. This has been superseeded by the notification system
(yay!)
* Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
2018-07-24 19:35:26 -07:00
snipe
e320d2ba05
Fixed #5944 - added logo option for print-assets page ( #5950 )
2018-07-24 13:37:02 -07:00
snipe
ed78a4b8a0
Fixed activated issue for strict mode
2018-07-24 13:28:59 -07:00
snipe
376eb52f00
Fixed #5938 - added “self location edit” as permission
2018-07-24 12:42:16 -07:00
snipe
f4cfb31bf4
Use request object
2018-07-24 12:10:02 -07:00
snipe
227dc7e81d
Save model display setting - fix for issue in #5301
2018-07-24 12:10:02 -07:00
Azerothian
66c3f5432d
implemented specific seat checkout ( #5887 )
2018-07-23 20:28:45 -07:00
Daniel Meltzer
059126f642
Checkout update locationid ( #5919 )
...
* Fix missing punctuation. Bad merge.
* If we're checking out to an location, use it's id instead of location_id
2018-07-23 06:47:21 -07:00
Daniel Meltzer
3bc43210ab
Add ID to the allowed sort fields in api/Users. ( #5929 )
2018-07-23 06:46:50 -07:00
Daniel Meltzer
82194cef8a
bugfix: updating a user when an admin (not a superuser) would remove any groups from the user. ( #5914 )
2018-07-21 23:02:06 -07:00
Till Deeke
e1c095adca
Removes the typehint for search term string ( #5904 )
...
The „string“ typehint only works in PHP >= 7.0.0.
Since we are still supporting versions below that, remove the type hint.
2018-07-20 13:23:44 -07:00
Till Deeke
45a2932f4b
Fixes the generation of where conditions ( #5902 )
2018-07-20 13:23:29 -07:00
Till Deeke
b6e3715cd8
Fix: No Notifications for checking out Consumables ( #5898 )
...
* Adds a method to consumables to check if a notification should be sent
Adds the checkin_email method to Consumables, this gets checked in notifications when checking out the consumable.
Without the method, no notifications get sent for checking out consumables.
* Fixes the checkin_email method on the License model
This should allow the License to also send checkout/checkin notifications again.
2018-07-20 13:22:49 -07:00
snipe
d45e90e358
One more fix for #5893
2018-07-19 14:45:28 -07:00
snipe
7ebb7876c4
Partial fix for #5896
...
Still need to fix the front end on edit, which seems to be defaulting to boolean
2018-07-19 10:40:07 -07:00
Daniel Meltzer
351274c633
Hotfix: the checkin_email does not exist on consumable. ( #5891 )
2018-07-19 10:38:50 -07:00
snipe
a0c0b7b1eb
Fixed #5893 - activated typo
2018-07-19 10:22:08 -07:00
snipe
5a34d43a86
Fixed #5895 - wrong date validation in maintenances
2018-07-19 10:19:55 -07:00
snipe
9d00ae6e50
Fixed #5894 - lookup by asset tag in top search broken
2018-07-19 10:14:02 -07:00
snipe
9daeeeb851
Features/nicer notifications ( #5886 )
...
* Improved expiring licenses notification
* Improved expiring assets notification
* Nicee low inventory notification
* Refactored stupid language strings
* Oops
* Use settings variable
2018-07-18 19:15:45 -07:00
Daniel Meltzer
92671823d8
Userimport fixes/improvements ( #5884 )
...
* Send notification when user is created.
* Flesh out default user mappings
* Add user importing test.
2018-07-18 19:15:07 -07:00
Daniel Meltzer
19396b2107
Logic Fix ( #5877 )
...
If we have a username, we should look that up even if we do not have a
first name.
2018-07-18 19:10:36 -07:00
snipe
d309f67df0
Set activated to zero if no values passed for active user
2018-07-18 08:27:26 -07:00
snipe
1c0ee7c4c5
Fixed license checkout gate
2018-07-18 05:33:14 -07:00
snipe
5a1e1c73c9
Include show_in_list option in select
2018-07-18 03:59:02 -07:00
snipe
3be68ec721
Fix location edit permissions
2018-07-18 03:43:45 -07:00
snipe
027edbdb21
Fixed #5872 - asset maintenances listing showing created_at instead of start_date
2018-07-18 02:24:53 -07:00
Daniel Meltzer
cf03d25934
Fix importer emailformat ( #5871 )
...
* Fix Importer emailformat
Str::slug() strips periods from the string, which caused our existing
logic to misbehave when generating a user's email on an import. Adjust
logic to use generateEmail() helper on user instead. Also clean up some
of the logic in this method.
* Remove dead code.
* More refactor/cleanup of the user create method. I think it is almost readable now.
2018-07-17 16:46:08 -07:00
snipe
bcd988bb81
Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop
...
# Conflicts:
# app/Http/Controllers/Auth/LoginController.php
2018-07-17 01:11:15 -07:00
snipe
aa6c21f38d
Fixed typo
2018-07-17 01:03:32 -07:00
snipe
0f85d6810b
Added login log
2018-07-16 23:49:08 -07:00
snipe
bf761946da
Fix activated check for login
2018-07-16 23:48:46 -07:00
snipe
d9fa2f0e91
Fixed #5842 - added components to location detail view
2018-07-16 21:50:14 -07:00
DeusMaximus
7c2da81700
Fix REMOTE_USER Header with IIS and AD
...
Remove DOMAIN\ portion of DOMAIN\user when using Windows Authentication and IIS with REMOTE_USER.
2018-07-17 14:03:19 +10:00
snipe
a4799a495a
Fixes #5859 - add file name/size to file upload UI ( #5861 )
...
* Fixes #5859 - add file name/size to file upload UI
* Reverting assetcontroller
Not sure exactly what happened here…
* Production assets
2018-07-16 20:09:53 -07:00
Till Deeke
b5de5ac19c
Fix: Searching for multiple terms on assets ( #5860 )
...
* Give advancedTextSearch all search terms at one
The additional conditions for assets had some problems, since they were joining tables for the additional attributes. The method was called once for every search term, so the join was added multiple times if the user entered multiple search terms.
* Allows search to handle multiple search terms better
The search now better handles multiple search terms, adding additional orWhere clauses, instead of duplicating all queries.
* Fixing typo
2018-07-16 17:44:31 -07:00
Daniel Meltzer
638a7b2d91
Assetcontroller cleanup ( #5858 )
...
* Extract method/cleanup
* Remove apiStore method that is unusued since api controllers.
* Use proper model exception
* Remove old user importer. This is now supported by the general importer framework.
* Refactor AssetsController methods.
This is a giant diff without many functional changes, mostly cosmetic.
I've pulled a number of methods out of assetscontroller, preferring
instead to create some more targetted controllers for related actions.
I think this cleans up the file some, and suggests some places for
future targetted improvement.
Fix weird missing things.
* Fix Unit test failing after date changes.
* Pass valid string to be translated.
* Some method cleanup for codacy.
* Extract trait for common checkout uses and codacy fixes.
2018-07-16 17:44:03 -07:00
Daniel Meltzer
8f6e0ad5be
Only error if checking out to asset with same id ( #5845 )
...
A user with an id of 2 is perfectly fine as a checkout_target of an asset with an id of 2.
2018-07-16 14:25:36 -07:00
Daniel Meltzer
50e0b9b84e
category_id not category_i ( #5844 )
2018-07-16 14:23:24 -07:00
Daniel Meltzer
b6b93550fe
Remove old helpers ( #5843 )
...
* Cleanup model bulk-edit
Use the general partials where appropriate, as well as display a list of
what models we are editing in the bulk edit.
* Use new api based fetch/display for modal select2.
This is just copy/pasting the code currently because I'm not entirely
sure how the two pieces of code interact.
* Remove old helper functions that are no longer necessary with our populating of select2 dropdowns via ajax.
2018-07-16 14:22:25 -07:00
Till Deeke
baa3be728d
Refactoring: A nicer and easier syntax for searching models ( #5841 )
...
* Adds the ability to search by dates
Adding extra „where“-conditions to the „TextSearch“ queries, allowing the users to search by dates
* Adds missing dates to $dates in models
* Removes duplicated „where“ conditions
* Adds the Searchable trait to models, defining the searchable attributes and relations
* Removes the old text search methods
* Adds back additional conditions to the search
These conditions could not be modeled in the „attributes“ or „relations“, so we include them here
* Removes unnecessary check for the deleted_at attribute
* Fixes typo in comments
* suppresses errors from Codacy
We can safely ignore the error codacy is throwing here, since this method is a standin/noop for models who need to implement more advanced searches
2018-07-16 14:13:07 -07:00
Till Deeke
240e642fe9
Removes the unused bulk operations for components ( #5840 )
2018-07-16 14:11:38 -07:00
Till Deeke
07a92d20d7
Fixing #5773 : Refactoring the "clearing" of select2 lists ( #5839 )
...
* adds select2 placeholders to select lists
To allow us to clear the selection on „select2“ selects, we need a placeholder attribute
See: https://select2.org/placeholders
* Removes empty option from multiple select
select2 requires an empty option value on singular selects, but not on multiple selects.
When selecting multiple options, this empty option would be shown as selectable otherwise, not clearing the selection.
* Adds the option to clear select2 instances
Sets the correct options to allow clearing of out select2 instances. The empty placeholder is required, since clearing only works when a placeholder ist set (event an empty one).
See: https://select2.org/placeholders
* Removes the „Clear selection“ option from select lists
Since we can clear the select2 lists with their native clearing method, we can remove this hack
* Updates generated assets (css/js)
2018-07-16 14:10:54 -07:00
Till Deeke
3f334406d1
Fixing #5470 : Checkin emails not working ( #5838 )
...
* Always send checkin notifications to users
This fixes the routing of the notifications, to only send „checkin“ emails if the „mail on checkin“ flag on the category was set. (and we checkout to a user with a non-empty email)
* Fixes checkout notification routing
Notifications to users should be send if the category of the resource (accessory/asset/consumable/license):
a) requires the user to confirm acceptance
b) should send notifications on checkin/checkout
* adds a check for EULAs
Adds back a check for the EULA, since the user should receive the EULA if it was set (regardless of other setings on the category, etc)
2018-07-16 14:09:04 -07:00
Till Deeke
dbd177576e
Brings back the „pending“ state when checking out ( #5837 )
...
When a user would get an asset checked out for them, and the assets category required acceptance of the asset, the „pending“ state would not get set.
2018-07-16 14:07:24 -07:00
Till Deeke
0fb9f42ba4
Removes setting the encryption status on update ( #5833 )
...
When we are updating a custom field, we don’t want to change the „field_encrypted“-setting on it.
2018-07-13 04:04:30 -07:00
Till Deeke
27699aa99c
Adds permission checks for custom fields and custom fieldsets ( #5645 ) ( #5795 )
...
* adds permission checks to custom fields
* adds permission checks to custom fieldsets
* adds separate permissions for custom fieldsets
* check for permissions in views
* Removes custom fieldsets from permissions config
* Proxy the authorization for custom fieldsets down to custom fields.
This allows us to use the existing permissions in use and have more semantically correct authorization checks for custom fieldsets.
* simplifies the authorization check for the custom fields overview
* removes special handling of custom fieldsets in base policy
I just realised that this code duplicates the logic from the custom fieldset policy.
Since we are checking for the authorization of custom fields anyway, we can just use the columnName for the fields.
* cleanup of unused imports
2018-07-12 18:28:20 -07:00
Till Deeke
48bbbe0f40
Fixing authorization issues ( #5807 )
...
* adds permission checks for companies
* adds permission checks for depreciations
* adds permission check for all reports
* fixes permissions for departments
* fixes permission naming (edit -> update)
* fixes authorization checking wrong permission in API
The authorization was checking for the non-existent „edit“ method where it should have checked for the „update“ method.
* adds authorization checks for select2 lists
* adds missing authorization checks for api
* fixes user authorization check for creating users
* adds additional check viewing assets on showing a users assets
* Removes authorization checks for select2 lists
Reference: https://github.com/snipe/snipe-it/pull/5807#pullrequestreview-136018755
2018-07-12 18:28:02 -07:00
Antti
9dc226e3d6
Feature: PostgreSQL support ( #5642 )
...
* Made migrations work with pgsql and changing empty integers to null
* Fixed the last functional test
2018-07-12 18:24:43 -07:00
Jason
98b20fc1cd
Added option to include model information on asset labels. ( #5301 )
...
* Added option to include model information on asset labels.
Cleaned up label page to fix skewed label alignment on last row per page.
* Changes made per Snipe's direction
changed type from tinyint to boolean in DB
changed labels back to initials
2018-07-12 18:23:12 -07:00
5quirrel
bf8fe316df
Fix for #4901 ( #5829 )
2018-07-12 16:45:12 -07:00
snipe
78530ae123
Fix tests
2018-07-09 21:57:45 -07:00
snipe
339263a295
Fixed #5751 - added option for unique constraint on serial
2018-07-05 19:30:36 -07:00
snipe
a44bd9abe0
Disallow deleting category if there are licenses
2018-07-05 18:02:25 -07:00
snipe
4099c06b27
fix middleware priority: handle trusted proxies prior setup check
...
From @plexorama
2018-07-05 15:36:59 -07:00
snipe
869de3d251
Fixed broken pagination on status labels API
2018-07-05 14:42:39 -07:00
snipe
f3526eccb9
Merge branch 'features/textarea-custom-field' into develop
...
# Conflicts:
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2018-07-05 12:37:07 -07:00
Daniel Meltzer
880faa83a6
Importer2 checkout ( #5771 )
...
* Importer: checkout to location, backend changes+tests.
* Import location checkout. Frontend changes.
* Allow importing of item number/model number for consumables.
2018-07-05 12:22:24 -07:00
Juan Font
311f9fcefb
Implemented method to get info on the current user of the API ( #5722 )
...
* Implemented method to get info on the current user of the API
* Move userinfo method to UsersController
* Added missing files
2018-07-02 20:35:10 -07:00
snipe
d7dc4ae0c0
Added manager to custom report
2018-06-27 00:45:09 -07:00
snipe
9442736518
Adds textarea as a custom field type
2018-06-21 09:35:04 -07:00
snipe
f8429ad357
Merge branch 'docker-fixes' of https://github.com/thelamer/snipe-it into thelamer-docker-fixes
2018-06-21 07:31:15 -07:00
Djamon Staal
32e3f748d8
Make version footer configurable. ( #5730 )
2018-06-21 07:12:16 -07:00
Daniel Meltzer
ad21857cae
Update my email address across files. ( #5716 )
2018-06-20 01:59:59 -07:00
Daniel Meltzer
2d18b73138
Fix #5408 . ( #5715 )
...
The temporary password cannot be added to the users data until after do
any update-related logic, otherwise their password will be overwritten.
2018-06-20 01:59:04 -07:00
snipe
1a64879b65
Only allow remote user settings to be saved if the app is not in demo mode
2018-05-31 10:55:48 -07:00
snipe
15916e6668
Allow checkout to non-user objects even if the object requires checkout
2018-05-21 17:35:04 -07:00
snipe
76d0562716
Added last name to expected checkin notification
...
For non-US countries like Germany where it’s considered rude not to include last name
2018-05-21 17:34:27 -07:00
snipe
ece916e12f
Merge branch 'develop'
2018-05-21 15:41:40 -07:00
snipe
1a29d4f60f
Check for > 0 expected assets
2018-05-21 15:41:19 -07:00
snipe
e636875797
Merge branch 'develop'
2018-05-21 14:56:57 -07:00
snipe
20a3b556bb
Removed log
2018-05-21 14:33:27 -07:00
snipe
d89ef43834
Make category counters ints
2018-05-18 16:05:12 -07:00
snipe
8eb96efa13
Merge branch 'develop'
2018-05-16 19:38:23 -07:00
snipe
e9973670ea
Could should not be equal to 1
2018-05-16 19:38:02 -07:00
snipe
ef8d2d06df
Fixes #5519 - count() for php 7.2
2018-05-16 19:35:14 -07:00
snipe
0b5bb520a7
Merge branch 'develop'
...
# Conflicts:
# config/version.php
2018-05-16 19:24:31 -07:00
lea-mink
233fb23cb8
Create asset maintenance - Added orange bar for required asset to edit view ( #5520 )
...
* Added orange bar for required asset to edit view
* disable redirection to asset maintenances view
* Update - disable redirection to asset maintenances view
2018-05-16 19:23:23 -07:00
snipe
4c656c0321
De-normalize new counters from 4.3.0 ( #5547 )
...
* Added de-norm counter migration for assets
* Renaming counter columns, since Eloquent has a magical *_count helper
* Added artisan command to sync counters (one-off)
* Update API to use de-normed fields
* Increment counters for checkin;/checkout
* Derp.
* Added request increment/decrementer
* Move increment for checkout to the Asset::checkout method
* Added “could take a while” message
2018-05-16 19:20:43 -07:00
snipe
aab190423f
Partial fix for license+category tests
2018-05-16 18:35:11 -07:00
snipe
4ba9792fbe
Merge branch 'develop'
2018-05-09 15:29:59 -07:00
snipe
8ad5eb3e59
Fixed #5500 - present() on correct location value
2018-05-08 09:21:43 -07:00
snipe
3df8fa99f0
Merge branch 'develop'
2018-05-08 07:37:44 -07:00
snipe
13195d06fd
Fixed #5491 - added default location filter for custom report
2018-05-08 07:34:14 -07:00
snipe
f74d50439c
Merge branch 'develop'
2018-05-08 05:39:28 -07:00
snipe
8f64da5bc7
Added admin alert on expiring notifications
2018-05-08 05:27:03 -07:00
snipe
25f537e730
Merge branch 'develop'
...
# Conflicts:
# config/version.php
2018-05-08 03:49:28 -07:00
snipe
e56a46882d
Include EULA/acceptance in license interfaces
2018-05-08 03:47:28 -07:00
snipe
0476ffecdb
Removed debugging comments
2018-05-08 03:46:48 -07:00
snipe
04709dc1df
Fixed #5477 - added GDPR privacy policy link in email and webpage
2018-05-08 00:50:13 -07:00
snipe
f48171dcab
Add category to licenses
2018-05-08 00:14:38 -07:00
snipe
7b8362b64c
Added license categories
2018-05-04 21:01:38 -07:00
snipe
188538651a
Fixed slack notification error if location is not set on checkin
2018-05-04 21:01:25 -07:00
snipe
a9fc7e04e9
Fixed php7.2 count issue
2018-05-04 21:00:58 -07:00
snipe
ec1fa8e90a
Merge branch 'develop'
2018-05-03 08:06:58 -07:00
snipe
3a1b432234
Fixed #5472 - show_in_email for custom fields missing in edit field UI
2018-05-03 08:06:28 -07:00
snipe
98f853128a
Merge branch 'develop'
2018-05-03 05:43:49 -07:00
snipe
276d2bc866
Fixed advanced search on model number
...
(RB:347)
2018-05-03 05:43:25 -07:00
snipe
0472e3a3e5
Merge branch 'develop'
2018-05-02 14:41:10 -07:00
lea-mink
a0afa9f2e8
Modified the affectation of the value of the password in credential mail sent for the first user sign up ( #5446 )
...
* Modified the affectation of the value of the password
* Remove e()
2018-05-02 14:40:41 -07:00
snipe
0116fa9b95
Merge branch 'develop'
...
# Conflicts:
# config/version.php
2018-05-02 14:35:16 -07:00
snipe
0be69f57ac
Improved files display
2018-05-02 14:13:06 -07:00
snipe
97f748d58e
Removed old reports methods and routes
...
We only use the custom asset report now
2018-05-02 03:44:31 -07:00
snipe
71708e349c
PHP7.2 count fixes ( #5427 )
...
* PHP 7.2 count() fixes
* Re-enable php travis 7.2
2018-04-29 06:10:49 -07:00
snipe
6df7f6d6ec
Fixes wrong users index route name
2018-04-26 16:31:02 -07:00
snipe
5365182c86
Fixed advanced search on supplier, count for PHP7.2
2018-04-25 20:25:03 -07:00
Hannah Tinkler
c4c520c1a3
Fixes #4445 : prevents assigned assets from being checked out in bulk checkout ( #5421 )
...
* Fixes #4445 : prevents assigned assets from being checked out in bulk checkout
* Updates data attribute to more versatile 'data-asset-status-type'
* Fixes broken unit test
2018-04-25 02:39:23 -07:00
snipe
088eb3da14
Merge branch 'develop'
2018-04-24 13:24:24 -07:00
snipe
0e1dfcf408
Changed directory for audits image dir
2018-04-24 13:20:15 -07:00
snipe
3ca9f5f389
Merge branch 'develop'
2018-04-24 12:49:28 -07:00
snipe
1708bb5cdf
Fixes #5422 - remove extension ending from uploaded file name
2018-04-24 12:47:09 -07:00
snipe
8127484081
Better error checking for private file display method
2018-04-24 03:12:30 -07:00
snipe
103c75e78c
Removed max cap in image validation
2018-04-24 03:12:17 -07:00
snipe
d886dcc7c3
Reset skin for demo
2018-04-24 03:00:56 -07:00
snipe
ea54d73911
Merge branch 'develop'
2018-04-24 02:59:19 -07:00
snipe
1ef4cc9fc2
Fixed #4301 - added image upload to audit
2018-04-24 02:54:54 -07:00
lea-mink
c8cbc55b59
Bulk Checkout to Assets and Location ( #5385 )
2018-04-23 21:24:49 -07:00
Hannah Tinkler
8d501e1c24
Feature/custom fields default values ( #5389 )
...
* Fixes CustomFieldsetsController::fields() which I think is not used anywhere else and don't think ever worked as you can't call get() on a Collection.
Have tested extensively and doesn't seem to affect anywhere else?
* Adds default value functionality
* Adds built assets
* Fixes assignment to asset_model_id which should have been evaluation and alters route so it sits more in line with existing work
* Updates built assets
* Remove silly docker.env file; fix Dockerfile to preserve Oauth keys (#5377 )
* Added department to custom asset export
Updates build assets
* Adds translation support for 'add default values' checkbox label
2018-04-23 21:16:55 -07:00
snipe
132a5d424d
Check for valid accessory category
2018-04-23 16:04:01 -07:00
snipe
4c5f20fde4
Merge branch 'develop'
...
# Conflicts:
# app/Importer/Importer.php
# config/version.php
2018-04-23 13:33:34 -07:00
Stephen
c23955d0b5
Allow setting of "ldap_import" through the API ( #5218 )
...
* Allow setting of "ldap_import" through the API, this will allow cusom scripts to be made to import data from Active directory using the API, this would allow any field to be filled such as the manager (based on the ID), department etc.
* Password fix for LDAP through API
2018-04-20 14:02:52 -07:00
snipe
6efe9efab8
Fixes #5393 - added notes to suppliers API ( #5400 )
2018-04-19 18:28:22 -07:00
Daniel Meltzer
7b72dde222
Another importer fix. ( #5383 )
...
* Fix condition where matching user fails when providing a username but no full name. Also shortcircuit username matching if a user exists.
* Simplify Logic
If the user provided is numeric, but doesn't exist in the database, assume that the user's name is a number and go through all relevant generation. of email/first+last names. Alternatively we may want to abort or remove the is_numeric bits.. it seems a little counterintuitive
2018-04-18 07:58:26 -07:00
snipe
5948a0b235
Added department to custom asset export
2018-04-16 20:10:38 -07:00
snipe
bbc0695a8f
Added count of checkins, checkouts, requests ( #5314 )
...
* Added count of checkins, checkouts, requests
* Removed old commented items
* Use actionlog instead of redefining the relationship
2018-04-06 16:23:39 -07:00
snipe
2253439940
Added default location/address to custom report
2018-04-05 17:33:25 -07:00
snipe
8a6713d5c0
WIP - Improved requested assets ( #5289 )
...
* WIP - beginning of improved requested assets
- Use Ajax tables for faster loading
- Use new notifications for requesting an asset
TODO:
- Use ajax tables for requestable asset models
- Use new notifications for canceling an asset request
- Expire requests once the asset has been checked out to the requesting user
* Only show asset name in email if it has one
* Refactor requested method to only include non-canceled requests
* Refactored requestable assets to log request and cancelation
* Added softdeletes on checkout requests
* Differentiate between canceling and deleting requests
* Added asset request cancelation notification
* Added timestamps and corrected unique key on requests table
* Improved requests view
* Re-use blade for cancel/request email
* Refactored BS table formatter for requested assets
* Location name min reduced to 2
* Added PAT test as maintenance option
This needs to be refactored into database-driven options with a UI
* Better slack message
* Added getImageUrl method for assets
* Include qty in request notifications
TODO:
- Try to pull requested info from original request for cancelation, otherwise it will default to 1
* Removed old asset request/cancel emails
* Added user profile asset request routes
* Added profile controller requested assets method
* Added blade link to requested assets for profile view
* Sort user history desc
* Added requested assets blade
* Added canceled at to checkoutRequest method
* Include qty in request
* Fixed comment, removed allowed_columns
* Removed Queable methods, since we don’t use a queue
* Fixed return type in method doc
* Fixed version number
* Changed id to user_id for clarity
2018-04-04 17:33:02 -07:00
snipe
201efecafa
Fixed #5293 - component category drilldown
2018-04-02 16:12:19 -07:00
snipe
4786c1c59f
Check for custom fields in Importer
2018-03-30 18:50:09 -07:00
lea-mink
99a9707a34
Add title field in Asset Maintenances list/filter/export ( #5287 )
2018-03-29 05:32:09 -07:00
Daniel Meltzer
787f2390fb
Add location_id to fillable ( #5286 )
...
Should fix #5268
2018-03-29 05:11:07 -07:00
snipe
a510ac4052
Fixed #5272 - make city min length 2 instead of 3
2018-03-29 04:36:18 -07:00
snipe
9f414baa99
Remove notifiable from asset
2018-03-28 19:08:08 -07:00
snipe
086711e467
Fixed checkout to checkin in loggable checkin trait
2018-03-28 19:01:51 -07:00
Daniel Meltzer
4c43226b99
Fix #4798 . ( #5271 )
...
Filter down the custom fields we are iterating over to only custom fields in the header row.
This prevents nulling out fields when performing an import-update that doesn't include
all custom fields as well as properly nulls out values between items being imported.
2018-03-28 19:01:51 -07:00
snipe
dfe8aac10b
Fixed checkout to checkin in loggable checkin trait
2018-03-28 19:01:10 -07:00
snipe
983786c29f
Fixed component checkout bug
2018-03-28 18:53:18 -07:00
snipe
edb81425cf
Fixed component checkout bug ( #5282 )
2018-03-28 18:53:03 -07:00
Daniel Meltzer
e9d9c0c42d
Fix #4798 . ( #5271 )
...
Filter down the custom fields we are iterating over to only custom fields in the header row.
This prevents nulling out fields when performing an import-update that doesn't include
all custom fields as well as properly nulls out values between items being imported.
2018-03-27 16:52:44 -07:00
snipe
b41adc2eee
Merge branch 'develop'
2018-03-26 16:05:50 -07:00
snipe
115d6e29df
Added location address to custom asset report export
2018-03-26 15:59:09 -07:00
snipe
83781f3a70
Merge branch 'develop'
...
# Conflicts:
# config/version.php
2018-03-26 15:20:40 -07:00
snipe
0134ec7b04
Added asset presenter, fixed asset maintenances button in asset view
2018-03-26 14:49:49 -07:00
snipe
590938fa33
Added asset maintenances presenter, fixed broken action buttons on asset view
2018-03-26 14:46:37 -07:00
snipe
46f5f21368
Notification improvements ( #5254 )
...
* Added “show fields in email” to custom fields
* Added “show images in email” to settings
* Added nicer HTML emails
* Break notifications out into their own, instead of trying to mash them all together
* Remove old notification for accessory checkout
* Janky fix for #5076 - “The asset you have attempted to accept was not checked out to you”
* Add method for image url for accessories
* Added accessory checkout email blade
* Make accessory email notification on checkout screen consistent with assets
* Added native consumables notifications
* Fixes for asset notification
* Updated notification blades with correct-er fields
* Updated notifications
* License checkin notification - does not work yet
Need to figure out whether the license seat is assigned to a person or an asset before we can pass the target
* Added alternate “cc” email for admins
* Only try to trigger notifications if the target is a user
* Fix tests
* Fixed consumable URL
* Removed unused notification
* Pass target type in params
* Show slack status
* Pass additional parameters
There is a logic bug in this :( Will send to slack twice, since the admin CC and the user are both using the same notification. Fuckity fuck fuck fuck.
* Pass a variable to the notification to supress the duplicate slack message
* Slack is broken :( Trying to fix
Will try a git bisect
* Put preview back into checkout
* Pulled old archaic mail
* Removed debugging
* Fixed wrong email title
* Fixed slack endpoint not firing
* Poobot, we hardly knew ye.
* Removed old, manual mail from API
* Typo :-/
* Code cleanup
* Use defined formatted date in JSON
* Use static properties for checkin/checkout notifiers for cleaner code
* Removed debugging
* Use date formatter
* Fixed target_type
* Fixed language in consumable email
2018-03-25 13:46:57 -07:00
snipe
b6bf3800c7
Merge branch 'develop'
2018-03-23 16:20:09 -07:00
snipe
34919b0396
Added API calls to look up assets by tag and serial
2018-03-23 14:50:11 -07:00
snipe
130bb19a11
Merge branch 'develop'
2018-03-22 20:31:04 -07:00
snipe
d0f14d7a3c
Fixed #5186 - email being sent to admin as well as user on checkout
...
This should be introduced as a setting, but not arbitrarily send
2018-03-22 20:30:45 -07:00
snipe
795c2cf540
Merge branch 'develop'
2018-03-22 20:27:40 -07:00
snipe
bcd02ce718
Inelegantly fixed #5186 - placeholder notification being sent
...
This needs work
2018-03-22 20:27:14 -07:00
snipe
469efc923b
Merge branch 'develop'
...
# Conflicts:
# README.md
# config/version.php
2018-03-22 20:08:55 -07:00
Brady Wetherington
085f909f35
Change duplicate header check to return 1-based header indices
2018-03-22 19:40:12 -07:00
Brady Wetherington
0b0243a5e0
Hoist file-reading before file-renaming, catch duplicate headers ( #5244 )
2018-03-22 19:16:15 -07:00
snipe
bf74bb196d
Merge branch 'develop'
2018-03-22 14:57:15 -07:00
snipe
c6e14caa31
Removed e() from array_smart_custom_field_fetch
2018-03-22 14:36:36 -07:00
snipe
506602b257
Remove escaping on import value checker
2018-03-22 14:25:52 -07:00
snipe
a79ec0d408
Merge branch 'develop'
2018-03-22 14:18:30 -07:00
snipe
140724be2e
Fixed #5217 - permissions error with importer for non-admins
2018-03-22 14:17:44 -07:00
snipe
96bab5697d
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
# database/migrations/2018_02_22_160436_add_remote_user_settings.php
2018-03-22 09:46:50 -07:00
snipe
8557cb5305
Added - make accessory manufacturer field searchable
2018-03-22 09:43:53 -07:00
David Kaatz
1c777888d5
Authentication via REMOTE_USER (clean repull) ( #5204 )
...
- Implementation in Login
- Configuration
- Database migration
2018-03-21 19:09:37 -07:00
Brady Wetherington
625810cd8a
Support \r-terminated files better from the Importer ( #5184 )
...
* Hoist the ini_get/ini_set auto-detect line endings code higher
* Placate the irascible Codacy
2018-03-21 19:08:06 -07:00
snipe
d911b776bf
Check for associated maintenance asset
...
This should probably never happen, but triggers on the demo sometimes because of fluctuating data seeding
2018-03-21 19:08:06 -07:00
David Kaatz
53735f2026
Authentication via REMOTE_USER (clean repull) ( #5204 )
...
- Implementation in Login
- Configuration
- Database migration
2018-03-14 12:48:07 -07:00
David Kaatz
a43b31400f
Authentication via REMOTE_USER ( #5142 )
...
* Added authentication via Remote User
* - Removed nullable from remote_user settings fileds and used just default values instead
- Removed german translations
- Removed 401 error page and replaced usage with 403 error page as 401 was actual a duplicate of 403
- Replaced usage of $_SERVER['REMOTE_USER'] with Laravels API Request::server('REMOVE_USER')
* - Fixed request usage
2018-03-13 20:07:52 -07:00
Brady Wetherington
e15f2ac8ab
Support \r-terminated files better from the Importer ( #5184 )
...
* Hoist the ini_get/ini_set auto-detect line endings code higher
* Placate the irascible Codacy
2018-03-13 20:06:53 -07:00
snipe
fc8637c81a
Check for associated maintenance asset
...
This should probably never happen, but triggers on the demo sometimes because of fluctuating data seeding
2018-03-07 22:22:36 -08:00
snipe
1d130b4a89
Fixed asset model permission not granted for edit
2018-03-07 18:22:49 -08:00
snipe
c4db8d37c2
Fixed #5168 - users without superadmin could not see custom fields UI even if granted
2018-03-07 13:37:37 -08:00
snipe
17e0154995
Fixed #5160 - make field_values readable via custom fields API
2018-03-06 13:11:45 -08:00
snipe
d60c9800c2
Check that the id key exists to prevent any weird edge cases for location
2018-03-05 22:44:05 -08:00
snipe
04d2542b81
Fixed #5078 - check for object or array as location in LDAP sync
2018-03-05 22:42:40 -08:00
snipe
1e22b8e567
Fixed #5138 - added default_label flag to status labels
2018-03-05 22:04:16 -08:00
snipe
d05dfb18a7
Fixed #5150 - added lastname first initial as username format
2018-03-05 21:39:05 -08:00
snipe
a5c6ddb8ac
Change gate for updating assets via the API to edit
2018-03-05 21:27:17 -08:00
snipe
052132ec37
Remove pyrchase cost from accessory search
2018-03-05 20:57:50 -08:00
snipe
2df19bcbb4
Only pull category matches for accessory category
2018-03-05 20:22:44 -08:00
snipe
36cd63836e
Fixed #5151 - added asset tag to maintenances
2018-03-05 16:26:40 -08:00
snipe
9effa3d2ab
Fixed manufacturer restore
2018-03-03 19:14:27 -08:00
snipe
0782222c6b
Removed commenting
...
This restore() is still not working, though not sure why. Seems like it should be pretty straghtforward, and yet…
Additonally, manually setting the deleted)at date to null or blank isn’t working either. I’m sure I’m just missing something obvious.
2018-03-03 18:49:02 -08:00
snipe
f7784b6543
Fixed #2402 - add ability to restore manufacturers
2018-03-03 18:46:19 -08:00
snipe
123e317e52
Check for an array (for PHP7.2 support)
2018-03-03 17:07:07 -08:00
fordster78
68a9855506
New First Admin Notification ( #5147 )
...
* New First Admin Notification
* Include Last name in Welcome and First admin Notifications
2018-03-03 14:37:42 -08:00
fordster78
688a3251a9
New Welcome Notification ( #5146 )
...
* New Test Notification
Created Test Notification.
Updated Vendor Mail message.blade files.
Updated api settings controller to use Notification Façade.
* Add show URL in Emails condition
* New Welcome Notification
2018-03-03 12:44:41 -08:00
snipe
4ab1d5ca7f
Fixed #5110 - crash on accessory checkin missing last_name
2018-03-02 19:26:41 -08:00
fordster78
4e0c8e218d
New Test Notification ( #5137 )
...
Created Test Notification.
Updated Vendor Mail message.blade files.
Updated api settings controller to use Notification Façade.
2018-03-02 18:01:20 -08:00
snipe
f171357e36
Removed unused skin files, added skin setting option
2018-03-02 17:50:40 -08:00
snipe
b4f704d7f1
Fixed 2FA reset button
2018-02-26 15:43:49 -08:00
Daniel Meltzer
9ee2c6be57
Api tests2 ( #5098 )
...
* Cleanup
* API tests for asset models and related cleanup/improvements
* Api license test. Tests incomplete because create/update/destroy are not implemented yet in the controller
* API Category tests.
* Manufacturers API Test.
* Implement License Create/Update/Delete Methods for API and enable test.
* Add missing gate for api. Fixes only superadmins being able to generate Personal Access Toekns
2018-02-25 12:10:02 -08:00
Daniel Meltzer
7de8f71f58
Api tests ( #5096 )
...
* Use the formated date helper to clean up verifications.
* Add Checkin/Checkout api tests.
* Accessories api test
* Add Companies API Test.
* Return ModelNotFound as a 404.
* Cleanups/simplficiations/updates.
* Locations api test.
* currency and image should be fillable on location.
* Update components api test.
* Use findOrFail so we return a 404 instead of a 200. Matches other item types.
* order_number should be fillable in component.
* Add updated_at and permissions to information returned from api for a user.
* Add users test and flesh out factory and fillable fields.
* Add test for assets method
* API status label test.
* Disable php7.2 for now on travis until the count(null) issues are remedied
* Add serial to update.
* API model not found should return a 200
2018-02-24 19:01:34 -08:00
snipe
b6a75093b7
Removed duplicate location_id assignment
2018-02-24 14:06:10 -08:00
snipe
5e5ba54c3e
Disallow checkout asset to itself
2018-02-23 05:52:19 -08:00
Daniel Meltzer
f7dbda4ed3
Disable broken tests ( #5073 )
...
* Work towards a functional travis. Step 1: Disable broken unit tests.
* Fix functional tests
This updates the login information and model factories to work with
changes to source.
* Importer name/full name fixes.
Fix a bug where "name" was used ambigously and mapping "item name" to
"name" would confuse the importer into thinking it should also be a user
name. Now we default to "full name" for the users name, and "item name"
for the item name. These are still both configurable through the custom
mapping.
Also update sample csvs and remove an outdated sample.
* Max length of supplier notes is 191, not 255, as per default laravel string length. Might make sense to change this to a text field in the future to match other places.
* Use sqlite/different db setup for unit tests.
* Fix assets api test.
* Fix Components API test.
* increase travis memory limit for functional tests.
* Use travis config for api tests as well.
* Fix memory limit file.
* Disable ApiComponentsAssetsCest until it's fixed.
2018-02-22 21:46:58 -08:00
snipe
e49a36c9fd
Fixed #5084 - min supplier name now 1
2018-02-22 16:37:05 -08:00
snipe
236e773438
Fixed incorrect component not found string
2018-02-22 16:36:01 -08:00
snipe
e3144c3093
Added Slack test button
2018-02-22 16:35:34 -08:00
snipe
cbd8409611
Fixed #5067 - account for only one name in generateFormattedNameFromFullName
2018-02-22 14:10:58 -08:00
snipe
9c1fe2c922
Reverting previous change - qty already existed in allowed columns. Derp.
2018-02-21 16:46:37 -08:00
Daniel Meltzer
5a84863873
Importer name/full name fixes. ( #5072 )
...
Fix a bug where "name" was used ambigously and mapping "item name" to
"name" would confuse the importer into thinking it should also be a user
name. Now we default to "full name" for the users name, and "item name"
for the item name. These are still both configurable through the custom
mapping.
Also update sample csvs and remove an outdated sample.
2018-02-21 16:42:36 -08:00
snipe
006b2b18b0
Added qty to sorting
2018-02-21 16:21:31 -08:00
snipe
fb262e38a7
Added - make total sortable in components
2018-02-21 16:21:21 -08:00
snipe
ca50ea190f
Applied master changes to develop
...
Wrong branch :(
2018-02-21 15:51:04 -08:00
snipe
f5e51897e3
Added - sort by color on status labels
2018-02-21 05:29:50 -08:00
snipe
698ea36cc2
Added - Order location by manager
2018-02-21 05:09:40 -08:00
snipe
0cf9cdd3b1
Make department columns sortable
2018-02-21 05:04:20 -08:00
snipe
1e8c32fbdb
Fixed - missing table prefix for location parent search
2018-02-21 04:33:47 -08:00
snipe
0d7a43ab38
Fixed orderby parent location name
2018-02-21 02:17:18 -08:00
snipe
22f44e342f
Fixed incorrect next audit date if asset override
2018-02-21 01:18:21 -08:00
snipe
b3d673b0aa
Fixed #5037 - use line breaks in notes in table view
2018-02-16 21:38:56 -08:00
snipe
d8fc50c351
Fixed #5033 - use PHP’s max filesize for image uploads
2018-02-16 21:17:41 -08:00
snipe
589c3a2be3
Fixed #4668 - wrong gate on manufacturer save
2018-02-16 17:45:27 -08:00
snipe
3744a68daf
Features/better table options ( #5018 )
...
* Added CSS for table toolbar
* Use maintenances API for table listings
* NIcer layout for allowed_columns in maintenances API
* Fixed #5014 - bootstrap cookie issues
* Fixed #5015 - bug when saving settings
* Refactored datatable code to use data attributes
* Updated dashboard with new table code
* Added - Order by group user count
* Updated groups to use new table attributes
* New license listing table code
* More bootstrap table implementations
* More BS table refactoring
* Improved bootstrap assigned assets
* New bootstrap for reports
* Misc BS fixes
* FIxed small issue with asset history display
* Removed multisort option
* JS refactor
2018-02-16 13:22:55 -08:00
snipe
62edf14893
Refactored method to generate usernames from full names
2018-02-13 20:31:11 -08:00
snipe
5484b06df8
Fixed #4923 - invalid check for location object in Ldap Sync
2018-02-13 17:06:42 -08:00
snipe
f144d671ff
Fixed #4988 - incorrect variable name in asset checkout API method
2018-02-12 19:13:33 -08:00
snipe
08d129c2ea
Fixed #4951 - updating asset location in bulk edit
2018-02-02 09:36:40 -06:00
snipe
b3a6ec2804
Fixed #4938 - default sort order
2018-02-01 17:17:56 -06:00
snipe
d2587337e4
Fixed #4952 - ignore show_archived setting when drilling down into specific ID
2018-02-01 16:31:32 -06:00
snipe
e7e10c24be
Add departments to usr export
2018-02-01 15:54:49 -06:00
snipe
2f9fff7130
Do not try to show depreciation report if no depreciations are set up
2018-01-25 13:16:49 -06:00
snipe
facf1d42f7
Sigh.
2018-01-25 11:06:37 -08:00
Daniel Meltzer
2f5d550df6
Hotfix: Disabling the event dispatcher broke model validation. ( #4912 )
...
* Hotfix: Disabling the event dispatcher broke model validation.
This resulted in invalid data being imported. Reenable the event dispatcher for now--this causes double logs, but at least validates properly.
* Actually disable the event dispatcher.
* Sign in where necessary to fix the importer unit test. This catches the issues found manually in 4912
2018-01-25 10:10:56 -08:00
snipe
4be8ae7f3d
Fuckery.
2018-01-25 03:34:52 -08:00
snipe
cf8feb37e1
Fixed crash if no model associated
...
This should never be triggered. Bad data is getting in somehow.
2018-01-25 03:00:54 -08:00
snipe
11505d5d06
Fix crash if no asset model
...
(This should never happen, but shouldn’t crash if/when it does)
2018-01-25 00:25:43 -08:00
snipe
1d04897b32
Order by default location
2018-01-24 14:27:12 -08:00
snipe
bd80a77b78
Added default location to asset listing
2018-01-24 14:23:12 -08:00
snipe
739d3c72b7
Fixed #4902 - include last name in checkin email
2018-01-24 10:59:34 -08:00
snipe
60c38a0c47
Added setting to choose what appears in model select list - Fixes #4879
2018-01-24 10:43:46 -08:00
snipe
2c2910d1dd
Handle shitty edge cases where an asset has no model without crashing
2018-01-24 08:16:05 -08:00
snipe
765295136a
Added - ability to add custom footer text, hide user’s manual/support links
2018-01-24 07:02:30 -08:00
snipe
543ea28b72
Added qty to asset components - fixed #4876
2018-01-24 05:25:01 -08:00
snipe
fefd6d60f6
Fixed #4899 - sorting in user history
2018-01-24 04:48:00 -08:00
snipe
a7b8b4bf55
Added: ability to change actual location from bulk edit assets
2018-01-24 04:38:25 -08:00
snipe
7cafa194c1
Fix for counts
2018-01-24 04:26:15 -08:00
snipe
b37f78dbbf
Fixed #4858 - wrong params for id count
2018-01-24 04:24:45 -08:00
snipe
e20cd42cc2
More parse error fixes
2018-01-24 03:42:49 -08:00
snipe
7b99f81f72
Fixed parse error on hardware blade
2018-01-24 03:38:29 -08:00
snipe
f1bbdc9e59
Revert PR #4845
2018-01-24 03:32:45 -08:00
Richard Hofman
5219fb63a1
Add --base_dn option to LdapSync command. ( #4888 )
2018-01-23 18:15:36 -08:00
CronKz
dcc379c3fa
Adding missing translations. ( #4896 )
2018-01-23 18:13:55 -08:00
vcordes79
0fb8dc3418
check if user is allowed to view assets ( #4845 )
2018-01-23 18:10:05 -08:00
vcordes79
f4e9d245d0
Status labels ( #4895 )
...
* fix statuslabels
* fix statuslabels
2018-01-23 18:08:54 -08:00
vcordes79
7b596c750d
API for (dis)associating fields with fieldsets ( #4881 )
...
* start work on fields in fieldset api
* revert CustomFieldsetsController
* fieldset associate / disassociate api
* fix variable names and payload
* fix variable name
2018-01-22 13:14:04 -08:00
Tim Bishop
b346556caa
Allow manager_id to be fillable. ( #4882 )
...
The API UsersController accepts manager_id, but calls the following:
$user->fill($request->all());
This results in manager_id being ignored. I can't see any problem with
allowing a user's manager to be modified using the API, so this change
allows it.
2018-01-22 13:12:02 -08:00
snipe
5f65f993a0
Small refactor for AssetPresenter method
2018-01-20 08:52:50 -08:00
snipe
a9441521a4
Small refactor for Setting method
2018-01-20 08:52:50 -08:00
Daniel Meltzer
6bf17e7d47
Reset the item between rows of import to avoid stale data. ( #4868 )
2018-01-20 08:40:01 -08:00
snipe
99e55f84f0
Fixed misc UI permissions elements
2018-01-20 04:39:31 -08:00
snipe
34f6d5ab45
Fixed #4671 - corrected component checkin gate
2018-01-20 03:58:59 -08:00
snipe
86c0194e9a
Fixed #4628 and #4590 - Illegal mix of collations for operation error when searching on some languages
2018-01-20 03:08:27 -08:00
snipe
7fae380ab6
Fixed #4300 - Fix for illegal character type in action log
2018-01-20 00:27:45 -08:00
snipe
5d4bbc393e
Fixed #4837 - link phone numbers
2018-01-20 00:20:45 -08:00
snipe
e6f70f2ab7
Fixed #4821 - add username to user selection dropdown
2018-01-19 23:47:37 -08:00
snipe
95a9742571
Fixed #4768 - adds dashboard message option to settings
2018-01-19 20:43:55 -08:00
snipe
c242abb42e
Added Company policy to fix company deletion issue
2018-01-19 17:51:28 -08:00
snipe
2a959edeba
Added - Setting to allow archived assets in List All
2018-01-17 19:18:48 -08:00
snipe
8995d689b8
Fixed #4817 - [BREAKING API CHANGE] - changed user API response from firstname, lastname to first_name, last_name
2018-01-17 13:25:11 -08:00
snipe
d920d91786
Fixed #4593 - do not require model_id to update asset custom fields via API
2018-01-17 13:12:32 -08:00
snipe
8fff6a1a06
Update asset location based on user checkout in bulk checkout
2018-01-17 12:39:49 -08:00
snipe
8fb991110e
Fixed #4652 - asset not correctly checking out to user on creation
2018-01-17 12:10:28 -08:00
fordster78
138313dcb9
Setup changes ( #4813 )
...
* Add Asset Tag settings to Setup
* Add Locale Settings to Setup
* Add multiple company support to setup
* Changed the locale label name from 'site_name' to locale
Added default value for language to 'en' and multiple companies support
to 0 (false)
Switched out the old Input facade to the preferred $request->input
method for the setup page.
2018-01-17 10:58:03 -08:00
snipe
91bca5fcba
Fixed #4844 - use input value for ids in user bulk edit
2018-01-17 06:15:52 -08:00
vcordes79
96a469db36
allow changing user activated field via api ( #4843 )
2018-01-17 05:38:10 -08:00
vcordes79
52a99faf68
fix phone number update in api ( #4842 )
2018-01-17 05:33:55 -08:00
vcordes79
94cf1f8741
Fixes #4829 - add fields api ( #4840 )
...
* add fields api
* change route names
2018-01-17 05:31:57 -08:00
snipe
6bfd428c2e
Use real status label names, even if deployed
2018-01-15 21:03:26 -08:00
snipe
68f1fa0340
Added - ability to sort by asset count in models
2018-01-11 15:21:51 -08:00
snipe
9293f17707
Moved search scope lower to fix weird (possible Laravel) bug w/prepared statements
2018-01-11 15:17:34 -08:00
snipe
3b4a651dd9
Allow counts in mfg sorting
2018-01-11 15:16:23 -08:00
snipe
cf1b5a7685
Added- sort by count in manufacturer listing
2018-01-11 15:13:32 -08:00
snipe
2bbb6001a8
Added location to seats transformer
2018-01-10 20:36:27 -08:00
snipe
af7b7664c5
Added license seat location method
2018-01-10 20:34:44 -08:00
snipe
e3d7be23cb
Added new seats controller method
2018-01-10 18:47:57 -08:00
snipe
3d5545494e
Added new seats transformer
2018-01-10 18:47:40 -08:00
snipe
e6259eb6e1
Fixed #4774 - show assets assigned to assets in asset view
...
Todo: Fix text search on the asset to asset tab. It’s currently broken so I’ve disabled it.
2018-01-10 05:44:11 -08:00
snipe
285e4e2e52
Allow bulk language update in user edit
2018-01-10 05:33:26 -08:00
snipe
5587b64d64
Fixed #4770 - broken licenses, etc on company view, added users and components
2018-01-10 03:52:21 -08:00
Brandon Daniel Bailey
f786e07179
Allow auto increment through the API ( #4690 )
...
* Allow auto incrementing asset_id from the API when the setting is enabled
* Cleaned up the if else statement
* Added prefix to the orWhereRaw which causes a database error if the configuration uses a prefix
* Auto incrementing through the API
2018-01-03 17:24:32 -08:00
Daniel Meltzer
b2469bb34f
Fix double create log on import. ( #4706 )
...
* Fix double create log on import.
* Fix code error causing component importer to implode.
* More component importer oldities
2018-01-03 17:22:02 -08:00
Brandon Daniel Bailey
b721bfcc84
Added prefix to the orWhereRaw which causes a database error if the configuration uses a prefix ( #4703 )
2017-12-28 20:09:36 -08:00
Daniel Meltzer
f16ce09a7a
Importer again ( #4702 )
...
* If a user id is provided in the name column of an import, we should assume that it is a user id and check out to it.
* Fix build of vue files. The location is public/js/build, not public/build
* Ensure a status type is set before allowing submission of an import.
Also expand the status text label to change color based on success/failure.
Fixes #4658
* Use right key to lookup emails when importing users. Fixes 4619.
* Import serial for components, and make unique matches based on the serial as well as the name. Fixes #4569
* Set the location_id when importing an item properly.
This moves as well to using the Asset::checkout() method, which should consolidate the logic into a useful spot.
Fixes #4563 (I think)
* Production assets.
* Case insensitive field map guessing and repopulate when changingin import type.
2017-12-28 20:08:45 -08:00
snipe
c3a44f25fd
Fixed #4663 - duplicate manufacturer name in selectlist
2017-12-20 12:32:55 -08:00
snipe
d2e2c1c05f
Stub and 404 registration routes
2017-12-19 22:14:51 -08:00
snipe
b716db225f
Added “new” buttons for manufacturer and category in asset model creation
2017-12-19 20:30:46 -08:00
snipe
88798435f6
Fixed inefficient query for inventory alerts
2017-12-19 00:32:39 -08:00
snipe
7a8c8233a2
Fixes #4639
2017-12-15 18:54:38 -08:00
Ryan
9a40e5e651
return an error from ldap_search ( #4623 )
...
This will return the error from the ldap_search ran in Models/Ldap.php instead of throwing an exception. Users seem to commonly be getting an Exception because of invalid search filters. This will better inform them of that issue without requiring them to enable DEBUG.
2017-12-14 12:57:43 -08:00
snipe
f1a911d305
Fixed ambiguous query on non-super admins with FCS
2017-12-12 21:14:12 -08:00
snipe
6b257cc287
Concat search for full name
2017-12-12 12:52:10 -08:00
snipe
608bb1b5b1
Fixed #3416 - bulk delete asset models
2017-12-12 09:10:05 -08:00
snipe
1ef44721f5
Improved - disallow delete if not elgible in UI
2017-12-12 07:03:31 -08:00
snipe
528630a8d3
Improvement - make asset, etc totals in company listing sortable
2017-12-12 07:03:09 -08:00
snipe
856a760d89
Improved - disallow deleting manufactureres if there are associated items
...
This is enforced on the backend - UI imorovement only
2017-12-12 06:52:50 -08:00
snipe
9179b6d9c4
Improved - disallow delete through the GUI if asset model has assets associated
...
(We prevent this on the backend anyway, but this makes for nicer UI)
2017-12-12 06:49:04 -08:00
snipe
4ce91a4f5d
Fixed namespace gate for components - related to #4282
2017-12-12 06:26:37 -08:00
snipe
aff93d8f2b
Fixed #4589 - Licence deployed to asset issue
2017-12-12 05:43:06 -08:00
snipe
e4ab4024c5
Added - changelog searchable in history tab
2017-12-12 05:10:13 -08:00
snipe
612f23f6e0
Added #2893 - track changes on asset edits
2017-12-12 04:59:28 -08:00
snipe
88ca852dcf
Cleaned up asset observer
2017-12-12 03:40:04 -08:00
snipe
9fe2a7f81d
Removed duplicate log entry on asset creation
2017-12-12 03:39:55 -08:00
snipe
c816870083
De-norm last audit date so we can display it in the asset listing
2017-12-12 03:03:43 -08:00
snipe
c5c46b7283
Removed duplicate deleted logaction
...
This is handled via observers now
2017-12-12 02:32:45 -08:00
snipe
5b00a8ae33
Use specific company_id column name in user search
2017-12-11 22:50:55 -08:00
snipe
5ee6e7f94b
Fixed #4613 - Added table prefix to user search DB raw
2017-12-11 22:31:07 -08:00
snipe
f90271dae5
Aaaaand one more for #2810 . Sigh.
2017-12-08 14:33:12 -08:00
snipe
e1423bd9d9
One more fix for #2810
2017-12-08 14:02:27 -08:00
snipe
3df62a200f
Fixed manufacturer gates
2017-12-08 13:16:37 -08:00
snipe
a65ea639ed
Added comments to SnipePermissionsPolicy for clarity
2017-12-07 21:00:09 -08:00
snipe
defed52caa
Fixed #4596 - manufacturer gate
2017-12-07 20:59:55 -08:00
snipe
f4ac087c83
Fixed policy namespace
2017-12-06 14:49:52 -08:00
snipe
4898dd8e23
Use ImageUploadRequest $request on user profile update
2017-12-06 14:42:14 -08:00
snipe
a090b6a9d2
Use ImageUploadRequest
2017-12-06 14:38:01 -08:00
snipe
dfb0c09c51
Fixed #4581 - renamed print method
2017-12-06 11:17:42 -08:00
snipe
83547e3fed
Prepopulate ther groups array on create
2017-12-05 18:17:11 -08:00
snipe
29a36b5d1c
Do not allow null id on group edit
2017-12-05 16:49:26 -08:00
snipe
a19cef07bf
Check for gate on license key display
2017-12-05 16:26:23 -08:00
snipe
c39e6d7006
Fixed #4576 - licence checkout gate
2017-12-05 15:04:10 -08:00
snipe
bfa4812482
Exclude company on filter
2017-12-05 14:23:46 -08:00
snipe
438f484d68
Removed duplicate purchase cost column
2017-12-05 14:03:08 -08:00
snipe
f95d780fcf
Include purchase cost column if depreciation is selected
2017-12-05 14:02:43 -08:00
snipe
76fe2af0af
Fixed #4444 - Added EOL back into asset lsiting and custom report
2017-12-05 13:03:11 -08:00
snipe
e490185533
Fixed EOL in custom report
2017-12-05 12:54:19 -08:00
snipe
deba4d2b81
Added consumables tio printable output
2017-12-05 12:37:42 -08:00
snipe
a8cc29f062
Added #2562 - print view of all assigned inventory
2017-12-05 12:34:16 -08:00
snipe
c9e6a75ea8
Make sure there is a valid status label associated withthe asset when checking if deployable
2017-12-05 11:28:48 -08:00
snipe
7efa7ec03f
Starter print template for all assets assigned to a user
2017-12-05 01:55:24 -08:00
snipe
9eef7a94ab
Fixed #4557 - added missing fields in components/consumables list view
2017-12-05 00:40:30 -08:00
Brady Wetherington
4584990cc3
Cleaner re-implementation of loop-detection for asset-assigned-assets ( #4553 )
...
* Cleaner re-implementation of loop-detection for asset-assigned-assets
* Get rid of the other static and pass it along recursively too.
2017-12-04 23:00:55 -08:00
snipe
d7f2bceea2
Fixed incorrect property on supplier
2017-12-04 20:45:20 -08:00
snipe
fdaa279930
Fixed #4548 - add cateory to model dropdown
2017-12-04 20:19:30 -08:00
snipe
ec4bed436c
Fixed #4565 - show manufacturer in models selectlist
2017-12-04 19:52:18 -08:00
snipe
636c558fe6
Fixed #4566 - search by purchase_date
2017-12-04 15:26:40 -08:00
snipe
2aafdb1400
Bumped version
2017-12-01 20:49:04 -08:00
snipe
9deafd771e
Fixed bad suppliers error route
2017-12-01 20:28:37 -08:00
snipe
cbc09f3a12
Fixes #4508 - adds image to location view (and google map, if address and API key exist)
2017-12-01 19:12:35 -08:00
snipe
8b4c85d69a
Removed verbose logging
2017-12-01 16:56:50 -08:00
snipe
78a51d3675
Additional fixes, improvements for custom report
2017-12-01 16:51:38 -08:00
snipe
14874d8e8a
Fixes #4495 - missing field in Download CSV, added filter options on custom report
2017-12-01 14:47:52 -08:00
snipe
ff793f1cb5
Added variable to determine if “new” modal button should be displayed
2017-12-01 14:37:11 -08:00
snipe
8140bdaa88
Fixed repeated header issue in asset export
2017-12-01 14:25:32 -08:00
snipe
fd4a8edae9
Fixed incorrect glyphs for users/locations
2017-11-30 16:40:58 -08:00
snipe
cefdca3d22
Fixed incorrect has vs input
2017-11-30 13:40:26 -08:00
snipe
d3864db5e1
Switched to use $request from Input:: facade
2017-11-30 13:32:00 -08:00
snipe
e25829c759
Removed extra debug logging
2017-11-30 13:30:20 -08:00
snipe
cdfd720c65
Fixed custom fields edit behavior with cutom format always selected
2017-11-27 22:10:46 -08:00
snipe
c0f791cf13
Sigh.
2017-11-27 21:35:06 -08:00
snipe
ea2f7617df
Validate checkout_to_type on asset checkout
2017-11-27 21:20:12 -08:00
snipe
b6c258bb12
Redirect to back on bad checkout
2017-11-27 21:19:50 -08:00
snipe
804b49cefb
Make sure the asset is available for checkout before displaying the checkout screen
2017-11-27 21:18:29 -08:00
snipe
305b0d8edb
Fixed #4522 - properly check for valid target, throw error otherwise
2017-11-27 21:17:58 -08:00
snipe
05996019e5
Use asset checkout request in API
2017-11-27 21:17:16 -08:00
snipe
51661b0a21
Fixed #4190 - Added artisan command to regenerate asset tags
2017-11-24 11:25:51 -08:00
Daniel Meltzer
bee1dfc4a6
More importer fixes ( #4516 )
...
* The default locale of en does not include dollar sign in default currency. Assume if there is no currency symbol set that the dollar sign is a good thing to look for in parsefloat.
* Fix for 4485. Serial not serial_number
Also fix bug where updating with a csv that does not include custom field columns should not overwrite current values.
* Rename serial_number to serial in default imports to avoid needing to map weirdly.
* Add Test for 4359. Not reproducable at current though
2017-11-24 10:42:11 -08:00
snipe
a7e12931fa
Check that assigned is an object in reports controller
2017-11-22 18:42:17 -08:00
snipe
6f3a90c48b
Check that the assigned data is valid
2017-11-22 15:07:34 -08:00
snipe
8f160a8590
Fixed CSV asset export missing checked out to info
2017-11-22 13:05:48 -08:00
snipe
2278d5bfd8
Fixed restore permission to assets API disable delete/checkin/checkout on deleted assets
2017-11-22 10:35:24 -08:00
snipe
8562f018ed
Fixed - conflicting error when a user and asset were both checked out
2017-11-22 07:31:38 -08:00
snipe
d98d06377e
Fixed #4098 - autolink URL and email addresses in listing
2017-11-21 22:34:53 -08:00
snipe
22fdd05314
Add UTF charset
2017-11-21 22:34:07 -08:00
snipe
0adebd1ec8
Add sorting and additional category types to dashboard categories
...
BREAKING CHANGE: Category type now reports as `category_type`, instead of `type`
2017-11-21 20:33:30 -08:00
snipe
43c1e893c0
Fixed #4494 - use audit settings for asset audit pre-populaton
2017-11-21 20:13:51 -08:00
snipe
e5129a8b98
Removed next_version
2017-11-21 19:39:33 -08:00
snipe
0c9e41e1fa
Updated versioning script to handle githooks better
2017-11-21 19:01:47 -08:00
snipe
4696e799ed
Fixes #4491 and #4483 - handle pre-selected asset on checkout, better checkout-to selection UI ( #4501 )
...
* Added form checkout selector partial
* Stupid stash
* Added radio button checkout selector javascript
* New compiled production assets
* Added $style override in form partials for select2 ajax lists
* Added checkout-to radio button selector
TODO: Fix for accessibility - currently cannot tab-select this radio button
* Added new checkout-to selector to hardware edit
* Added new checkout-to selector to asset checkout form
* Refactored postCheckout to use radio button submission
This defaults to user checkout if nothing is passed for some reason
* Better visual feedback on whether or not an asset is deployable in edit screen
2017-11-21 15:58:31 -08:00
snipe
17405f5de1
Fixed #4413 - Next license seat not bering assigned correctly
2017-11-20 19:21:05 -08:00
snipe
897bd2c56e
Fixed location sorting location instead of rtd
2017-11-16 16:49:48 -08:00
snipe
7321c5937f
Fixed #4440 - allow username search in asset dropdown
2017-11-16 16:49:16 -08:00
snipe
3d07635820
Fixed sort by model in asset listing
2017-11-16 14:14:30 -08:00
snipe
ce525c1985
Fixed #4471 - removed gate for categories selectlist
2017-11-16 13:48:38 -08:00
snipe
edcd3afc3e
Fixes #4457 - use un-escaped CSS for custom CSS styles
...
We are already escaping the CSS in the show_custom_css() method
2017-11-15 14:27:21 -08:00
snipe
ba38b841cb
Constrain accessory by category ID if one is passed
2017-11-14 16:47:21 -08:00
snipe
498fc3762d
Fixed #4437 - pagination for maintenances
2017-11-14 01:32:25 -08:00
snipe
3e5e6ba99a
Use table alias for models join in search/order by models
2017-11-14 00:04:03 -08:00
snipe
0396267388
Fixed #4412 - use select2 ajax list for asset maintenances
2017-11-12 17:22:16 -08:00
snipe
7eef1b4bcf
Fixed #4418 - order models by name asc in selectlist
2017-11-10 15:56:14 -08:00
snipe
bb4d49690f
Add purchase date to dates array so it’s treated as a Carbon date
2017-11-09 18:59:05 -08:00
snipe
ee0814716a
Only format ecpected checkin date if one exists
2017-11-09 13:40:55 -08:00
snipe
012afe99e2
Set purchase date to date type
2017-11-09 13:27:58 -08:00
snipe
afe6f43a1b
Exclude manufacturer on filter sort
2017-11-09 11:18:04 -08:00
snipe
6852b74317
Removed gates from selectlist method
2017-11-09 10:51:55 -08:00
madd15
172c7c75a8
Fixed #4374 - Add option to display company names to labels ( #4405 )
...
* Migration - Labels Display Company Name setting
* Add Company Name to Labels
Add company name if it is turned on in settings and asset has a valid company
* Add Company Name checkbox to Label settings
* Add Company Name Lang
* Add display company name to postLabels
* Revert Add Company Name Lang
* Fix display company name in postLabels
* Change tinyInt to boolean for display company name
* Simplify checking for company and getting the name
* Change to square brackets for array notation
* Move divs inside if statements on optional fields
2017-11-08 20:05:39 -08:00
snipe
487fd17ce3
Fixed ambiguous query when selecting by model_id
2017-11-08 20:03:26 -08:00
snipe
c162c02304
Force expected checkin to be formatted as a date (not datetime) since it’s a date field in the DB
2017-11-08 18:03:47 -08:00
snipe
1bb1480f67
Added a comment around protected dates so we know wtf
2017-11-08 18:03:27 -08:00
snipe
b567ffdcfe
Fixed #2855 - checkin for components
2017-11-08 06:06:05 -08:00
snipe
35ee52212f
Added ability to disable the alert icon in the top menu
2017-11-08 03:08:17 -08:00
snipe
a3e80882c1
Better error handling for qr codes on invalid assets
2017-11-08 01:04:14 -08:00
snipe
74773ac912
Fixed incorrect policy reference in consumables listing
2017-11-07 23:05:29 -08:00
snipe
9764d2ad24
Removed commented code
2017-11-07 22:25:32 -08:00
snipe
d03b8c6528
Error handling for when log ID has no match on asset accept
2017-11-07 22:25:24 -08:00
snipe
99a355145e
Removed empty comments
2017-11-07 22:24:57 -08:00
snipe
5aee5a3f3d
Update location on checkout, error if bad target
2017-11-07 17:37:08 -08:00
snipe
9d7455f022
Fixed handling deleting old images better
2017-11-07 11:28:13 -08:00
snipe
b748e7ed5e
Fixed transformers to use new singleton upload urls
2017-11-07 11:11:47 -08:00
snipe
84a717c6ad
Fixed deleted ordering scope
2017-11-07 11:06:38 -08:00
snipe
a202e1657c
Fixed path for singletons
2017-11-06 21:58:28 -08:00
snipe
4ae4083b7b
Removed unused $matches variable
2017-11-06 21:26:30 -08:00
snipe
dec9ac1ac8
Fixed lowercase false
2017-11-06 21:25:40 -08:00
snipe
231dea0ebc
Break out service providers by responsibility
2017-11-06 21:17:17 -08:00
snipe
579334b5fc
Fixed - name should always be required in custom fields
2017-11-06 20:05:40 -08:00
snipe
3a82fbe714
Switch to rollbar’s official package
2017-11-06 20:04:50 -08:00
snipe
dc32e4bdb0
Fixed form request ffor custom fields
2017-11-06 16:42:37 -08:00
snipe
6ece593629
Fixed #4381 - asset uploads
2017-11-06 12:38:31 -08:00
snipe
2b3b2e3197
Removed presenter references in custom report
2017-11-06 10:44:57 -08:00
snipe
a9d9234fb3
One more fix for custom reports
2017-11-06 10:44:18 -08:00
snipe
936ff707c7
Fixed custom report bug if assignedTo has no value
2017-11-06 10:42:34 -08:00
snipe
4818e1b8ca
Fixed sorting for filtered items by location
2017-11-06 10:26:09 -08:00
snipe
04ab522ee3
Fixes #4236 - validate the regex custom validation ( #4380 )
...
* More helpful text on how the custom validator works
* Clarified language of custom format, fixed regex example
* Fixed regex example in placeholder
* Added comments to custom fields
* Added regex validation string
* Added valid_regex validator in format requirements
* Removed useles comments
* Fixes #4236 - validate the regex custom validation
2017-11-04 17:06:14 -07:00
snipe
f672b14468
Ignore deleted assets and check for valid location in artisan command
2017-11-04 16:20:31 -07:00
snipe
fe06ef10f1
Set the items array variable for no results
2017-11-04 01:23:50 -07:00
snipe
2de0a3669e
Check that there is a valid array before unshifting
2017-11-04 01:11:11 -07:00
snipe
d68d95a915
Fixed - Added a “clear selection” option to select2 ajax lists
2017-11-04 00:19:16 -07:00
snipe
2522bfee9c
Only return mnon-archived assets by location
2017-11-03 21:46:11 -07:00
snipe
d7f8615964
Fixed query for location ID
2017-11-03 20:10:36 -07:00
snipe
ecd21074fb
Commented out erroneous fixme
2017-11-03 20:10:05 -07:00
snipe
12caa48390
Uncommented info output
2017-11-03 19:42:54 -07:00
snipe
cc7be5f947
Added location to checkout in API
2017-11-03 19:42:45 -07:00
snipe
5b489e003d
Set the location_id on save/update to rtd if one is given
2017-11-03 19:41:26 -07:00
snipe
8c1f4b006e
Removed comment
2017-11-03 19:40:55 -07:00
snipe
3a52c19428
Updated fieldname in Locations transformer and API
2017-11-03 19:40:40 -07:00
snipe
b786791401
Added location to checkout method
2017-11-03 19:39:48 -07:00
snipe
1c12b6e13b
Added artisan command to sync locations
2017-11-03 19:00:36 -07:00
snipe
c06539dee3
Update the location ID if there is an rtd_location given
2017-11-03 17:36:18 -07:00
snipe
3b9544d1f3
Remove commented code
2017-11-03 17:35:46 -07:00
snipe
da9bb07041
Add a default legacy cipher of rijndael-256
2017-11-03 16:27:03 -07:00
snipe
f95502ae35
Fixed search by model on adsvanced search for assets
2017-11-03 15:04:21 -07:00
snipe
b3b8ab493e
Switch to the reply_to address
2017-11-03 14:58:49 -07:00
snipe
87ba042b2d
Fixed manager name subquery on user search
...
Self-joins in Laravel make baby jesus cry :(
2017-11-03 14:47:31 -07:00
snipe
6fb0ef908d
Fixed issue sorting when viewing users by department
2017-11-03 14:29:04 -07:00
snipe
cf56f70b3a
Added table alias for sorting
2017-11-03 13:28:57 -07:00
snipe
85360a7c7f
Removed gates on selectlists
...
They can’t access the API directly unless they have been granted API accesses anyway
2017-11-03 13:03:57 -07:00
snipe
416455fe01
Fixes weird manager_id validation
...
This is a shit fix - need to find out what’s happening here.
2017-11-03 12:48:00 -07:00
snipe
3ecaa99990
Fixed only undeployed assets in checkout to list
2017-11-03 11:33:36 -07:00
Kasey
ab9729c39a
fix to availCount() (licenseSeatRelation) ( #4378 )
...
`license_seats`.`user_id` represents an overall "owner" of the license
2017-11-03 09:51:15 -07:00
snipe
104cc2bf11
Make sure the seat hasn’t been deleted
2017-11-02 21:07:59 -07:00
snipe
0c794c103b
Return an integer value for free seats if null
2017-11-02 20:23:04 -07:00
snipe
53175d5035
Fixed sorting issue on company/manufacturer/supplier
2017-11-02 20:01:39 -07:00
snipe
0bd09f9c46
Added sorting on available and total seats
2017-11-02 19:37:30 -07:00
snipe
27d795508d
Fixed n+1 query, changed checkout behavior to just ask for a license ID
...
We’re offloading the freeSeat() to the checkout page now
2017-11-02 19:16:09 -07:00
snipe
368ac5b85d
First stab at handling the n+1 issue on licenses
2017-11-02 18:20:42 -07:00
snipe
f47075c180
Removed depreciation from Licenses transformer
2017-11-02 17:18:53 -07:00
snipe
85624205b4
Updated Lang::get to trans
2017-11-02 17:12:51 -07:00
snipe
c9c5ce6ee0
Return Deleted User if the user is invalid for some reason
2017-11-02 16:20:01 -07:00
snipe
950519be5d
Added a few more table aliases for ordering complex results
2017-11-02 13:47:37 -07:00
snipe
87affa40ed
Fixes filtering on status label
2017-11-02 13:01:09 -07:00
snipe
28a4293a0b
Fixed #4370 - user’s listing flashing then no results
2017-11-02 11:19:34 -07:00
snipe
f095f1807c
Eager load userloc
2017-11-02 11:06:15 -07:00
snipe
e08911ab8f
Removed nonce for now
...
There is a dependency in a package where we can’t edit the script tags to add the nonce
2017-11-02 10:57:05 -07:00
snipe
ca6dc5c2b5
Eager load user location
2017-11-02 10:56:36 -07:00
snipe
3695e118f4
Fixed erroneous call to assets.category in filter scope
2017-11-02 08:06:10 -07:00
snipe
f43692938b
Fixed slug call in asset models image
2017-11-02 08:02:51 -07:00
snipe
da56a253bc
Added checkout requests method
2017-11-02 04:21:57 -07:00
snipe
a844d5b018
Added pagination, nicer formatting for requested assets
2017-11-02 04:17:14 -07:00
snipe
ba9bb470eb
Added imageSrc presenter to assets
2017-11-02 04:15:24 -07:00
snipe
41452450b3
Added imageSrc presenter
2017-11-02 04:15:09 -07:00
snipe
4f008e118f
Fixed search string on suppliers selectlist
2017-11-01 21:55:17 -07:00
snipe
e11f9313f0
Fixed #4360 - better output if backup fails
2017-11-01 14:12:18 -07:00
snipe
d36e8cfbd2
Dashbpoard pie fixes
2017-11-01 13:27:59 -07:00
snipe
4cdcbc97ee
Fixed varname issue on old image delete for manufacturers
2017-11-01 13:10:56 -07:00
snipe
feb2f5b076
Fixed #4356 - removed reference to old assetloc
2017-10-31 18:20:03 -07:00
snipe
6186c324b5
Misc assetLoc error checks
2017-10-31 08:47:40 -07:00
snipe
37868cd70e
Added warranty and expiration to list view
2017-10-31 07:05:15 -07:00
snipe
32b2f77ad9
Fixed issue where we tried to call the audit log even if the asset wasn’t valid
2017-10-31 05:41:06 -07:00
snipe
472a5b9f69
Removed extra log on API asset create
2017-10-31 05:38:52 -07:00
snipe
121e158f39
Change method name from userloc to location
...
This needs to be changed in more places though
2017-10-31 05:22:57 -07:00
snipe
f4e7bfc28d
Null custom field if field exists but is empty
2017-10-31 05:22:21 -07:00
snipe
0089f73686
Moved trait to single line
2017-10-31 05:21:55 -07:00
snipe
0f4c05c5d0
Remove commented code
2017-10-31 05:02:46 -07:00
snipe
7f1b7be416
Rolling back prepending models to sort
2017-10-30 21:26:25 -07:00
snipe
02720f225c
Fixed sorting issue in asset models when ordering by manufacturer
2017-10-30 20:51:01 -07:00
snipe
546c3e50fa
Fixed updating the assigned assets location if user’s location changes
2017-10-30 19:33:52 -07:00
snipe
7f1b962e56
Improved use of de-normed locations fields
2017-10-30 19:21:35 -07:00
snipe
4eee7f8d97
Added address for users - fixes #4323
2017-10-30 18:57:00 -07:00
snipe
0fd0e3a8b4
Returns null for order number if it’s blank
2017-10-28 15:53:22 -07:00
snipe
9687a78981
Fixed a few inconsistencies in the API results (null vs empty string)
2017-10-28 15:17:36 -07:00
snipe
2244a4b3cf
Fix peresenter for assigned
2017-10-28 15:17:09 -07:00
snipe
39c68214e9
More ajax menu fixes
2017-10-28 11:17:52 -07:00
snipe
6a3716a06d
Added new ajax dropdown menus for components, consumables, etc editing/creating
2017-10-28 09:21:39 -07:00
snipe
2172e6cc25
Added suppliers ajax list
2017-10-28 08:37:47 -07:00
snipe
108ac79442
Added update to asset location id on checkout/checkin
2017-10-28 07:38:36 -07:00
snipe
bd48ae96c2
Update location on checkin if one is given
2017-10-28 07:28:35 -07:00
snipe
c37fa44f72
Use ther morphto assigned
2017-10-28 07:12:22 -07:00
snipe
daaf98783f
Fixes status display in listing
2017-10-28 07:11:06 -07:00
snipe
03f6211582
Make notes null if empty
2017-10-28 07:01:06 -07:00
snipe
4f1747023a
Seed with demo images
2017-10-28 05:46:43 -07:00
snipe
5278dac2b0
Eager loading assignedTo - I have no idea why this works
2017-10-28 03:50:02 -07:00
snipe
890012f6c4
Update references to assetloc to location
2017-10-28 02:58:38 -07:00
snipe
3991f79115
Use new location method for hardware view
2017-10-28 02:37:59 -07:00
snipe
3064b3f80e
Updated availableForCheckout() method to be clearer
2017-10-28 02:31:54 -07:00
snipe
df430a2263
Removed assignedTo eager load for now - it’s not working
2017-10-28 02:31:36 -07:00
snipe
277e49468b
Added deleted at to API
2017-10-28 02:31:13 -07:00
snipe
d76f858dcd
Try eager loading assignedTo
2017-10-28 01:50:58 -07:00
snipe
7a543fa6d5
Use new location method on asset API
2017-10-28 01:49:13 -07:00
snipe
ce5ccc31f0
Added location method, fixed assetLoc
2017-10-28 01:48:27 -07:00
snipe
2d758be0e1
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-27 18:01:46 -07:00
snipe
f49ecbdb61
Code cleanup
2017-10-27 18:01:42 -07:00
Daniel Meltzer
3cea12565b
Add missing policies ( #4330 )
...
* Add Authorizable trait and interface to our user model so we have access to User::can/User::cant. We should take a look at where else our user model has diverged from Larvel since it was created...
* Policy cleanup/fixes.
This commit adds policies for the missing backend/"settings" areas. The
permissions were implemented a while back but the policies did not, so
authorizing actions was failing.
In addition, this condenses a lot of code in the policies into base
classes. Most of the files were identical except for table names, so we
move all of the checks into a base class and override the table name in
each policy.
* Use a better name and permission for the check in the default layout.
2017-10-27 18:01:11 -07:00
snipe
b1ac024725
Refined upload code
2017-10-27 17:40:10 -07:00
snipe
ec68bd7842
Small refactoring for code quality
2017-10-27 17:38:11 -07:00
snipe
a224904ade
Removed uncessary code
...
This is already handled in the env
2017-10-27 17:00:33 -07:00
snipe
cb3b294baa
Clesned up status label model for code quality
2017-10-26 22:54:07 -07:00
snipe
0788347990
Cleaned up status label method
2017-10-26 22:49:57 -07:00
snipe
7496a902bd
Removed unused getDataView controller method
...
This is all API based now
2017-10-26 22:39:41 -07:00
snipe
f2d04be8fe
Remove unused methods in Settings API controller (for now)
2017-10-26 22:35:01 -07:00
snipe
f2499fc7d2
Removed else condition on custom fields API for code quality
2017-10-26 22:33:40 -07:00
snipe
00d910ddbc
Added manufacturers and categories select lists
2017-10-26 22:09:08 -07:00
snipe
6bcb55a129
Slight tweak to model name presenter
2017-10-26 21:50:39 -07:00
snipe
a99e09e5e3
Removed extra with() calls, since we load those up via the select2 lists now
2017-10-26 21:50:27 -07:00
snipe
7d11cb0748
Added selectlist transformer for select2 API calls
2017-10-26 21:50:01 -07:00
snipe
bdb95e4e3d
Added companies ajax select2 endpoint
2017-10-26 16:37:41 -07:00
snipe
b71d0ab484
Fixed order number and warranty bug in importer
2017-10-26 16:13:35 -07:00
snipe
ea07517ad5
Added more ajax select2 boxes to checkouts, remove helper ->with() methods
2017-10-26 03:43:28 -07:00
snipe
82690e1fd7
Integrate ajax select2 menus in all asset checkouts
2017-10-26 02:28:17 -07:00
snipe
75b527ab59
Features/image uploads ( #4320 )
...
* Locations API support for image
* Added manufacturers API support for image
* Added manufacturers API support for image
* Added image support for locations add/update
* Added manufacturer image upload support to controller
* General image string
* Added blade support for image uploads/delete image
* Added $request support (from Input::)
* Added image support in API transformers
* Added image to Manufacturers presenter for data table
* Migration to create image fields
* Ignore the contents of the new image directories
* Create new image upload directories
* Created components/consumables uploads directory
* Fixed missing textSearch scope from companies
* Added ignore for companies uploads directory
* Added blade support for image upload
* Fixed path to upload directory on edit
* Added company image upport to transformers, controllers
* Added image support for categories
* Added support for images in Departments
* Added support for image in Consumables
* Added image support for components
2017-10-25 22:35:58 -07:00
snipe
b083541723
Fixed docblock copypasta
2017-10-25 20:23:59 -07:00
snipe
0d34cc704a
Added controller for state-saver for sidenav
2017-10-25 20:10:59 -07:00
snipe
e8847753f4
Fixed importer using previous row’s custom field
2017-10-25 18:16:28 -07:00
snipe
a305b1ea2d
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-24 19:24:39 -07:00
snipe
17d58d9cc5
Added snazzy rich user selection menu
...
TODO:
- Abstract this out so it can be used by other select2 menus
- Write a select2 transformer to standardize output
2017-10-24 19:24:35 -07:00
snipe
e0fe383815
Removed debug message in SaveUserRequest
2017-10-24 19:18:53 -07:00
snipe
7140efc561
Use the transformers, Luke
2017-10-24 19:18:20 -07:00
snipe
99be54fd96
Fixed success message on saving new user
2017-10-24 19:17:30 -07:00
snipe
35da7906cc
Fix standardized exception formatter for correct payload
2017-10-24 17:57:49 -07:00
snipe
8a9960f830
Fixed missing break that would override password requirement
2017-10-24 16:56:46 -07:00
snipe
715da63581
Check that model name exists before trying to display it
...
I don’t know why this would ever trigger, but a user in Gitter complained earlier today, so… ¯\_(ツ)_/¯
2017-10-24 16:53:46 -07:00
Brady Wetherington
ad32bae62f
Fix to bad relation definition in Location. ( #4306 )
2017-10-24 16:52:45 -07:00
snipe
bbda0dc3b4
Always return an avatar, and set a fun default
2017-10-24 13:02:30 -07:00
snipe
dc805dd9b1
Added user avatars to listing
2017-10-24 09:51:07 -07:00
snipe
7d64ab3158
Fixes #4294 - pass correct group ID for group user listings
2017-10-24 04:39:47 -07:00
snipe
3799ab87ed
Fixed search query for default sorting
2017-10-23 20:10:37 -07:00
Nicolai Essig
3a302fe2d7
ref #2737 prevent assets with "rtd_location_id" null values to be removed on location sort ( #4283 )
2017-10-23 18:28:06 -07:00
snipe
fc644925ea
Fixes #4291 - adds phone to user listing
2017-10-23 14:21:51 -07:00
Brady Wetherington
8ac57d0121
Need to prefix status_id with assets. for uniqueness ( #4279 )
2017-10-20 17:37:46 -07:00
Brady Wetherington
189574377a
Add 'where' clause to hasManyThrough relationship. ( #4276 )
2017-10-20 16:58:39 -07:00
snipe
22e13cd4d2
Allow sorting on asset counts, disable delete button if the user has items checked out to them
2017-10-19 17:15:21 -07:00
snipe
4215a3257b
Fixes #1044 - adds suppliers and image to accessories ( #4266 )
...
* Ignore accesories uploads
* API: Allow searching accessories by supplier id
* Adds suppliers and image upload to accessories
* Allow sorting by counts for suppliers
* Validate supplier image uploads
* Remove purchase_date from protected accessory array, it was converting it to datetime in datepicker
2017-10-19 16:25:24 -07:00
snipe
1f247ff541
Don’t let the user checkout an asset to itself
...
(We should consolidate that AssetCheckoutRequest for the API)
2017-10-19 15:51:55 -07:00
snipe
e185dc68af
Fixes #4240 - allows admins to use custom password reset URL
2017-10-19 12:22:27 -07:00
snipe
54000ff69f
Allows sorting by number of assets, etc in category
2017-10-19 11:48:09 -07:00
snipe
f6a38e848a
Allows sorting by whether or not the category requires acceptance
2017-10-19 11:44:42 -07:00
snipe
7e8d670f81
Disable delete buttons if there are assets, etc
2017-10-19 11:41:35 -07:00
snipe
a9753eb646
Include asset count in status labels overview
2017-10-19 10:48:15 -07:00
snipe
707c4db881
API: Check there are no assets associated before allowing delete
2017-10-19 10:39:08 -07:00
snipe
d1de34394e
Removed stupid count method
2017-10-19 10:37:30 -07:00
snipe
7153013fb0
Fake sending the test email if the app is in demo mode
2017-10-19 08:33:46 -07:00
snipe
2b826c3adc
Merge branch 'features/mail_test_button' into develop
2017-10-19 08:19:24 -07:00
snipe
cd193ce8bb
Fixes #4036 - adds test email button to general settings
2017-10-19 08:18:56 -07:00
snipe
cb50142ba3
Update @thakilla as a contributor
2017-10-19 06:16:03 -07:00
Nicolai Essig
4bc551db82
ref #4042 scale barcode with label size ( #4258 )
2017-10-19 06:08:01 -07:00
snipe
ae567c08db
Fixes incorrect language reference for consumables on checkout if consumable doesn’t exist
2017-10-19 03:44:01 -07:00
snipe
13586be6b0
Fixed load error if license is invalid
2017-10-19 03:37:27 -07:00
snipe
4d3d19ca2b
Fixes older route reference in consumables
2017-10-19 02:07:31 -07:00
snipe
c5893b4445
Fixes #4249 - display deployed location in listing
2017-10-19 01:30:40 -07:00
snipe
3b012f2827
Some advanced search query tweaks
2017-10-18 10:07:35 -07:00
snipe
5519e2d4ae
Fixes custom fields sorting on asset listings
...
I need a silkwood shower :(
2017-10-18 09:27:34 -07:00
snipe
a3139c6fc6
Fix accessories route for invalid accessory ID
2017-10-18 08:53:25 -07:00
snipe
c0e50be03e
Duh. Helps if you actually assign the array first.
2017-10-18 08:45:05 -07:00
snipe
447833c996
Only try to process model bulk editing if at least one model was selected
2017-10-18 08:15:54 -07:00
snipe
809e310565
Recrypt the LDAP password properly
...
Older installs should add a line to their .env:
`LEGACY_CIPHER=rijndael-256`
2017-10-18 08:15:23 -07:00
snipe
68f6385eba
Fixes 500 in bulk checkout if no asset is selected
2017-10-18 07:15:16 -07:00
snipe
9e39abcc32
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-18 06:24:41 -07:00
snipe
5cd2857d5d
Use footer sumformatter for cost totals
2017-10-18 06:24:36 -07:00
snipe
d9135a8aac
Disallow deleting suppliers with associated assets, licenses or maintenances
2017-10-18 05:47:20 -07:00
Tõnis Ormisson
a4eeff01f0
FIXED upgrade Recrypt not working with changed cipher ( #4245 )
...
* FIX legacy cipher change
* FIX Recrypt Custom fields column names
* FIX ReCrypt Clean un-needed code
2017-10-18 05:43:54 -07:00
snipe
eedbe468ac
Fix licenses not saving supplier id on edit
2017-10-18 05:43:15 -07:00
snipe
ea63ced2bd
Fixes table alias bug in complex queries for Laravel
2017-10-18 01:21:08 -07:00
snipe
6bd49bfb72
Fixes #4191 - user search
2017-10-18 01:20:50 -07:00
snipe
c069829b33
Fixes #906 - groups view
2017-10-17 21:43:57 -07:00
snipe
aa7091d962
Fixes #4226 - adds log_max_files to app config and sample env
2017-10-17 20:04:07 -07:00
snipe
1d5fb52bfc
Fix for LDAP where location ou is not null but blank
2017-10-17 16:59:50 -07:00
snipe
dea42db18b
Reversed order of withTrashed for deleted asset QR codes
2017-10-17 16:21:50 -07:00
snipe
a1f5e11517
Fix for broken QR code on deleted assets
2017-10-17 16:01:53 -07:00
snipe
160fd1c86a
Added setting to let admin decide whether footer text should link back to site
2017-10-17 13:54:03 -07:00
snipe
b46cbac911
Fixes #4230 - adds model name and manufacturer to emails
2017-10-17 13:30:32 -07:00
snipe
e9c3d6bfb7
Full text search fixes - addresses laravel bug :(
2017-10-17 12:48:18 -07:00
snipe
e7fe91c9d4
Depreciation view
2017-10-17 11:20:05 -07:00
snipe
37df934e97
Fixes #4220 - allow nullable for completion date
2017-10-16 18:32:48 -07:00
snipe
6517a95d45
Check if there are any custom fields before trying to loop through them
2017-10-16 15:29:19 -07:00
snipe
4b84a0c916
Tidying some of the LDAP UDN logic
2017-10-16 15:29:06 -07:00
snipe
cbe008d52f
Fix assetLoc to assetloc because reasons?
2017-10-16 09:08:08 -07:00
snipe
45c2af80a3
More LDAP testing US refinements
2017-10-16 09:00:51 -07:00
snipe
1fbf3753bc
More small LDAP test improvements
2017-10-16 07:07:21 -07:00
snipe
bcf435f625
Try for better error reporting on LDAP fail
...
Sorry for all the commits on this - my local LDAP isn’t working and I can’t figure out why, so no easy way to test locally
2017-10-16 06:46:33 -07:00
snipe
b107280b7b
Slightly nicer UI for LDAP login test
2017-10-16 06:39:36 -07:00
snipe
f1a6926ad9
LDAP test login
2017-10-16 06:34:04 -07:00
snipe
ba7b9d8168
Removed stray foo
2017-10-16 05:54:33 -07:00
snipe
59a126c47c
Small tweaks to LDAP test
2017-10-16 05:52:18 -07:00
snipe
56cbc005ae
Fixes expected checkins name in console kernel
2017-10-16 05:01:15 -07:00
Daniel Meltzer
22e9246031
Fix more old routes. Should fix #4216 ( #4217 )
2017-10-15 23:32:40 -07:00
snipe
fa95f6d836
Another attempt for #4165
2017-10-11 15:36:47 -07:00
snipe
6d4574130f
Clearer indication of whether or not the user will be emailed a eula
2017-10-11 14:44:25 -07:00
snipe
485b6397d0
Possible (crummy temp) fix for #4165
2017-10-11 14:42:11 -07:00
snipe
93990327de
Hopefully fixes #4163
2017-10-11 14:18:08 -07:00
snipe
36cbffa183
Fixes bug where custom fields would not store new name in custom fields table on edit
2017-10-11 13:09:10 -07:00
snipe
b6a1e0d12f
Call migrate before passport install
2017-10-11 12:42:31 -07:00
snipe
f56eb16941
More specific order by clause for drilling down on order number
2017-10-11 12:29:08 -07:00
snipe
64e7ab3a12
Fixes #4182 - empty names for assets when checking out to asset
2017-10-11 01:31:37 -07:00
snipe
f64c02ce12
Fix for ambiguous query on models
2017-10-10 23:12:16 -07:00
snipe
bed7b29417
Fixes group search
2017-10-10 22:59:32 -07:00
Richard Hofman
adca7cb0c5
Fix LDAP location sync issue in #3993 ( #4181 )
...
* Ensure locations with the most specific OUs take precedence during user assignment.
* Save 'ldap_ou' Location attribute during creation.
2017-10-09 13:06:47 -07:00
snipe
e29d878d4f
Remove unused method arguments
2017-10-07 15:09:50 -07:00
snipe
d4e3ea1412
Derp
2017-10-07 15:07:31 -07:00
snipe
c5462c5f1f
Not sure why this isn’t working… commenting it out for now
2017-10-07 14:52:00 -07:00
snipe
8c406e8e55
Additional auth policies
2017-10-07 14:49:47 -07:00
snipe
6e33f36595
Set snipe-logo as default
2017-10-07 14:49:36 -07:00
snipe
9dc79f7165
Demo Settings reset artisan command
...
We’ll set this as a cron job to reset the language back to english
2017-10-07 07:43:57 -07:00
snipe
a69a939034
Small barcode tweaks
2017-10-07 07:15:28 -07:00
snipe
834c6ad8f9
Removed extra space
2017-10-07 06:56:47 -07:00
snipe
2ce48fbc7e
Use components transformer in API method
2017-10-07 06:56:39 -07:00
snipe
5d18937e94
Standardized component API output
2017-10-07 06:56:18 -07:00
snipe
b3186ba5ea
Removed old getDataTable methods
...
These are no longer used because of the API
2017-10-07 06:56:02 -07:00
snipe
a03207e5b4
Show license notes
2017-10-07 04:42:53 -07:00
snipe
e2f4685a55
Added notes back to list view
2017-10-07 03:36:50 -07:00
snipe
064a4ebe33
Ability to skip deleting/generating new users
...
This will behave unpredictably if there is not a user id 1
2017-10-07 00:02:37 -07:00
snipe
a84da88114
Demo seeder
2017-10-06 22:58:00 -07:00
snipe
282b3b5b0a
Remove catch-all “deployed” from pie chart
2017-10-06 18:41:10 -07:00
snipe
1dcff8d463
Remove eager loading on pie
...
This was causing memory issues for large asset sets
2017-10-06 18:15:01 -07:00
snipe
e461c25428
Apply model image fix to update method
2017-10-06 17:03:51 -07:00
snipe
554ea8bb95
Fixed asset model image validation
2017-10-06 16:56:43 -07:00
Richard Hofman
f2be409914
LDAP sync improvements and DB query fix. ( #4148 )
...
* Set 'ldap_ou' Location field to NULL when an empty string is submitted.
* Consolidate LDAP user import logic in LdapSync.php.
2017-10-06 16:15:14 -07:00
snipe
f580e20bc3
Fixed custom fields filter for advanced search
2017-10-05 23:09:02 -07:00
snipe
f6d8642799
Fix $search variable to $search_var for new filter
2017-10-05 00:35:37 -07:00
snipe
f66e222f3d
Fixes #4132 - associated accessory users
2017-10-03 21:03:00 -07:00
snipe
6dd4282f1f
Fixes #4130 - show deleted asset models
2017-10-03 17:53:08 -07:00
snipe
3f44987799
Small logo size tweaks
2017-10-03 14:15:03 -07:00
snipe
512632ce60
Make the export button contextual for requested status
2017-10-03 12:50:18 -07:00
snipe
54671af7f0
Small export assets fix
2017-10-03 11:49:41 -07:00
snipe
8e73cacf4e
Fixes custom report to include assigned to names, etc
2017-10-03 10:38:28 -07:00
snipe
c721fdd793
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-03 08:46:25 -07:00
Daniel Meltzer
d119372ff0
Fix License Import. ( #4121 )
...
The license name is not unique, so keying by license alone was causing issues. Match using name + serial instead.
2017-10-03 08:46:06 -07:00
snipe
3a470ce789
Only report exceptions we want to see
2017-10-03 07:28:00 -07:00
snipe
3687cbfdb3
Added rollbar support
2017-10-02 20:27:45 -07:00
snipe
8a7abba427
Slash url
2017-10-02 17:21:18 -07:00
snipe
9df648b428
Fix Session path
2017-10-02 17:19:22 -07:00
snipe
ff38cdd09b
Comment out the nullable middleware until we have a chance to check all model validators
2017-10-02 16:36:43 -07:00
snipe
59225701b5
Redirect to previous after login
2017-10-02 16:00:42 -07:00
snipe
aab635154a
Default to turning CSP off until we can fix vue/CSP issues
2017-10-02 13:29:14 -07:00
snipe
e26d038589
Fixed license checkin form UI
2017-10-01 15:08:32 -07:00
snipe
afc8133acf
URL nullable validation isn’t working in Laravel 5.4?
2017-10-01 14:40:13 -07:00
snipe
abe19a6311
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-01 14:33:02 -07:00
snipe
07359c76ad
Fixes #4094 - more nullables
2017-10-01 14:32:47 -07:00
Daniel Meltzer
c2616412c0
Add laravel routes to javascript ( #4092 )
...
* Add laravel routes to javascript
This will clean up a lot of passing of urls. Adds a route() helper and
everything...
This commit also moves the customfield fetching to only be fetched once
and shared with each file, rather than once for each file.
* Try to fix travis unit test things.
* Downgrade doctrine/inflector for php5
* Attempt to occasional seeder issues on travis if the asset does not generate validatable data.
* Update sql dump for functional tests.
* Try to fix api tests.
2017-10-01 12:59:55 -07:00
Daniel Meltzer
23ca2d9a0b
Minor fixes ( #4091 )
...
* Fix old urls.
Still had some /admin/ urls floating around, which was causing bad
redirects in some instances. Should fix #4085
* The modal seems to be confusing license upload. be more explicit in the route we redirect to.
* Fix #4039 . Use proper methods for location assets.
This also fixes a bunch of n+1 issues in the transformer. Also: curious
to know what Location::assets() does, because it doesn't do what I want
it to :)
2017-10-01 12:57:04 -07:00
snipe
ba793355cb
Nullable crap. Again.
2017-09-29 17:50:52 -07:00
Daniel Meltzer
655ca78633
Adjust the import controller to return a url to the process path to enable processing an uploaded file without refresh. ( #4080 )
2017-09-29 17:49:35 -07:00
Daniel Meltzer
bbffde47f7
Remove conditional related to no longer existant testrun option. ( #4079 )
2017-09-29 17:31:39 -07:00
snipe
be7598b279
Fixes all assets showing as unassigned in license checkout
2017-09-29 17:14:38 -07:00
snipe
9301c56a77
Fixes #4069 - include request handler
2017-09-29 16:17:35 -07:00
snipe
e37503c734
Fixes #4075 - this is janky and should be revisited
2017-09-29 16:09:24 -07:00
snipe
43ff66e4d9
More UI tweaking for meta statuses
2017-09-29 15:24:33 -07:00
snipe
4eda2a2f96
*ahem*
2017-09-29 12:03:12 -07:00
snipe
fe1975067a
Hopefully clearer status label meta info
2017-09-29 12:03:02 -07:00
snipe
efd71f8bfe
For #3998 - Disable CSP if debug=true
...
To avoid all the nonce hell from debugbar
2017-09-29 04:53:09 -07:00
snipe
05a8ba9a8e
Fix weird url if license checkout fails
2017-09-29 04:37:33 -07:00
snipe
9ce2d1f560
Merge branch 'csp-middleware' into develop
2017-09-29 04:14:33 -07:00
snipe
2e76620cf8
More specific required check
2017-09-29 03:44:23 -07:00
snipe
a4b30279ee
Fixes #4067 - Make unrequired custom fields nullable
2017-09-29 03:30:13 -07:00
snipe
faf3802971
Fixes #4011 - do not send email to user on license checkout
2017-09-29 02:00:49 -07:00
snipe
ba8bcce8eb
Hopefully fixes #4020
2017-09-29 01:21:08 -07:00
snipe
aab409dec2
Fixes #4061 - bulk checkout error
2017-09-28 22:22:21 -07:00
snipe
4d32f2b337
Fixes #4059 - accessories view
2017-09-28 21:18:00 -07:00
snipe
0e29744ec2
Don’t try to send an email if the user doesn’t have an email address
2017-09-28 20:57:33 -07:00
snipe
51236a2ad9
Fixes #4056 - check for assets before deleting user
2017-09-28 19:57:52 -07:00
snipe
46d87849f4
Added content security middleware
2017-09-28 19:45:15 -07:00
snipe
b60febeea2
Removed space in XSS header because safari was getting angry
2017-09-28 18:45:54 -07:00
snipe
9b84a0d516
*eyeroll*
2017-09-28 17:34:47 -07:00
snipe
1775995f26
Is this space necessary? Getting weird results from netsparker
2017-09-28 17:25:04 -07:00
snipe
26a7701cda
Added referrer-policy header
2017-09-28 17:12:58 -07:00
snipe
a34085f1d9
Added mode=block to XSSProtect header
2017-09-28 16:28:27 -07:00
Daniel Meltzer
af19e5d976
Fix old route ( #4053 )
...
Looks like we missed in the v4 port. Fixes the unrelated issue in #4052
2017-09-28 16:02:50 -07:00
snipe
3d7277398c
Fixes #4057 - sig file in lightbox
2017-09-28 15:13:05 -07:00
snipe
a7ad48a02a
Make fields nullable for licenses
2017-09-27 22:11:20 -07:00
snipe
0fb4ff77f4
Restoring older SnipeModel attribute setters
...
In case needed by API - needs investigation
2017-09-27 16:39:20 -07:00
snipe
ac83dba2bb
Fixes #4034 - save login note
2017-09-27 16:35:54 -07:00
snipe
fc96fa756e
Fix redirect default on password reset
2017-09-27 16:23:21 -07:00
snipe
ea9a502152
Added empty regsitration controller
...
When using the default Laravel auth routes, it expects a registration controller, even though we don’t have a concept of registration. This blank controller just prevents route caching from throwing errors.
2017-09-27 16:23:01 -07:00
snipe
ec8a3d2e56
Fixes #4027 - proper redirect on fieldset delete
2017-09-27 16:02:29 -07:00
snipe
ecf041fa10
Fixes #4043 - standardize groups API response
2017-09-27 15:18:29 -07:00
snipe
0ab9bc1db8
Added normalization midddleware, removed
2017-09-27 15:18:05 -07:00
snipe
73e788b94b
Make min_amt fillable
2017-09-27 14:50:56 -07:00
snipe
e91a537552
Use more modern Request handler
2017-09-27 14:50:48 -07:00
snipe
ef8c1abf28
Fixes #3113 and #4040
2017-09-27 14:50:17 -07:00
snipe
bd0498aa69
Fixes #4016 - signature file missing from history tab
2017-09-27 12:58:08 -07:00
snipe
e27e1a78c3
Fix for case where a fieldset is assigned to a model, but no fields are assigned
2017-09-26 16:01:23 -07:00
snipe
4b9bfc178d
One more try on #4001
2017-09-25 22:05:57 -07:00
snipe
f2ee7dcabb
Fixes #4001 - license checkout not working
2017-09-25 21:40:43 -07:00
snipe
26203801f6
Fixes #4009 - zip not populating on locations listing page
2017-09-25 20:45:05 -07:00
snipe
c3afbc0e53
Run backups before purging and importing
2017-09-25 15:00:23 -07:00
snipe
38326314ca
Merge branch 'develop'
2017-09-25 11:53:33 -07:00
snipe
865950e766
Fixes #4000 - user_id blank
2017-09-25 11:53:10 -07:00
snipe
d49b67d033
Fix for assigned user location
...
Was breaking requestable page
2017-09-25 11:26:04 -07:00
snipe
6b63808e34
Fix for asset location null on user
2017-09-25 11:25:15 -07:00
snipe
34dfcb5add
Merge branch 'develop'
2017-09-22 17:23:38 -07:00
snipe
30019a144a
Disable login note editing on demo
2017-09-22 17:23:22 -07:00
snipe
b29d7beb3a
Merge branch 'develop'
...
# Conflicts:
# .gitignore
# Dockerfile
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/AssetsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/GroupsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/UsersController.php
# app/Http/routes.php
# app/Models/Depreciation.php
# app/Models/Location.php
# config/version.php
# resources/views/account/view-assets.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/modals.blade.php
# resources/views/reports/custom.blade.php
# snipeit.sh
2017-09-22 16:12:18 -07:00
snipe
998c4a5fe5
Make model number nullable
2017-09-22 04:43:28 -07:00
snipe
126a5671fe
Set timeout for LDAP server
2017-09-18 19:11:38 -07:00
Daniel Meltzer
a5764351f7
Migrate weird assigned_type issues, Issue #3972 ( #3973 )
...
For a while, prior to 987536930
2017-09-18 16:40:13 -07:00
Daniel Meltzer
922d6937ae
Custom field import repair ( #3968 )
...
* There is no notes field on accessories. Fixes Importer Test.
* Fix notification test. We should see a checkout not allowed exception when trying to check out to a location if the asset requires acceptance.
* Fix Custom field import.
Add a test for custom field import, and fix a few issues related to
importing custom fields. This will restore v3 functionality.
* Add UI support for mapping custom fields.
This still requires the field mappings to be created/assigned in
advance, but will fetch all custom field names and allow them to be
selected when setting up custom field mappings.
This commit also updates laravel-mix to v1.4.3 and other node
dependencies to fix some build issues.
* Fix some requestable asset page/assetloc issues. I'd love to know why laravel expections relationships to be in lower case... but thats a question for another day.
2017-09-18 12:29:08 -07:00
snipe
c53dae4b72
Possible fix for #3919 - allow later versions of mcrypted base64 keys
2017-09-14 16:43:41 -07:00
Iman
ed4ea7f1f4
No new feature,No bug fix, Only refactoring ( #3949 )
...
* No change in logic !
Just exchanging the if and else code blocks and negating condition.
* remove unneeded else{} block
* Re-indented the code
2017-09-12 12:28:42 -07:00
snipe
81e358a01d
Small maintenance fixes
2017-09-08 17:49:01 -07:00
snipe
6c283de60a
Check for status_id key - related to #3928
...
TODO: Fix for model number
2017-09-08 17:24:28 -07:00
snipe
47909b93f7
Fixed deleted users/restore users view
2017-09-06 17:11:43 -07:00
Daniel Meltzer
ae0573b3da
Fix asset create ( #3929 )
...
* Fix accidental commit of ImporterTest.
* Move the name() method to the presenter
This fixes some weird collisions between laravels voodoo and our
presenter voodoo that confused php. It's also probably a cleaner place
to put it. Should fix #3927
* Add missing parenthesis
* Add heading to tables on locations/view page.
2017-09-06 16:24:43 -07:00
Daniel Meltzer
987536930c
Assorted fixes ( #3923 )
...
* Fix some n+1 problems
* Use route in notification dropdown to make sure we link to correct page
* Work on better UI support for checkout to non-user. Fix links on index bootstrap table, work towards eliminating assignedUser
* Remove Asset::assigneduser() relationship. Instead add a checkedOutToUser() method and/or port to using assignedTo()
* Adjust string to fit new reality
* Fix #3780 . Move the consumables getDataView method to the ApiController. Not entirely RESTful, but it's a weird method that probably doesn't need its own controller and the functionality would be strange to stack on the userscontroller...
* Fix file uploads to assets and restore the delete route.
* Add asset maintence edit action to index.
* Suppliers asset list should link to the related asset, not to the supplier with same ID.
* Asset models page should use polymorphic formatter on assigned to to better handle assorted item types.
* Comment out more assigneduser fallacy until we figure out the query builder approach to searching for location text.
2017-09-05 17:54:58 -07:00
snipe
761371509d
Use notifiables for slack audit notification
2017-08-31 21:30:38 -07:00
snipe
3518ea7e7d
Fixes #606 - email notifications for expected checkins
2017-08-31 21:18:05 -07:00
snipe
0054ce3071
Fixes #3907
2017-08-31 13:45:48 -07:00
snipe
b0f74466bb
Removed dd
2017-08-31 11:15:52 -07:00
snipe
b4a0484295
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-08-31 11:15:03 -07:00
Daniel Meltzer
bb874012d9
Progress towards better email notifications ( #3911 )
...
Working mail from notification. Still requires testing/cleaning
Add tests around checkout notification.
This also removes the ability to check out an asset to a location|asset
that requires acceptance/a Eula. For 4.1 we may think about how to
support such a thing, but at present it seems to make sense to only alow
such assets to be checked out to users, who can be responsible for the
items.
2017-08-31 11:14:21 -07:00
snipe
bb8583eb14
Remove lower casing for LDAP array re: #3910
2017-08-31 11:00:08 -07:00
snipe
8d2c229bc3
Move LDAP validation into form request
2017-08-31 10:44:00 -07:00
snipe
48e6208214
Fixes #3907 - do not require username on user if LDAP import
2017-08-31 10:43:36 -07:00
snipe
22233e3ba6
Bulk asset audit form (needs more testing)
2017-08-29 16:00:22 -07:00
snipe
e439f15a64
Fixed some date math for auditing
2017-08-28 17:20:20 -07:00
snipe
e10cdd57a5
Removed old getassetloist method
2017-08-26 15:22:04 -07:00
snipe
bf157773c8
Also related to #3888
2017-08-26 15:21:38 -07:00
snipe
51d74ac06d
Auduting improvements
2017-08-25 18:40:20 -07:00
snipe
af835d6efc
Additional setting validation for new fields
2017-08-25 17:59:01 -07:00
snipe
16f57e16cb
Fixes #1190 - added basic audit workflow
2017-08-25 10:04:19 -07:00
snipe
52270fa4db
Derp
2017-08-25 08:30:48 -07:00
snipe
bf3731d65c
Set default min password to 10
2017-08-25 08:23:23 -07:00
snipe
19670f9dd8
Remove assigned_to constraint
2017-08-25 06:30:10 -07:00
snipe
4721cab928
Grr.
2017-08-25 06:08:19 -07:00
snipe
08f3e78d26
Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# app/Http/Transformers/LocationsTransformer.php
# resources/views/locations/view.blade.php
# routes/api.php
# tests/_data/dump.sql
2017-08-25 06:04:22 -07:00
snipe
10711245ba
Fixes #3792 - parent/child locations in API
2017-08-25 05:32:12 -07:00
snipe
29a7c8577d
Fixes #3849 - fillable for accessories
2017-08-25 03:48:07 -07:00
snipe
021e723acf
Fixed typo
2017-08-25 03:27:41 -07:00
snipe
14c0c314aa
Make sure payload is always passed, even if null
2017-08-25 03:27:31 -07:00
snipe
d23ea70b08
Added auth check back to asset store
2017-08-25 03:26:50 -07:00
snipe
1b047c768b
Added fullName() presenter for locations
2017-08-25 03:26:10 -07:00
snipe
73ce5f98bb
Removed some logging to make test debugging less verbose
2017-08-24 23:20:51 -07:00
snipe
659d953f3f
Fixed custom error message for status labels
2017-08-24 22:40:07 -07:00
Brady Wetherington
c1dcc22217
Refactor and improve Modal support for Assets ( #3884 )
2017-08-24 22:24:02 -07:00
snipe
4ba474cf73
Fixes asset test
2017-08-24 16:52:27 -07:00
snipe
fb6caa35ff
Only increment if settings table has a value
...
(This should only ever come up in the CI tests)
2017-08-23 14:07:01 -07:00
snipe
a5870c888e
Removed incrementer from non-asset event listeners
2017-08-23 13:59:59 -07:00
snipe
6e30fa6922
Fixes custom fields in asset listing where no custom fields were assigned
2017-08-23 03:28:13 -07:00
snipe
58b3f0519d
Add empty errors array
2017-08-23 00:31:37 -07:00
snipe
f119c69698
Possible fix for #3852
2017-08-22 22:46:02 -07:00
snipe
57f4c986af
Enforce password complexity rules on new account password change
2017-08-22 22:41:35 -07:00
snipe
06c5bce3c7
Fixes #3865 - employee number mislabeled in list output
2017-08-22 21:40:35 -07:00
snipe
a0cbca85bf
Fixes for API calls for password complexity stuff
2017-08-22 21:15:35 -07:00
snipe
9bda62d295
ADDED: Password rules for complexity, min length, rejecting common passwords
2017-08-22 20:32:39 -07:00
snipe
1d7e243d0a
Fixes #3790 - parent display on locations index
2017-08-22 15:02:31 -07:00
snipe
63bc2ec09f
Fixes #3802 - make id an (int) in API repsonse
2017-08-22 14:53:48 -07:00
snipe
d5cadeab1a
Fixes #3854 - more fillable fields for supplier API
2017-08-22 14:30:39 -07:00
snipe
31516abef9
Fixes #3858 - use transformer for single listing categories
2017-08-22 14:26:08 -07:00
snipe
d2535582f3
Fixes #3853 - added notes/zip to suppliers API response
2017-08-22 14:18:21 -07:00
snipe
eaaea303f4
Fixes #3860 - return JSON instead of redirect in API delete dept call
2017-08-22 14:15:13 -07:00
snipe
8c5312b931
Fixes #3866 - weird API behavior in status label types
2017-08-22 14:10:54 -07:00
snipe
4ef6e292d1
Fixes #3868 - model_number/notes in models API call
2017-08-22 13:56:51 -07:00
snipe
6310670835
Fixes #3869 - asset maintenances API endpoints
2017-08-22 13:52:06 -07:00
snipe
148d41d8dc
Removes erroneous else
2017-08-22 12:22:32 -07:00
snipe
71c1c74164
Fixes #3085 - adds “change password” functionality back to user accounts
2017-08-22 12:09:04 -07:00
snipe
9c02526a37
Make fields nullable in settings
2017-08-22 10:41:59 -07:00
snipe
6a73ec6537
First stab at a recrypter for legacy mcrypt conversion
2017-08-21 22:30:56 -07:00
snipe
4576cb6f56
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-08-10 14:38:08 -07:00
snipe
56f88d2c22
Fixes #3836 - Adds supplier to licenses column
2017-08-10 14:38:04 -07:00
gibsonjoshua55
c1d1cb8122
Address #3840 and fixes group transformation in UsersTransformer ( #3841 )
...
Removes the incorrect variable access in UsersTransformer of a users's
groups and adds an array of groups' ids and names to the return array.
2017-08-10 13:37:54 -07:00
snipe
de18e2a887
Only bcrypt passwords on user save if the password value is passed
2017-08-08 14:41:58 -07:00
snipe
7da4fe4524
Fixes #3825 - allows fillables through location API
2017-08-08 12:36:28 -07:00
snipe
9bfd345774
Use Company transformer with payload
2017-08-03 19:55:08 -07:00
snipe
df87c82ddc
Fixes #3805 - add/update/delete methods for User API
2017-08-03 19:50:18 -07:00
snipe
3e8b7d9c94
Check for overall asset delete permissions before checking to see if the user can delete that specific asset
2017-08-03 19:49:41 -07:00
Jason Spriggs
7c4ee54f8b
Fix #3803 - Return asset object instead of just id ( #3811 )
2017-08-01 20:01:11 -07:00
snipe
03f9d01aab
Fixes #3775 - added missing created_at and updated_at fields
2017-07-29 17:01:03 -07:00
snipe
5b420fb4b9
Fixes #3779 - corrects presenter used for Consumables
2017-07-29 16:44:51 -07:00
snipe
a2d63dd3e4
Fixes #3776 - adds Company to Dept UI
2017-07-29 16:42:17 -07:00
snipe
0408509fdc
Fixes #3777 - correct response for two_factor_actived for user API
2017-07-29 16:25:42 -07:00
snipe
5e47c18d68
Fixes #3786 - checkin/checkout to components UI
2017-07-29 16:13:17 -07:00
snipe
4e5cf531f7
Fixes #3799 - use transformers on show() method as well
2017-07-29 15:46:10 -07:00
snipe
ccb7556281
Fixes javascript error when custom fields exist but do not belong to any fieldsets or models
2017-07-26 17:06:58 -07:00
snipe
ee7348d0d5
Better fix for javascript formatter for employee number
2017-07-26 16:47:47 -07:00
snipe
7d6bf4ac24
Fixes stupid javascript for employee_number
2017-07-26 16:26:47 -07:00
snipe
cb903ab9fd
Fixes manager user->name to username in Users API
2017-07-26 08:51:16 -07:00
snipe
66d8308163
More compact payload for users API on location and manager
2017-07-26 08:47:54 -07:00
snipe
847262e989
Fixes #3774 - fixes for inconsistent API responses (‘’ vs null) and adds escaping
2017-07-25 23:40:30 -07:00
snipe
59006964d1
Fixes #3771 - adds username to API response on Asset API
2017-07-25 22:11:50 -07:00
snipe
ac29b142dc
Adds max thumbnail width to asset listings, settings
2017-07-25 19:36:38 -07:00
snipe
0fbf9236f4
Fixes #3742 - add employee number to asset listing
...
Also removes asset report, since it’s basically the exact same output as the asset listing
2017-07-25 01:17:23 -07:00
Jan Felix Wiebe
5cc84ca137
Use correct array when deleting users with location ( #3769 )
2017-07-24 23:15:15 -07:00
snipe
29f1cf2b48
Increase depreciation max
2017-07-19 19:41:21 -07:00
snipe
7510f9f128
Fixes #3753 - use route direction instead of URL
2017-07-17 16:42:39 -07:00
snipe
3eea1a23f8
Slug the filename
...
So upoloads with weird characters like parens don’t get hoarked when trying to delete
2017-07-14 02:38:13 -07:00
snipe
1fda4593c1
Update @gibsonjoshua55 as a contributor
2017-07-12 20:41:20 -07:00
snipe
6b5a0983ee
Added model validation to custom fieldsets
2017-07-12 19:34:45 -07:00
snipe
ad12a5ce11
Added store/update methods to custom fields API
2017-07-12 19:34:34 -07:00
snipe
5abe72ce02
Added whether the field is required to the custom fieldsets transformer
2017-07-12 19:23:54 -07:00
snipe
3e3276334b
Added escaping to API output
2017-07-12 19:23:15 -07:00
snipe
b13e04095e
Removed commented code
2017-07-12 19:22:58 -07:00
gibsonjoshua55
3cfcc43efa
Adds basic GET api support for CustomFieldsets ( #3697 )
...
* Adds basic GET api support for CustomFieldsets
Currently there is not support for getting what fields a given fieldset contains
from the API. This commit creates a new API Controller for CustomFieldsets as
well as Transformers for CustomFields CustomFieldsets. Additionally, the api
route has been updated so that a show method can be access from
http://myapp/api/v1/fieldsets/{id}
* CustomFieldsetsTransformer only returns id and name of model
* Added index api method for CustomFieldsets
* Removes copy/paste error in CustomFieldsetController (including search)
* Added id to CustomFieldsetsTransformers
* Adds custom_fieldset_id as a field when storing and updating AssetModels
* Removed uncessesary parameter from CustomFieldsetsController.index
* Cleaned up CustomFieldset API
2017-07-12 17:51:22 -07:00
Daniel Meltzer
f432f98e12
Importer tests + Fixes ( #3733 )
...
* Fix Bug in User::generateFormattedNameFromFullName
In a name "John Doe", this method would split it into "John" and " Doe",
Leaving a space in the last name when importing to the database. Strip
this space.
* Cleanup/fix some item mapping.
Also make some changes to the importer schema to allow for unit testing.
Generate a default item mapping, and then merge that with any custom
mappings.
* Beginning work on importer unit tests.
* Strip out testrun branches from importer. It added a lot of complexity and was not terribly useful with web importer as it stood, might reconsider down the road however.
* Normalize the mapped keys when using custom field mappings.
* Add test for custom asset import mapping.
* Make all unit tests inherit from a new custom base.
This baseclass currently calls Artisan::migrate() and seeds a Settings
instance. This fixes unit tests after the autoincrement bits.
* Store requestable as a boolean. Fixes some import oddities
* Work on tests for accessory importer.
* Test for custom mapping of accessory import, also adjust the internal field for purchase date.
* Update default locale fallback for currency detection
* Fix Reassignable in consumable as well.
* More importer tests and fixes.
2017-07-11 20:37:02 -07:00
snipe
9bcfe0748b
Make custom fields into their own JSON array
2017-07-08 18:44:28 -07:00
snipe
de5e7bd9ba
Removed null formatter
2017-07-08 17:04:52 -07:00
snipe
635299cd74
Decrypt encrypted fields
2017-07-08 17:04:40 -07:00
snipe
20376daec4
Fix encryption on first save
2017-07-08 17:04:24 -07:00
snipe
50e1570543
Added additional models for #3702
2017-07-08 14:49:43 -07:00
snipe
eb94c4333d
Fixes #3702 - Added artisan command to walk through special characters and unescape them in the DB
2017-07-08 14:47:43 -07:00
snipe
a49fd16916
Fixed delete file settings route
2017-07-08 13:42:05 -07:00
snipe
932e25ca9b
Only add an update log message if the asset isn’t being checked in or out
2017-07-08 03:38:39 -07:00
snipe
d2f6c8af11
Require first name field if LDAP is enabled
2017-07-08 01:40:56 -07:00
snipe
33557f3792
Nicer formatting for phpinfo output
2017-07-08 00:22:30 -07:00
snipe
c2927c4a2e
Added phpinfo page if debugging is enabled
2017-07-08 00:09:39 -07:00
snipe
ab2b2f3043
Updated UI for Admin Settings
2017-07-07 23:44:48 -07:00
snipe
9894edb008
Added login note to settings
2017-07-07 19:54:10 -07:00
snipe
c2e8803d1e
Addec clone button back to models, assets, licenses, etc
2017-07-07 18:45:49 -07:00
snipe
7e1f7297b3
Settings tweaks
2017-07-07 18:06:31 -07:00
snipe
31cabaa4db
Fixes #3724 - adds edit/delete button back to companies listing
2017-07-07 17:10:06 -07:00
Daniel Meltzer
61c6160b98
Importer mapping - v1 ( #3677 )
...
* Move importer to an inline-template, allows for translations and easier passing of data from laravel to vue.
* Pull the modal out into a dedicated partial, move importer to views/importer.
* Add document of CSV->importer mappings. Reorganize some code.
Progress.
* Add header_row and first_row to imports table, and process upon uploading a file
* Use an expandable table row instead of a modal for import processing. This should allow for field mapping interaction easier.
* Fix import processing after moving method.
* Frontend importer mapping improvements.
Invert display so we show found columns and allow users to select an
importer field to map to. Also implement sample data based on first row
of csv.
* Update select2. Maintain selected items properly.
* Backend support for importing. Only works on the web importer currently. Definitely needs testing and polish.
* We no longer use vue-modal plugin.
* Add a column to track field mappings to the imports table.
* Cleanup/rename methods+refactor
* Save field mappings and import type when attempting an import, and repopulate these values when returning to the page.
* Update debugbar to fix a bug in the debugbar code.
* Fix asset tag detection.
Also rename findMatch to be a bit clearer as to what it does.
Remove logging to file of imports for http imports because
it eats an incredible amouint of memory.
This commit also moves imports out of the hardware namespace and into
their own webcontroller and route prefix, remove dead code from
AssetController as a result.
* Dynamically limit options for select2 based on import type selected, and group them by item type.
* Add user importer.
Still need to implement emailing of passwords to new users, and probably
test a bit more.
This also bumps the memory limit for web imports up as well, I need to
profile memory usage here before too long.
* Query the db to find user matches rather than search the array. Performance is much much better.
* Speed/memory improvements in importers.
Move to querying the db rather than maintaining an array for all
importers. Also only store the id of items when we import, rather than
the full model. It saves a decent amount of memory.
* Remove grouping of items in select2
With the values being set dynamically, the grouping is redundant. It
also caused a regression with automatically guessing/matching field
names. This is starting to get close.
* Remove debug line on every create.
* Switch migration to be text field instead of json field for compatibility with older mysql/mariadb
* Fix asset import regression matching email address.
* Rearrange travis order in attempt to fix null settings.
* Use auth::id instead of fetching it off the user. Fixes a null object reference during seeding.
2017-06-21 16:37:37 -07:00
Daniel Meltzer
d12159c042
Fix travis with new observer code ( #3683 )
...
* Rearrange travis order in attempt to fix null settings.
* Use auth::id instead of fetching it off the user. Fixes a null object reference during seeding.
2017-06-20 20:38:13 -07:00
snipe
25e99194ce
Fixes #3681 - corrected fieldname for bulk asset delete
2017-06-20 14:41:30 -07:00
snipe
5b9bcd8fa2
Add next auto-increment to settings form
2017-06-20 12:23:16 -07:00
snipe
4bde058192
Save next_auto_tag_base in settings on edit
2017-06-20 12:19:05 -07:00
snipe
ffba9789b7
Fixed typo in variable name
2017-06-20 12:13:36 -07:00
snipe
1052be670d
Increase size of state field
2017-06-15 21:04:10 -07:00
snipe
770092f23f
Added save/update/delete observers
...
This should make it easier to handle action logging between the GUI and the API
2017-06-15 20:54:14 -07:00
snipe
99f65cbf69
Hopefully fixes #3203 and #3439
2017-06-15 19:42:43 -07:00
Daniel Meltzer
5d4920c741
[WIP] Improvements to unit tests. ( #3574 )
...
* Improvemenets to unit tests.
* Break up modelfactory into multiple files, populate many states.
* Begin testing validation at the unit test level, test relationships.
* Add tests for Asset::availableForCheckout.
* Model factories now generate all needed relationships on demand,
which allows us to unit test with a empty database.
* To faciliate the empty database, we move to using sqlite in memory as
the unit testing database.
* Fix bug with logs of checkouts to non users.
* Fix location finding for assets. Also Fix location show page to show users associated with location. Still need some work to show assets.
* More test and generator improvements
* More unit test fixes. PermissionsTest is borked still.
* More Updates
* Rewrite permissionstest. Check that we have access on the model level rather than via web requests. Also test delete permissions.
* Fix seeders.
* Make the default asset model factory generate assets that are rtd for testing.
* Save progress.
* Rebase tests, fix department unit test, update database for functional tests.
* Update functional and api tests to use new modelfactory signatures.
2017-06-12 17:39:03 -07:00
Daniel Meltzer
dfea47a272
Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page.
2017-06-12 18:24:20 -05:00
Daniel Meltzer
f0d78091d2
Add a manager field to locations.
...
This is round one of the rethink of checkout-to-everything. A location
now has a manager field, and the manager (by default) be responsible for
assets checked out to the location.
2017-06-12 18:23:50 -05:00
snipe
966a736602
Patches #3640 to develop
2017-06-12 15:31:11 -07:00
Daniel Nemanic
30a9704625
Update UsersController.php ( #3640 )
...
If a user is disabled in your Active Directory, it should be deactivated in the licensing too.
The standard state is now deactivated for synced accounts.
Maybe we can change this throw a Setting for a standard state.
The codes comes from this site:
http://www.netvision.com/ad_useraccountcontrol.php
2017-06-12 15:29:55 -07:00
snipe
14f3868b46
Update all controllers to use laravel 5 return view method
2017-06-09 16:44:03 -07:00
snipe
a5cd4a0a22
Use updated view method for laravel 5
2017-06-09 16:31:25 -07:00
snipe
ad816264e9
WIP import mapper #3639
...
@dmeltzer, I’m not sure how much extra work this will be to integrate.
2017-06-09 16:29:42 -07:00
snipe
041b794e1f
Fixes #3634 - use new routes for groups
2017-06-08 20:24:26 -07:00
snipe
da2d9b2374
Fixes presenter issue on user history
2017-06-08 19:09:42 -07:00
snipe
58b2834c54
Fixed case for userloc
2017-06-08 18:46:07 -07:00
snipe
2aaa635345
Fixes crash on asset detail view
2017-06-08 18:26:55 -07:00
snipe
d62896f945
Fixes #3414 - bulk update for asset models
2017-06-08 17:48:48 -07:00
Wyatt
3e67cdc501
Allows a null location value for importing LDAP users ( #3598 )
...
* Allows a null location value for importing LDAP users
* Forgot you need to set the variable to null..
2017-06-01 21:20:40 -07:00
snipe
74aaadcdc5
Fixes #3583 - incorrect 404 status code, use curl for checking .env
2017-06-01 20:41:23 -07:00
snipe
25dca80644
Fixes #3602 - actions missing from suppliers in v4
2017-05-31 06:52:37 -07:00
snipe
7b1265cb89
Cache totals for later dashboard use
2017-05-31 02:02:55 -07:00
snipe
71b668e1a3
Removed extra else to make Codacy happy
2017-05-23 15:53:39 -07:00
snipe
8ab29c628f
Added icon to presenter
2017-05-23 14:31:44 -07:00
snipe
4ada5eaa94
Added targetType method
2017-05-23 14:31:14 -07:00
snipe
5499735f3a
Actionlogs API transformer
2017-05-23 14:31:04 -07:00
snipe
40e11b6661
Removed old getActivityReportDataTable() method, since we’re using the API now
2017-05-23 14:30:55 -07:00
snipe
b1fa25b73e
Added filter to report by user_id for activity
2017-05-23 14:30:29 -07:00
snipe
452c52a3ab
Changed variable name for consistency
2017-05-23 14:30:07 -07:00
snipe
52f24f7587
Reports API controller
2017-05-23 09:24:36 -07:00
snipe
f285bd3c29
Added Dept field to users table presenter
2017-05-23 02:49:51 -07:00
snipe
aeca549bab
Dept search in User query scopes
2017-05-23 02:49:27 -07:00
snipe
e0d2cbef20
Allow manager to be null for dept
2017-05-23 02:49:00 -07:00
snipe
96e8109d01
Allow location/company/manager to be null via validation
2017-05-23 02:48:51 -07:00
snipe
b223630f72
Added dept to User API transformer
2017-05-23 02:48:03 -07:00
snipe
e9c39add4f
Added dept helper reference in create/edit/bulk edit users
2017-05-23 02:47:49 -07:00
snipe
7ec1724308
Create, edit and destroy for depts
2017-05-23 02:47:25 -07:00
snipe
811ddd2f67
Include depts in returned list, sort by dept
2017-05-23 02:46:55 -07:00
snipe
cefb20d46f
Set dept manager ID for dept
2017-05-23 02:46:25 -07:00
snipe
bb323db685
Load relationships in query
2017-05-23 02:46:03 -07:00
snipe
eb3aa99e4f
Added destroy method to dept
2017-05-23 02:45:51 -07:00
snipe
a7592de304
Added helper for dept list
2017-05-23 02:37:37 -07:00
snipe
64f17cecbf
Updated department transformer
2017-05-23 02:37:30 -07:00
snipe
e2f2f9e154
Additional methods for Department web UI
2017-05-23 01:09:13 -07:00
snipe
8caf6623f1
Filter by dept for user display
2017-05-23 01:09:03 -07:00
snipe
6c623866c0
Additional API methods for departments
2017-05-23 01:08:55 -07:00
snipe
659e60fd12
Department controllers and transformer
2017-05-22 21:32:33 -07:00
snipe
ae329f4160
Department model
2017-05-22 21:32:22 -07:00
snipe
71fd430f8e
Fixes issue with older, deleted asset tags caching QR codes
2017-05-19 02:51:35 -07:00
snipe
0c43e64160
Licenses detail view
2017-05-18 22:10:45 -07:00
snipe
708385e23a
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-05-16 12:32:05 -07:00
Jason Spriggs
0ab37af7ab
Add in location parent and child information into API requests ( #3582 )
...
* Add location hierarchy to LocationsTransformer
* Add in parent_id
2017-05-16 12:30:11 -07:00
snipe
891660d4ea
Fixes #3580 - reduce minimim username size to 1
2017-05-16 12:26:38 -07:00
snipe
0c8308f5a4
Fixes for ordering on asset listing
2017-05-15 20:55:39 -07:00
snipe
fdd88af44a
Fixes #3556
2017-05-15 19:14:55 -07:00
snipe
c8796cf045
Only prompt for checkin if there is an assigned user
2017-05-10 03:37:30 -07:00
snipe
ee2c67a65f
Added missing logging back in
2017-05-09 15:30:45 -07:00
snipe
5614578710
Don’t make the item clickable if it’s been deleted
2017-05-09 15:30:19 -07:00
snipe
07882110fa
Cleanup dashboard controller
...
We ajax this data in now
2017-05-09 00:38:45 -07:00
Daniel Meltzer
82dc06ae19
Remove php7 feature ( #3548 )
...
...
2017-05-08 18:19:34 -07:00
Daniel Meltzer
38372f2b37
Remove php7 specific feature ( #3547 )
...
Not sure how this got in... I don't remember writing it (but I guess I did!)
2017-05-08 18:19:15 -07:00
Daniel Meltzer
e9b056f66c
Importer fixes v2 ( #3524 )
...
* Pave the imports table
* Format error response if file is the wrong type.
* If a custom field doesn't exist, don't insert a blank string into the custom fields table
* CustomField::db_column_name can return the stored name in the db. It's slugified when that value is set initially. This fixes a weird issue where _1 was replaced with _xx
2017-05-03 12:14:35 -07:00
snipe
841e3efe96
Add passport commands to boot() to allow us to call them via PHP
2017-04-27 07:09:46 -07:00
snipe
e088eea2f7
Pull out weird query scope that breaks stuff when querying large datasets
2017-04-26 22:40:20 -07:00
snipe
59a4e161ff
Fixes checkout buttons on licenses list
2017-04-24 21:37:20 -07:00
snipe
54a2c46101
Fixes #3491 - adds supplier info to assets listing
2017-04-22 19:14:28 -05:00
snipe
120c08b3a3
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-04-06 20:08:52 -07:00
snipe
e32d2f98b5
Added nameUrl presenters (for now)
2017-04-06 20:08:47 -07:00
snipe
aa354e883e
Removed erroneous comments
2017-04-06 20:08:38 -07:00
itsupportcmsukorg
89ba221765
fix upload hour so it's 24hr instead of always AM ( #3480 )
...
correct an error where logUpload was trying to save 12-hr time to a 24-hr field, e.g. 15:00 (3pm) was becoming 3:00 (3am)
2017-04-06 19:48:15 -07:00
Kasey
5663429280
applying PR #3456 changes to develop branch ( #3472 )
...
* updating with changes made to master
apply PR # 3456 to develop as well
* updating develop with changes made to master
apply PR # 3456 to develop as well
* updating paveit with passport-created oauth tables
2017-03-31 15:43:37 -07:00
Daniel Meltzer
1bb89db451
A few fixes ( #3437 )
...
* This method was renamed, so we need to rename the eager load
* Readd tinker to the composer dev packages.
* Update sql dump for functional tests.
2017-03-31 13:48:31 -07:00
Andrea Bergamasco
7ee172888d
/api_tests: Completed tests for basic CRUD for Assets and Components ( #3426 )
...
* Refactored AssetsTransformer
Casted all ids to int, escaped all text values,
* Added warranty_expires attribute to Asset model
$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.
* Ignoring php-cs cache files
* Restored asset tests expectations
Work in progress - tests still fail
* API controller refactoring, fixed HTTP status codes in responses
* Restored $request->get - debugging
* Added further checks in ApiAssetsCest::updateAssetWithPatch
* /api_tests: Fixed bugs in update() method + code formatting
* /api_tests: Minor code formatting
* /api_tests: Mirrored test code for PATCH and PUT methods
* Removed repeated code
* Test cleanup
* Fixed issues with update() through PATCH and PUT methods
* Added API test suite to .travis.yml
2017-03-31 13:48:11 -07:00
Andrea Bergamasco
99cc8293ef
Fixed undefined metod in unit/PermissionTest ( #3422 )
...
* Refactored AssetsTransformer
Casted all ids to int, escaped all text values,
* Added warranty_expires attribute to Asset model
$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.
* Ignoring php-cs cache files
* Restored asset tests expectations
Work in progress - tests still fail
* API controller refactoring, fixed HTTP status codes in responses
* Restored $request->get - debugging
* Added further checks in ApiAssetsCest::updateAssetWithPatch
* Fixed undefined method
* Fixed initial underscore trimmed by str_slug
* CustomFieldTest now works where intl PHP extension is not installed
If a server doesn't have the intl php extension installed, the custom fields tests failed. Now the tests perform the same check done in the CustomField class.
2017-03-14 08:39:03 -07:00
Andrea Bergamasco
e03ebc3fd0
AssetTransformer refactoring, restored tests ( #3407 )
...
* Refactored AssetsTransformer
Casted all ids to int, escaped all text values,
* Added warranty_expires attribute to Asset model
$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.
* Ignoring php-cs cache files
* Restored asset tests expectations
Work in progress - tests still fail
* API controller refactoring, fixed HTTP status codes in responses
* Restored $request->get - debugging
* Added further checks in ApiAssetsCest::updateAssetWithPatch
2017-03-14 08:37:39 -07:00
snipe
6f269e18fe
Remove useless validation for custom CSS
2017-03-11 15:34:54 -08:00
snipe
c8c5c05351
Added asset checkin/checkout API methods
2017-03-11 14:04:52 -08:00
snipe
8dbd9fb299
Added additional permissions for checkin/checkout buttons
2017-03-11 12:14:10 -08:00
snipe
00aa06882c
Fixed incorrect route for components
2017-03-11 12:13:35 -08:00
snipe
742e3d044e
API improvements
...
Components still need some work here
2017-03-11 10:05:50 -08:00
snipe
ae6828a0fa
Removed dumb code comment
2017-03-11 08:03:30 -08:00
snipe
2a4bf65883
Basic sanity checking on some of the API controllers
2017-03-11 08:03:16 -08:00
snipe
4e81b97145
Toggle visibility of fields in categories presenter
2017-03-11 05:30:14 -08:00
snipe
a680541fe8
Fixed target variable
2017-03-11 05:17:02 -08:00
snipe
b51b51b949
Removed logging
2017-03-11 04:49:14 -08:00
snipe
5b450c5978
Disambiguated company_id in assets api controller
2017-03-11 04:39:28 -08:00
snipe
875d0dd343
Added advanced search to assets
2017-03-11 04:26:01 -08:00
snipe
b16ff263ec
Addtional search filters for licenses API
2017-03-11 02:57:19 -08:00
snipe
bb2b6cb642
Foxed license name in licenses API
2017-03-11 02:52:50 -08:00
snipe
d799ab2a9c
Narrowed down the accessories, consumables, etc APIs for manufacturer filtering
2017-03-11 02:49:24 -08:00
snipe
5803af7409
Use date display formatter on licenses
2017-03-10 22:09:35 -08:00
snipe
caf2f648b1
Added updated/created to locations API
2017-03-10 22:09:21 -08:00
snipe
c132036f5c
Fixes #3311 - more fields for manufacturers
2017-03-10 22:08:59 -08:00
snipe
1682867d02
Added employee number back into user listings
2017-03-10 20:58:09 -08:00
snipe
da66eecd74
Allow string as employee number
2017-03-10 20:57:57 -08:00
snipe
ad510cecd5
Fixes #2422 - Adds bulk edit for select user attributes
2017-03-10 20:07:44 -08:00
snipe
01ae8802c1
Fix user export
2017-03-03 19:54:06 -08:00
snipe
51fccbdda4
Added last login to user menu
2017-03-03 18:28:13 -08:00
snipe
2b4443f810
Fixed user created at in listing
2017-03-03 18:16:23 -08:00
snipe
6a2fd74219
Fixed API gate names in tranformers for new, more granular admin stuff
2017-03-03 17:56:05 -08:00
snipe
097096aa24
More custom date display via API
2017-03-03 17:53:42 -08:00
snipe
4f1669189e
Try to make the select all checkbox work for users.
...
Not sure where/how this broke?
2017-03-03 17:30:37 -08:00
snipe
3c53ff9329
Set protected date formats
2017-03-03 17:30:19 -08:00
snipe
dc38e575d9
Allow date/time formatting selection in settings
2017-03-03 17:29:41 -08:00
snipe
c6c3ddba3e
Remove detail() presenter
2017-02-23 17:01:01 -08:00
snipe
ce2babcafb
Fixed name display in transformer for asset listing
2017-02-23 17:00:50 -08:00
Andrea Bergamasco
c0c02eebd2
REST API - Refactoring of routes file, more tests added ( #3345 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added personal-access-token component
* Created basic API testing configuration
* First version of /components endpoind cest
* On-the-fly bearer token generation
* Completed testing of PATCH and PUT methods
* Added /components/{id}/assets route with tests
* Updated route and dataTable in view
* Completed test assertion
* Added links to assets in ComponentsAssets view
* Linked Company in AssetView page
* Fixed purchase_cost format expectation in ApiComponentsCest
* Refactored api routes file
Sorted all prefixes in alphabetical order, removed duplicate routes. For every prefix I placed first Route::resource and then any additional route in a Route::group. Expanded arrays for readability and consistency. Removed useless calls as create and edit everywhere.
* Refactored and added one more test to ApiComponentsAssetsCest
* Marked one test as incomplete, 404 response should return json
* Fixed value expectation
* Refactored getToken()
* Added API debugging routes
* Added more information to ValidationException reporting
Now the payload contains the validation errors for each invalid
attribute.
* /apitests: refactored expectations in component assertions
* Created ApiAssetsCest
* /apitests: Cleanup in Exceptions/Handler
* Reverted change to use
* Marked two tests as incomplete, looking for solutions
2017-02-23 16:32:35 -08:00
snipe
9ccaad8b9c
Added created_at and modified_at to asset listing/api
2017-02-23 16:23:02 -08:00
snipe
9e7f998df5
Add model_number to accessory search
2017-02-22 22:55:20 -08:00
Andrea Bergamasco
e7f7d739ed
Bugfixes based on functional tests ( #3338 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added personal-access-token component
* Created basic API testing configuration
* First version of /components endpoind cest
* On-the-fly bearer token generation
* Completed testing of PATCH and PUT methods
* Added /components/{id}/assets route with tests
* Updated route and dataTable in view
* Completed test assertion
* Added links to assets in ComponentsAssets view
* Linked Company in AssetView page
* Bugfixes based on functional tests
* Removed unused function
* Marked tests as incomplete
* Added check for existence in groups/edit.blade.php
2017-02-22 22:49:19 -08:00
Daniel Meltzer
ad9470b6f8
Assorted fixed ( #3332 )
...
* Better error handling of failed file uploads. Also improve formatting of modal dialog
* Readd app.js to the js build, fixes collapsing sidebar
* Update JS
* Fix font size. We need to explicitly set the font size for the table because everywhere else that comes from bootstrap-tables
2017-02-22 22:49:06 -08:00
snipe
f7e4fca70d
Add model_number to accessory search
2017-02-22 22:34:56 -08:00
snipe
8c20c2bd39
Fixed Illuminate path
2017-02-22 22:20:57 -08:00
snipe
904be03ffd
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-02-22 22:20:32 -08:00
snipe
53ba2bbb4e
Updated method for eager loading assets
2017-02-21 15:39:59 -08:00
snipe
2c6f323820
Increase max EOL
2017-02-21 15:39:46 -08:00
snipe
f520eaa6ce
Increase max depreciation months
2017-02-21 15:39:39 -08:00
Andrea Bergamasco
fde46251de
Components Assets view + stubbed API tests ( #3325 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added personal-access-token component
* Created basic API testing configuration
* First version of /components endpoind cest
* On-the-fly bearer token generation
* Completed testing of PATCH and PUT methods
* Added /components/{id}/assets route with tests
* Updated route and dataTable in view
* Completed test assertion
* Added links to assets in ComponentsAssets view
* Linked Company in AssetView page
2017-02-21 14:26:46 -08:00
snipe
edf36cd850
Sigh.
2017-02-17 18:30:48 -08:00
snipe
a710c98b50
Set string length because laravel is dumb sometimes
2017-02-17 18:26:53 -08:00
snipe
8fe8ff71e8
Category improvements
2017-02-16 00:32:33 -08:00
snipe
c67b44b3d5
Moving license index to new API format
2017-02-10 18:43:30 -08:00
snipe
74c5c55838
Removed outdated comment
2017-02-08 18:25:06 -08:00
snipe
eea90dda78
Added Gate integration into API transformers
2017-02-08 18:24:55 -08:00
snipe
2892e32095
Set visible to true for checkin/checkout buttons
2017-02-08 18:20:44 -08:00
snipe
8cce1a3882
Fixed users formatter method
2017-02-08 18:20:23 -08:00
snipe
86198badbb
Added more company_id filtering, more transformers
2017-02-08 08:48:41 -08:00
snipe
72ec362f72
Search on status label type
2017-02-08 03:37:44 -08:00
snipe
4cf01e4f48
Added ability to search by company_id and location_id
2017-02-08 03:31:42 -08:00
snipe
6d40a98a16
User assets presenter for column headers
2017-02-06 18:49:08 -08:00
snipe
584e2ba618
Added a space
2017-02-06 18:47:54 -08:00
snipe
1751a8c0e0
Switched to presented for ugly BS table column headers
2017-02-03 22:20:11 -08:00
snipe
d37b9fe169
Use hardrware listing for status labels detail link
2017-02-03 20:34:09 -08:00
snipe
98e0ecbd88
Added manufacturer sorting on models
2017-02-03 20:20:03 -08:00
snipe
9cae6066a0
Added asset by manufacturer listing
2017-02-03 19:52:00 -08:00
snipe
f1c4aed5b5
Removed additional groups API fields
2017-02-03 19:35:22 -08:00
snipe
1e2a23e955
Use main assets API to pull view pages for assets listings
2017-02-03 19:34:24 -08:00
snipe
bb4c443cd9
Added notes to custom report
2017-02-03 02:20:56 -08:00
snipe
729b709de2
Include notes in custom asset report
2017-02-03 02:16:37 -08:00
snipe
f1592aa63f
Tighter asset API responses, sanitization
2017-02-03 02:04:17 -08:00
snipe
6c1a827ed0
Added warranty info to listing
2017-02-03 01:45:12 -08:00
snipe
d19cc9d9c1
Added legacy redirector
2017-02-02 18:14:25 -08:00
snipe
12c5ca67ff
Pulled accidental debugging exit
2017-02-01 18:56:47 -08:00
snipe
541a5e6776
Groups API starter
...
Edit/Create still broken for some reason
2017-02-01 18:50:28 -08:00
snipe
464c524375
Depreciations API
2017-02-01 17:59:03 -08:00
snipe
7086ac8a8b
Tweaks to status labelas listing display
2017-02-01 17:48:28 -08:00
snipe
a80af854ba
Switch companyName to company
2017-01-26 21:05:33 -08:00
snipe
99d837fa50
Added API methods and UI to view assets associated with a particular model
2017-01-26 21:02:59 -08:00
snipe
8d50bb19af
Switched to route from redirect->to
2017-01-26 20:13:59 -08:00
snipe
ec7e89ecb8
Added Helper
2017-01-26 20:08:15 -08:00
snipe
377cb8e5d1
Use Locations transformer for location API
2017-01-26 20:08:06 -08:00
snipe
c7003897ae
Fixed Locations transformer for assigned assets
2017-01-26 20:07:46 -08:00
snipe
231f4dce07
Basic components API
2017-01-26 19:16:06 -08:00
snipe
5e9e6da577
Basic consumables API
2017-01-26 18:46:18 -08:00
snipe
9ac9c6f1bc
Updated convertUnicodeDbSlug to use Patchwork if intl isn’t installed
2017-01-26 04:59:14 -08:00
snipe
b4c6d0c897
Added optional help text field to custom fields
2017-01-26 04:52:11 -08:00
snipe
cbff2ec57d
Removed log comment
2017-01-25 22:29:05 -08:00
Daniel Meltzer
5ba2ec881c
Vue importer ( #3235 )
...
* Begin work on vueifying the importer
* Beginning work on migrating the importer to use a vue/components for future interactivity
Update JS
More importer work. Move to a vue based modal, begin handling of processing. Still need to port error messages.
More importer work. Move to a vue based modal, begin handling of processing. Still need to port error messages.
Update importer. Add error display. Fix modal, update vue-strap to vue2
More progress. Add select2 vue bits.
* Move to querying the db to find importer matches. It scales better on large datasets.
Fix select2 related issues. We were trying to initialize it twice, which led to the custom data being overwritten.
* Better error handling on uploads and deletion of files. Restore progressbar on upload.
* Add support for generic exception reporting if app.debug is enabled.
* Handle Http 500 errors better. Display errors if debug is enabled. Assorted cleanups.
* Fix codacy issues, remove unused methods.
* Only bind vue to the importer for now.
* Load vue for passport as well.
2017-01-25 21:29:23 -08:00
snipe
a9bf34cf61
Minor transformer cleanup
2017-01-25 21:01:00 -08:00
snipe
855d775c41
Fix fieldset blade path
2017-01-25 18:39:45 -08:00
snipe
dc47a0fad6
Fixes #2551 - use UTF-8 safe slugging for MySQL columns
2017-01-25 18:38:20 -08:00
snipe
2a7469d898
Fix uniqueness issue on saving edited fields
2017-01-25 04:52:47 -08:00
snipe
b1a80f8ed8
Fixes #1684 - Allow editing of custom fields
...
@uberbrady can finally get out of the sea
2017-01-25 04:34:11 -08:00
snipe
af211c1203
Remove unused method
2017-01-25 03:10:44 -08:00
snipe
ed7e967f4a
Helper cleanup, slug helper
2017-01-25 03:10:35 -08:00
snipe
80da0f801c
Fixes #2921 - use toUTF8 instead of fixUTF8
2017-01-25 03:10:18 -08:00
snipe
5f49e7c1a7
Accessories API routes
...
Still a bit of a WIP
2017-01-25 02:19:26 -08:00
snipe
75d35273c9
Pull image formatter out of dynamic loop, pass full url to formatter
2017-01-24 22:46:07 -08:00
snipe
04bb180a80
More bootstrap tables formatting
2017-01-24 22:25:17 -08:00
snipe
8f12486f6c
More generic javascript formatters, updated api routes
2017-01-24 21:04:38 -08:00
snipe
c907414e71
Added escaping
2017-01-24 19:24:47 -08:00
snipe
e4e4e6ae47
Licenses transformer for API
2017-01-24 18:57:33 -08:00
snipe
afacee90ae
Fixed variable for transformer
2017-01-24 18:57:21 -08:00
snipe
ebe3f58805
Added missing manufacturer data on save
2017-01-24 18:57:03 -08:00
snipe
88faefe1ed
Licenses listing index API
2017-01-24 18:56:27 -08:00
snipe
8f0ab1e719
Fixed weird status code error on ajax
2017-01-24 18:56:15 -08:00
snipe
b019e6e950
Removed closures from routes files so that we can allow people to cache routes for performance optimization
2017-01-24 17:37:07 -08:00
snipe
d0f062458e
Additional API transformers, formatters
2017-01-24 17:07:00 -08:00
snipe
ad4bf83aaa
Add ability to view assets by status label
...
This should be refactored. Lots of copypaste from the assets views here
2017-01-18 20:41:40 -08:00
snipe
ea3d45882d
Fix bulk actions with new bootstrap tables checkboxes
2017-01-18 19:38:42 -08:00
snipe
297034c037
APIified custom fields reorder
2017-01-18 04:58:56 -08:00
snipe
7b1d2ee050
Fixed typo
2017-01-17 11:57:24 -08:00
snipe
b3f70a046f
Don’t require superadmin for checkin and delete user
2017-01-17 09:19:14 -08:00
snipe
39b4725114
Load assigneruser relationship
2017-01-13 22:17:20 -08:00
snipe
f642013774
Check for validity before trying to display relation data
2017-01-13 22:06:12 -08:00
snipe
ba71122449
Removed old datatable method from Locations
2017-01-13 21:00:25 -08:00
snipe
2879114fe9
Misc API cleanup for assets
2017-01-13 11:41:00 -08:00
snipe
b968839a1d
Pull out extraneous use statements
2017-01-13 11:38:25 -08:00
snipe
89edda2c23
Manufacturers API
2017-01-13 09:37:06 -08:00
snipe
73eee1b7b1
Derp. Really check for valid category_type in Category model now
2017-01-13 09:28:08 -08:00
snipe
213a234bef
Check for valid category types in validation
2017-01-13 09:27:32 -08:00
snipe
14ddcc56a2
Categories API
2017-01-13 09:01:10 -08:00
snipe
edca6ad19d
Make eol, notes sortable on asset model
2017-01-13 08:41:17 -08:00
snipe
ae540af2a9
Additional fields for asset models
2017-01-13 08:39:02 -08:00
snipe
34f427920b
Removed legacy getDataTable method from status labels
2017-01-13 08:18:37 -08:00
snipe
e7a243f8bc
Added search, sorting to assetmodels
2017-01-13 08:18:22 -08:00
snipe
66f724cd35
Added created_at to status labels for consistency
2017-01-13 07:55:03 -08:00
snipe
b423fa3bd4
Added sorting, searching, etc to status labels index
2017-01-13 07:47:39 -08:00
snipe
295744be64
Added searching, sorting, etc to locations API
2017-01-13 07:40:08 -08:00
snipe
fbbf5e77b4
Make sure the category and manufacturer ids exist
2017-01-13 07:14:32 -08:00
snipe
c7e1b426e7
Additional API routes and controllers for models, suppliers, users, locations and status labels
2017-01-13 04:50:20 -08:00
snipe
bc5fcf8736
Fixed dashboard chart
2017-01-13 03:19:39 -08:00
snipe
06d66f6e94
Fixed formatting
2017-01-13 01:45:14 -08:00
snipe
f9a501d774
Fixed array name
2017-01-13 01:44:47 -08:00
snipe
f54fcb88e2
Fixed formatting
2017-01-13 01:43:51 -08:00
snipe
58b1ac5f0f
Some route/transformer edits
2017-01-13 00:13:57 -08:00
snipe
d2f84a2329
Added some hidden fields
2017-01-13 00:12:26 -08:00
snipe
4f35c8af3e
Docblock edits
2017-01-12 23:43:45 -08:00
snipe
fbd6dcbfbb
Fixed path to query builder in docblocks
2017-01-12 23:42:59 -08:00
snipe
9c41881d99
Use transformers for API response
...
This is experimental
2017-01-12 23:42:39 -08:00
snipe
f52680b971
Masde response formatting a little nicer
2017-01-12 23:41:45 -08:00
snipe
6d7c226acd
Experimental transformers
2017-01-12 23:40:35 -08:00
snipe
2f43f78e62
Validated category_id on accessories, name model_number fillable
2017-01-12 19:40:42 -08:00
snipe
b11a951e95
Starter API controllers
2017-01-12 19:40:20 -08:00
snipe
ed325d2fe5
Let whatever the other error is fall through
2017-01-12 19:38:40 -08:00
snipe
3c6010679a
Nicer handler for JSON model not found errors
2017-01-12 19:06:39 -08:00
snipe
d9d048f90d
Fixed #2303 - redirect correctly after login
2017-01-12 07:09:44 -08:00
snipe
b7a650e986
Switched ordering of status labels and status label types to more user-friednly config
2017-01-12 06:50:54 -08:00
snipe
534e40feb8
Fixed bad fieldset call
2017-01-12 03:55:54 -08:00
snipe
a283b13069
Handled bad model id
2017-01-12 03:53:52 -08:00
snipe
41b864cc49
Added update method for assets
2017-01-12 03:48:18 -08:00
snipe
03874a5481
Validate asset model and status on the model level
2017-01-12 03:47:45 -08:00
snipe
7d2d6a3c1b
Removed unused use statements
2017-01-12 02:53:43 -08:00
snipe
29b5678a8d
Format destroy responses
2017-01-12 02:50:55 -08:00
snipe
93542f3478
Make sure the model_id and status_id actually exist
2017-01-12 02:41:02 -08:00
snipe
fddcc0fefd
Added better form request handling
...
This will break a ton of things
2017-01-12 02:20:20 -08:00
snipe
15373d5f4a
Fixed a few asset API issues
2017-01-12 02:19:55 -08:00
snipe
704ee59541
WTF why is name required??
2017-01-12 02:19:36 -08:00
snipe
5a848566f9
Helper method to standardize JSON responses
2017-01-12 02:19:17 -08:00
snipe
268308004c
Fixed number of results returned
2017-01-11 23:45:03 -08:00
snipe
0cf4014b75
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-01-11 23:41:02 -08:00
snipe
95f2d94e01
Added create/destroy methods for asset API
2017-01-11 23:40:56 -08:00
Richard Hofman
c506f30562
Add support for location-specific LDAP OUs. ( #3176 )
...
* Add support for location-specific LDAP OUs.
* Shortened variable names as suggested by Codacy review.
2017-01-11 23:37:14 -08:00
snipe
2c695cf7e5
404 JSON response if the asset is not found
...
(Brady and I will argue about this forever)
2017-01-11 19:12:25 -08:00
snipe
74696d5ded
View asset API
2017-01-11 19:00:34 -08:00
snipe
7a124e85d6
Cleaned up unused use statements
2017-01-11 18:26:05 -08:00
snipe
b8d81c0734
Added order_number to presenter
2017-01-11 18:25:53 -08:00
snipe
900e6e2419
Starter asset API
2017-01-11 18:14:06 -08:00
snipe
15bab7fa9e
Test Auth::guard('api')->user() as user_id
2017-01-11 14:55:04 -08:00
snipe
9e4a391b8b
Updated auth:api in kernel
2017-01-11 14:54:11 -08:00
snipe
c08fe196c4
Fix api middleware call
2017-01-11 14:50:38 -08:00
snipe
93a087b29a
Set longer token expiration
2017-01-11 14:50:26 -08:00
snipe
4590054c75
Fixed path in comments
2017-01-11 14:50:13 -08:00
snipe
80e047f679
Removed poop
2017-01-11 14:45:47 -08:00
Daniel Meltzer
9bbfb64f17
Add a use declaration to Userscontroller to prevent assigning the wrong item_type. Should fix/prevent #3160 ( #3168 )
2017-01-11 04:27:05 -08:00
snipe
b5ddd9ab0a
More vue/api work
2017-01-11 03:38:55 -08:00
snipe
b7bbc44052
Removed unneeded use statement
2017-01-10 23:21:47 -08:00
Daniel Meltzer
44683c784f
Importer: Add License Importer and refactor ( #3143 )
...
* Major code simplification of the importers.
Move towards using Model::fill and Model::update rather than reinventing
the wheel. This makes the updating/creating logic a lot clearer, and
allows for the deletion of a lot of code. Also allows for supporting of
more fields in the future really easily.
* Cleanup constructors and use setters instead.
* Set the LC_MONETARY locale, and use it to strip currency symbols in Helper::parseFloat()
* Move licenseseat creation/deletion logic into an event handler on the model rather than the controller.
* Move the logging of parsed values to array_smart_fetch rather than writing it out everywhere
* Move to storing dates as carbon rather than strings. Allows for the parsing of more arbitrary strings from the importer
* Add a license importer with support for checking out to users or assets.
* Make a directory for sample/mock import csvs and populate it
* Adjust how we store/retrieve dates to fix some issues the tests found.
2017-01-10 16:19:18 -08:00
snipe
57d2b88900
Remove number formatting
2017-01-06 03:14:32 -08:00
snipe
9fd3a9a82d
Removed logging
2017-01-06 03:12:49 -08:00
snipe
a6e6991a2d
Removed second number_format
2017-01-06 03:11:27 -08:00
snipe
93ba0717d8
Removed number_format
2017-01-06 03:02:38 -08:00
snipe
208ccab4c1
Fixes #3104 , #2914 and #2918 - auto-increment incorrectly generating next ID
2017-01-06 02:54:06 -08:00
snipe
a8839e0ef4
Fixes #3104 , #2914 and #2918 - auto-increment incorrectly generating next ID
2017-01-06 02:52:10 -08:00
snipe
1bf34d73f5
Use correct authorize rule in middleware for user delete
2017-01-06 00:02:46 -08:00
snipe
d1e360d64d
Fix logic to use gate instead of asking if superuser
2017-01-06 00:02:19 -08:00
Daniel Meltzer
6ce20c32b1
Component Importer and various Importer Fixes ( #3132 )
...
* Importer fix: we were trimming the wrong part of the classname when creating a category. This led to categories not being recognized.
* Add a component importer. Uses same fields as consumable importer. Only trick: If an asset_tag is present, we checkout a component to that asset on import
Enable component importer. Also calculate the importer classname in a cleaner fashion.
* Fix comparisons. find can return an index of 0, which is falsy.
2017-01-05 15:45:12 -08:00
Daniel Meltzer
816d2fd095
More minor fixes ( #3126 )
...
* Update composer phpcs
* Minor Fixes found while working.
ALlow user_id to be nullable in category model validation
Point to the correct route in accessoriespresenter datatable. Also add name() method
Add a translated category name
Fix typo in translation
* Add a method to the asset presenter to show deployed when asset is deployed. Fixes #3114
2017-01-03 16:55:43 -08:00
Bob Clough
f999c797e5
Allow a license to be pre-checked-out to an asset. ( #3124 )
...
Some licenses, such as windows licenses, are machine specific. This
commit allows an extra field to be added to the license importer to
allow these licenses to be imported and attached directly to an asset
2017-01-03 16:55:21 -08:00
Daniel Meltzer
3a6bbcc615
More improvements ( #3116 )
...
* Restore display of deleted items in the logs
* Fix functional tests.
2016-12-30 11:44:47 -08:00
Daniel Meltzer
8a782bf34a
Present assetlogs ( #3112 )
...
* Set user if asset is checked out to user. fixes email problems.
* Use sometimes validation to ignore this when no values are present.
* Move Actionlog details to a presenter and port the activity table to use it. Still need to port other parts of the application, but this consolidates a lot of logic.
* Attempt test fix
* Port users,licenses, and assets view to use the presenter to generate table values.
2016-12-29 22:23:36 -08:00
snipe
6029bea2de
Fixed error if user not set
2016-12-29 18:19:08 -08:00
Daniel Meltzer
4ad9c3623e
Show a glyph in the assets datatable. ( #3111 )
2016-12-29 18:12:27 -08:00
snipe
199fdf39ec
Merge branch 'dmeltzer-checkout-to-things-v1' into develop
2016-12-29 16:20:37 -08:00
snipe
221cf1f9c8
Merge branch 'checkout-to-things-v1' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-things-v1
...
# Conflicts:
# app/Http/Controllers/AssetsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/UsersController.php
# app/Presenters/AssetPresenter.php
2016-12-29 16:20:17 -08:00
Daniel Meltzer
ce8eda1325
Fix some accessory sorting ( #3108 )
...
Fixes at least some of #3045
2016-12-29 15:50:18 -08:00
