snipe
891b5b2882
Added routes, language
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 15:45:25 -07:00
snipe
0b2ce7be07
Fixed #11521 - switch to using status meta from status label name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 03:48:58 -07:00
snipe
08bab4f101
Fixed #11889 - API route for status labels asset listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 00:50:07 -07:00
snipe
fb2fe61daf
Use a less stupid URL for this endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:03:26 -07:00
snipe
e79a819724
Fixed inconsistency in naming
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 17:45:39 -07:00
snipe
af7ccf3beb
Handle logout route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:17:40 -07:00
snipe
3e48f436af
Handled user route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:13:30 -07:00
snipe
5e488bd81f
Handle components route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:10:39 -07:00
snipe
53ff28d2b0
Handle consumables route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:07:56 -07:00
snipe
4a4636bd03
Handle accessories route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:06:28 -07:00
snipe
744d0d299e
Handle model route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:03:45 -07:00
snipe
b035003546
Handled hardware route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 15:59:54 -07:00
Godfrey M
377c0e7075
fixes component routes
2022-07-20 13:41:35 -07:00
Godfrey M
0c4c4fc352
changes api checkin and checkout routes to post
2022-07-20 11:52:54 -07:00
snipe
af14ee0d47
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working
...
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
2022-07-02 13:07:29 -07:00
Mike Roquemore
6e9f24c08f
Change restore route to POST instead of GET
2022-07-02 14:34:23 -05:00
Mike Roquemore
1650c9f878
Remove duplicate users routes
2022-07-02 14:34:22 -05:00
Mike Roquemore
123963c14c
Modify genericActionsFormatter restore link to be a button instead since it's in a form.
...
Changed user restore route to POST
2022-07-02 14:34:22 -05:00
Nathan Butler
0617480f73
Asset checkinbytag now consistent with existingAPI
...
This is a non-breaking change to the checkinbytag endpoint to bring it
inline with the usage/formatting of the other bytag endpoints that
currently exist - using the URL path to define the asset_tag instead of
passing it through as a url query.
Both methods will work, but the URL Path method will take precidence if
it is used (the query will be ignored if included)
2022-06-30 09:23:52 +10:00
Godfrey M
e471aa8639
adds button to email user list of assets from profile
2022-06-29 11:15:15 -07:00
snipe
5af6330398
Merge pull request #11417 from ntbutler-nbcs/master
...
[Feature] - Add checkoutByTag API endpoint for assets
2022-06-29 05:03:01 -07:00
snipe
5b02d9ed06
Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/account/accept/create.blade.php
2022-06-29 04:58:13 -07:00
snipe
1debdc47cf
Backups endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:30:17 -07:00
Nathan Butler
67e9b7795a
Added asset checkoutByTag API endpoint
2022-06-29 16:11:57 +10:00
snipe
dc27d3bec9
Change to plural endpoints
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:10:40 -07:00
snipe
413487de80
Made method naming consistent
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 21:32:12 -07:00
snipe
1158fa9ea8
Added personal access tokens to api
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 21:29:15 -07:00
snipe
c90ed9f25f
Allow models uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 15:50:07 -07:00
snipe
5c30de517d
Use rate limiter for API calls
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 09:11:40 -07:00
snipe
a7dc6162fa
Simplify password attempts rate limiting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 09:11:24 -07:00
snipe
b00db3cc56
Added throttling to password reset token form
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:30:11 -07:00
snipe
172e8d463f
Use newer forgotten password variables
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:11:57 -07:00
snipe
17ee332715
Remove throttle from GET in password reset
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:53:14 -07:00
snipe
386272a618
Manually add the additional routes so we can throttle them
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:40:53 -07:00
snipe
cce5846018
Squashed commit of the following:
...
commit a070f7cd5e166f526304c1104147#11291 from snipe/fixes/regression_missing_restore_command
Fixed regression: missing restore option for assets via API
commit 4c11041477
2022-06-09 17:23:50 -07:00
snipe
93eba43b76
Removed trailing slash from route
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
344dcc10c1
Fixed #11141 - accessories endpoint missing from API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 01:04:50 -07:00
Johnson Yi
4401dab8d6
fix saml slo for logout
2022-05-14 11:59:34 +00:00
snipe
1424e168d6
Switch logout back to post
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:30:11 -07:00
snipe
bda5d13c2b
Fixed route name for appending models to kit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:26:01 -07:00
snipe
7c82f5670b
One more 2FA login change
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 12:48:55 -07:00
snipe
32bbe7c715
Fixed 2FA middleware
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 12:45:54 -07:00
Brady Wetherington
6756dd193e
SCIM integration using the 're-do-the routes' approach, which seems like a dead-end
...
Cleaning up routes to match laravel-scim-server's recommended implementation
Some actually *working* changes for SCIM support?!
Whoops, forgot my route file
Fix public SCIM routes
Removed Ziggy, removed old generated file, yanked Ziggy references
Resolves the first set of comments for SCIM
Ensure all /api routes have baseUrl prepended
Fix the parent:: call to be, uh, actually correct :P
Clarify the route-ordering, as it is quite tricky
This gets it so that users can actually be saved..
Work around the lack of callbacks with some inheritance
Mapped a bunch more fields from SCIM into Snipe-IT's user table
More baseUrl shenanigans since we yanked Ziggy :/
Properly map job title and work with some other necessary attributes
Map more fields...
Finalized basic mapping for core and enterprise namespaces
Latest tuned settings for SCIM config to work with Azure (and others)
2022-04-05 20:26:37 +01:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
Godfrey M
5fcc3c39f3
routes eula agreements for download correctly to the asset history
2022-03-16 11:56:56 -07:00
Godfrey M
e1a6a2afc6
adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet
2022-03-10 12:15:50 -08:00
Godfrey M
59c583ac74
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
2022-03-08 16:42:27 -08:00
snipe
0c520476a3
Removed namespace
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 12:30:47 -08:00
snipe
ba010618f7
Throttle got merged out - re-adding it
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 12:15:09 -08:00
Dampfklon
0d49fc3a2e
remove unused route, controller functions and view
2022-02-13 12:10:19 +01:00
Ivan Nieto Vivanco
b4d2b1322f
Pass ID of the checkin/checkout assets in API
2022-02-07 13:43:13 -06:00
snipe
ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin
...
Added #10454 : Quick Scan Checkin
2022-02-01 20:19:45 -08:00
TenOfTens
70eeafd2a3
Update api.php
...
Typo at line 391 GroupsCOntroller to GroupsController. Was causing an error with the groups view not reflecting the actual groups seen from the database.
2022-02-01 08:51:34 -06:00
Ivan Nieto Vivanco
fcd203f4dc
Fix the route to associate custom fields with fieldsets
2022-01-26 14:43:20 -06:00
Ivan Nieto Vivanco
92b3576395
Fixes a route definition to correctly populate the deprecation report
2022-01-15 12:02:43 -06:00
Ivan Nieto Vivanco
d5f6f6cafe
Fixes duplicate API endpoint that returns fieldsets instead of customfields
2022-01-15 03:46:28 -06:00
Brady Wetherington
c527a5c6e7
Duplicate route meant overwrite of route-name
2022-01-13 16:03:32 -08:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin
2022-01-11 16:40:20 -05:00
Brady Wetherington
3c7f2e89ec
Merge branch 'develop' into remove_old_ldap
...
Had to re-do the composer install because the conflicts were too complicated.
2022-01-03 12:56:58 -08:00
Alex Janes
b01a4468c7
refactored from bulkcheckin to quickscancheckin
2021-12-20 23:27:36 -05:00
Alex Janes
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
Alex Janes
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
snipe
4ca2252e3b
Switches GET to POST for request assset
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:32:29 -08:00
Ivan Nieto Vivanco
2402f00a2e
Fix route to checkout components from the details page
2021-12-14 12:26:46 -06:00
snipe
250f6b6fb8
Fixed v6 bug 500 server error when trying to checkin [sc-17711]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-18 14:37:12 -08:00
snipe
db45de5da2
Fixed old style user routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 20:26:07 -08:00
snipe
207c785b1d
Added missing use statements for Laravel 8 routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 20:20:10 -08:00
snipe
8a747be3a0
Fixed routes for newer format (l8)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 20:16:40 -08:00
snipe
f2f8f96991
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
2021-11-15 19:24:38 -08:00
snipe
542ab75d89
Added new backup routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 19:39:50 -08:00
snipe
edf98cb795
Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required
...
Turn custom fields required/optional/remove into POST requests
2021-11-08 14:37:36 -08:00
snipe
b5855e7be5
Removed get route for logout
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-08 12:35:15 -08:00
snipe
0d811d067c
Turn cusotm fields required/optional/remove into POST requests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-05 10:53:48 -07:00
Brady Wetherington
b0417e5bd7
Finish pulling out the AdLdap2-based LDAP remnants that were still in the system
2021-11-03 15:22:06 -07:00
snipe
aa8f1378c9
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
2021-10-20 17:26:41 -07:00
Dampfklon
ab4a234e20
fix rebase errors
2021-10-07 21:32:57 +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
ed99532c30
Unaccepted Assets Report Actions (send reminder, delete) added
...
Unaccepted Assets Export fixed
2021-10-07 20:53:02 +02: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
caad5be957
Updated routes to use POST for restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:17:36 -07:00
snipe
03e3c21d7e
Merge pull request #10129 from snipe/features/improved_mobile_ux
...
Features/improved mobile ux
2021-09-24 12:30:56 -07:00
Ivan Nieto Vivanco
efc9a8e2c9
Fixes route not defined exception on components and consumables
2021-09-24 11:38:07 -05:00
snipe
c69a883409
Fixed Groups route
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 04:12:07 -07:00
snipe
1574d24dde
Fixed accessories route
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 04:11:58 -07:00
snipe
1ecd11dd2e
More route fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 21:46:17 -07:00
snipe
61cf9ec009
Small conflict handling bits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 00:00:44 -07:00
Delta5
59302e1d19
Add restore to users api endpoint
2021-09-21 17:42:26 +00:00
snipe
67357e07f1
Added API route for depreciations report
...
RED FLAG: This will need to be updated for v6!!!!
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:05:00 -07:00
snipe
193a52876e
Fix incorrect resource route name
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 15:01:10 -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
snipe
8ea3acc943
Fixed route ordering (FIFO)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 16:05:07 -07:00
snipe
868419b35b
Components checkin/checkout via API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-30 01:02:44 -07:00
snipe
df7e0e5630
Fixed company resource route
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 23:46:25 -07:00
snipe
533c3f1651
Fixed incorrect resource route
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 20:58:04 -07:00
snipe
7af4c3a15f
Fixed incorrect maintenances route
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 21:06:19 -07:00
Brady Wetherington
17aab61987
Some fixes to some typos in other routes, commeting out parameters parameter which seems crashy
2021-06-22 18:58:25 -07:00
Brady Wetherington
9456a03a88
Almost finished with the routes which is...hopefully? The last thing?
2021-06-22 16:58:23 -07:00
snipe
60538508d4
Added missing route
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 01:51:53 -07:00
snipe
17fb56d3b9
More updated routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 01:35:29 -07:00
snipe
346d879344
Updated routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 01:05:20 -07:00
snipe
14ac7a2181
Updated API routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 00:42:34 -07:00
snipe
b7f45d2ae2
Re-emable auth routes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 19:02:25 -07:00
Brady Wetherington
42316f3ba7
Finished fixing the web routes file and put a gigantic warning in the api routes file
2021-06-11 17:12:06 -07:00
Brady Wetherington
fc5c0a0e95
Basic fixes to at least get the dashboard up
2021-06-11 15:23:44 -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
3c40c6fe25
Shift console routes
2021-06-10 20:17:20 +00:00
Laravel Shift
bdf23e472e
Shift to class based routes
2021-06-10 20:17:14 +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
snipe
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:32:23 -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
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
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
snipe
81bf41a091
Added an explanation for folks trying to access the API base endpoint with no real endpoint
2020-12-08 21:05:01 -08:00
snipe
1f5bcf2475
Added option to download activity report
2020-11-13 16:25:05 -08:00
Matthew Zackschewski
911841d188
Re-Added Accessories API
...
#8312 #8624 Removed unnecessary duplicate licenses endpoint and re-added the user accessories endpoint which was left off.
2020-11-03 16:40:43 -05:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07: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
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
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
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
60851c2eb2
Fixed AssetsController namespace in route
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:15:54 -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
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
779fc6d195
Added license endpoint for users
2019-12-19 18:00:36 -08:00
Ivan Nieto
7b7e097922
Added correct route for AssetsController from http://snipe-it.app/hardware/audit/due endpoint ( #7673 )
2019-12-18 11:52:01 -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
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
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
snipe
7899d2284c
Fixed parse error in API routes
2019-08-14 22:33:56 -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
e7b0ee2539
Added accessories checkout/checkin API endpoint
2019-08-02 15:08:26 -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
f47b960566
Added API middleware to API routes to enable throttling
...
TODO: Figure out how to make this costumizable without touching the code
2019-05-08 09:23:54 -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
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
52c9e8ad96
Added route to list overdue / upcoming assets via API
2019-05-05 19:11:28 -04:00
ajsy
a714cd357f
Update web.php
2019-05-03 15:22:05 +03:00
ajsy
5dcf9fbb50
Update web.php
2019-04-19 13:20:44 +03:00
ajsy
c11e93b72f
Update web.php
2019-03-09 11:14:24 +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
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
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
