Phan Nguyen
|
8ff109e9da
|
Correct comparison logic
Comparison operator should be greater than or equal
|
2022-10-08 12:54:15 +07:00 |
|
snipe
|
14b7319b63
|
Added start/end to sortable columns
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 17:07:07 -07:00 |
|
|
snipe
|
56ba8a7e24
|
Added API select fields and filters
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 16:58:16 -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
|
5feea17f8d
|
Revert "Prevent to delete a user if still has consumables associated to them"
|
2022-08-14 13:42:14 -07:00 |
|
Ivan Nieto Vivanco
|
db53a00d3f
|
Prevent to delete a user if still has consumables associated to them
|
2022-08-11 17:01:52 -05:00 |
|
|
snipe
|
acd666fdf5
|
Added notes to user consumables tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:34:07 -07:00 |
|
|
snipe
|
e3293151a2
|
Added note on checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:59 -07:00 |
|
|
snipe
|
9acfceba29
|
Added relations to report search
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 23:50:10 -07:00 |
|
|
snipe
|
78097df7ff
|
Aplpies current time to checkin date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-21 21:45:25 -07:00 |
|
|
snipe
|
6428dc5cd2
|
Removed duplicate supplier_id
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-13 13:08: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 |
|
Nathan Butler
|
e28e7e37b8
|
Removed unneeded checks when searching for asset
|
2022-06-29 17:49:50 +10:00 |
|
|
snipe
|
b590f29f33
|
Attempt a download via API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 23:59:13 -07:00 |
|
|
snipe
|
1debdc47cf
|
Backups endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 23:30:17 -07:00 |
|
|
snipe
|
53bc15900b
|
Formatted show api
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 23:23:55 -07:00 |
|
|
Nathan Butler
|
67e9b7795a
|
Added asset checkoutByTag API endpoint
|
2022-06-29 16:11:57 +10:00 |
|
|
snipe
|
52332bc9ed
|
Include token ID in payload
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 23:10:56 -07:00 |
|
|
snipe
|
9680b02bce
|
Check that the user has permission to create their own API keys
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 22:09:18 -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
|
3df9260ca8
|
Added additional filters for api indexes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 19:59:45 -07:00 |
|
|
snipe
|
71c8050883
|
Added additional search filters for location API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-28 19:07:11 -07:00 |
|
|
snipe
|
baad3b9d58
|
Only care about the converted name when updating the custom field itself
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-27 14:17:07 -07:00 |
|
|
snipe
|
86d2c2b153
|
Small naming changes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 19:11:59 -07:00 |
|
|
snipe
|
9fd3541520
|
Missed on createdBy
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 18:42:22 -07:00 |
|
|
snipe
|
3e559044b2
|
Changed method and scope names
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 18:41:13 -07:00 |
|
|
snipe
|
d8daec2e0a
|
Added created_by results to user index API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 17:19:30 -07:00 |
|
|
snipe
|
675f42401c
|
Fixed #11343 - ability to null asset name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 10:57:39 -07:00 |
|
|
snipe
|
a33276cb3d
|
Additional filters on maintenances UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:10:48 -07:00 |
|
|
snipe
|
954b54f914
|
Removed duplicated $allowed_columns
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 15:06:04 -07:00 |
|
|
snipe
|
dd9c9520fb
|
Correctly filter by category_id
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:42:21 -07:00 |
|
|
snipe
|
4c11041477
|
Fixed regression: missing restore option for assets via API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-09 17:17:38 -07:00 |
|
|
snipe
|
07b1062fb2
|
Better handle API calls to nonexistent users
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 16:55:23 -07:00 |
|
|
Ivan Nieto Vivanco
|
37f9cca5ec
|
Minor stylistic change
|
2022-05-28 08:11:13 -05:00 |
|
|
Ivan Nieto Vivanco
|
e0050bc844
|
Don't let a license to be checked out to a non-existent target
|
2022-05-26 18:06:53 -05:00 |
|
|
snipe
|
266a9e5328
|
Removed stored_eula_file from controller
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
|
Ivan Nieto Vivanco
|
a771984619
|
Add an early return if for some reason the import record is not found
|
2022-05-18 06:15:46 -05:00 |
|
|
snipe
|
333aa05809
|
Added missing use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 16:46:13 -07:00 |
|
|
snipe
|
780222d372
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
|
2022-05-10 17:26:26 -07:00 |
|
|
snipe
|
646166b2b6
|
Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:16:07 -07:00 |
|
|
snipe
|
9aac1cbba4
|
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
|
2022-04-28 17:49:06 +01:00 |
|
|
snipe
|
6b1329133b
|
Adds status ID to asset checkout API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 13:06:35 +01:00 |
|
|
snipe
|
698c7f4904
|
Fixes potential XSS vuln in user requestable results
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 12:22:20 +01:00 |
|
|
snipe
|
1441cf9f4f
|
Ports #10494 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 21:04:57 +01:00 |
|
|
snipe
|
a937bd34f6
|
Merge master back down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-29 16:28:43 +01:00 |
|
|
snipe
|
639409fb3f
|
Backporting #10829 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-25 13:00:16 +00: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 |
|
|
snipe
|
e04ae63d02
|
Apply the fix to API controller too :(
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-19 23:12:48 +00:00 |
|
|
snipe
|
7498fe36e9
|
Removed extra space because pedantry
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 16:45:03 +00:00 |
|