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
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
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
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