cram42
c2c009a018
Merge branch 'develop' into develop
2023-01-24 09:53:42 +08:00
lukasfehling
d9a9bd1c0d
Added a api endpoint for sending email notifications to users with their assigned assets
2022-11-15 18:17:51 +01:00
Cram42
48fb4f2439
Add labels route for testing layouts
2022-11-02 17:23:52 +08:00
snipe
eb81c290dc
Accessory file upload
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:50:39 -07:00
snipe
3d8e0b707e
Fixed component file route controller names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:29:13 -07:00
snipe
f51b312843
Added component routes for uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:09:51 -07:00
snipe
f6a6478804
Added consumable uploads gitignore
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 17:52:04 -07:00
Cram42
d37605ff18
Add localization strings
2022-11-01 20:01:18 +08:00
Cram42
5558a005b9
Implement API for labels
2022-11-01 19:57:51 +08:00
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 a070f7cd5e
Merge: 166f52630
4c1104147
Author: snipe <snipe@snipe.net>
Date: Thu Jun 9 17:23:05 2022 -0700
Merge pull request #11291 from snipe/fixes/regression_missing_restore_command
Fixed regression: missing restore option for assets via API
commit 4c11041477
Author: snipe <snipe@snipe.net>
Date: Thu Jun 9 17:17:38 2022 -0700
Fixed regression: missing restore option for assets via API
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
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