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
943cf40247
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-12-06 13:14:31 -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
snipe
91bb76fd8a
Bumped version
2019-12-06 13:05:20 -08:00
snipe
893454dca7
Updated translations
2019-12-06 12:03:04 -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
snipe
de0b5a6149
Fixes #6440 - quote marks in the right place
2019-12-06 11:04:16 -08:00
Dustin B
8fd4e35244
Closes #6440 Print All Assigned - New Tab ( #7135 )
...
Should add the functionality to, by default open in a new tab and not reference back to the source page. Reduces overhead and should resolve #6440 .
Untested, need confirmation.
2019-12-06 11:00:01 -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
3f5840d390
Bumped vendor files
2019-12-05 19:53:01 -08:00
dependabot[bot]
d3f4205f09
Bump symfony/http-foundation from 3.4.30 to 3.4.36 ( #7638 )
...
Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation ) from 3.4.30 to 3.4.36.
- [Release notes](https://github.com/symfony/http-foundation/releases )
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/symfony/http-foundation/compare/v3.4.30...v3.4.36 )
Signed-off-by: dependabot[bot] <support@github.com>
2019-12-05 19:37:00 -08:00
Godfrey Martinez
5b946087c4
added a proper response for password errors ( #7636 )
2019-12-05 17:49:56 -08:00
snipe
9a2378586c
Added new data directory for Laravel 5.7 upgrade
2019-12-04 17:06:15 -08:00
snipe
e820d4bc4d
Moved js/css/less out of resources/assets
...
Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
snipe
8e3e48da14
New composer lock with slack library edits
2019-12-04 16:48:19 -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
7f8f1ff35a
Specifically require slack notification channel for laravel 5.8 upgrade
2019-12-04 15:56:45 -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
d8049209ca
Fixed bug where deleted consumable would throw an error on print page
2019-11-21 21:43:54 -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
38ed73a2b4
Bumped to Laravel 5.8
2019-11-18 21:17:36 -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
70c8ad9797
Bumped minor version
2019-10-28 13:55:21 -07: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
4159a0effa
Bumped version
2019-09-03 14:12:13 -07:00
