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
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
ba197c8857
Fixed #7259 - upgraded phpdocumentor/reflection-docblock to v4
2019-08-15 03:02:24 -07:00
snipe
124b249df4
Fixed #7289 - git fetch before checkout in upgrade.php
2019-08-15 01:32:20 -07:00
snipe
2a6919c438
Fixed #7321 - added link to Helm Chart repo
2019-08-15 01:07:30 -07:00
snipe
60bb385cf7
Make status label required
2019-08-14 23:46:09 -07:00
snipe
47724d7268
Make error text color match
2019-08-14 23:46:00 -07:00
snipe
c9f9a60354
Fixed asset tag error message alignment
2019-08-14 23:28:01 -07:00
snipe
da52511bf9
Use asset tags
2019-08-14 23:13:23 -07:00
snipe
7899d2284c
Fixed parse error in API routes
2019-08-14 22:33:56 -07:00
snipe
c5e6f06e9b
Revert import history to master version to fix errors
2019-08-14 22:27:17 -07:00
