snipe
b21c303e56
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
2024-09-20 13:43:50 +01:00
snipe
822ea96dfd
Use auth()->id() instead of Auth::id()
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:31:46 +01:00
snipe
b247fc33b9
Added legacy comment
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:28:01 +01:00
snipe
2dcae780c0
Reapply deleted code
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:26:21 +01:00
snipe
5c3180ffa0
Removed duplicate code
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:25:09 +01:00
snipe
bbce7b40ca
Additional consistencies
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:20:56 +01:00
snipe
02a29c71ef
Added created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:01:48 +01:00
snipe
9adb2c24f3
Squashed commit of the following:
...
commit dddbf27d78
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184
Merge: 04bb3eec8
3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9
f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775
9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 16:06:36 +01:00
snipe
1582d81e5b
Change user_id
to created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-17 22:16:41 +01:00
Marcus Moore
5299b3e9f0
Remove code handled by CompanyableChildTrait
2024-09-12 13:29:44 -07:00
snipe
1d65781d8d
More type-hinting
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-05 07:07:20 +01:00
snipe
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:38:15 +01:00
snipe
13d2af2155
Fixed ambiguous query on supplier_id in maintenances
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-15 09:51:14 +00:00
snipe
35a70988cb
Added sorting by status label
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:58:39 +00:00
snipe
7868a8c174
Added serial for API controller
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:47:13 +00:00
snipe
778e45c9fd
Fixed maintenances patch endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-07 19:36:12 +00:00
Godfrey M
ee50906e44
attempt to add warranty to api controller
2023-06-13 11:20:55 -07:00
Marcus Moore
3cae32b236
Eager load default locations
2023-04-27 17:13:09 -07:00
snipe
22d73f503a
Merge pull request #12756 from dboth/develop
...
Fixed #8208 , #8896 , #8985 and #9789 : Currency issues when using non-english locales (resubmission)
2023-04-25 22:32:13 -07:00
snipe
64256351d8
Used a singleton to filter API limit value
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 08:46:39 -07:00
snipe
4cbb9c2409
Use abs() instead of max
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-15 17:28:25 -07:00
snipe
112a04b108
Better handle weird data passed to the API via limit and offset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-12 11:28:46 -07:00
Dominik Both
3271c9dc9f
Fix #8208 , #8896 , #8985 , #9789
2023-03-29 09:56:34 +02:00
snipe
a33276cb3d
Additional filters on maintenances UI
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:10:48 -07:00
snipe
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
snipe
c940d36fff
Updated maintenance gate in API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:49:54 -08:00
snipe
dd5f812d88
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
2022-02-20 13:29:12 -08:00
snipe
4804e5b3ab
Added Asset edit/delete gates to maintenances
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-14 15:34:06 -08: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
Brady Wetherington
f3338667c7
Create new ParseCurrency helper and use it in the appropriate controllers
2021-09-28 18:20:39 -07: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
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
3361b859c0
Changes offset to use the actual item count as override instead of 0 ( #7788 )
2020-02-04 12:32:24 -08:00
snipe
c31e150935
Use $request->input over Request::get()
2019-12-11 11:09:54 -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
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
2d036c64e9
Change ->has() to ->filled()
2019-05-23 17:39:50 -07:00
Martin Meredith
e3e0d57f56
Minor code cleanup bits and bobs ( #6805 )
...
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
snipe
0242b3ec74
Handled JS cookie offset issue on the server side
...
We may want to handle this via the blades instead, as I’m not sure if API users will run into weirdness here.
2019-02-14 15:01:34 -08:00
snipe
b26fbf986f
Fixed issue where offset could be greater than total items, resulting in “No results” confusion
2019-02-14 14:49:08 -08:00
snipe
9168979d9e
Fixed #6027 - added model to asset maintenances listing
2018-08-01 18:24:52 -07:00
snipe
86c1f11bec
Change $request->has to $request->filled unilaterally
2018-07-24 22:51:31 -07:00
snipe
36cd63836e
Fixed #5151 - added asset tag to maintenances
2018-03-05 16:26:40 -08:00
snipe
3744a68daf
Features/better table options ( #5018 )
...
* Added CSS for table toolbar
* Use maintenances API for table listings
* NIcer layout for allowed_columns in maintenances API
* Fixed #5014 - bootstrap cookie issues
* Fixed #5015 - bug when saving settings
* Refactored datatable code to use data attributes
* Updated dashboard with new table code
* Added - Order by group user count
* Updated groups to use new table attributes
* New license listing table code
* More bootstrap table implementations
* More BS table refactoring
* Improved bootstrap assigned assets
* New bootstrap for reports
* Misc BS fixes
* FIxed small issue with asset history display
* Removed multisort option
* JS refactor
2018-02-16 13:22:55 -08:00
snipe
498fc3762d
Fixed #4437 - pagination for maintenances
2017-11-14 01:32:25 -08:00
Daniel Meltzer
987536930c
Assorted fixes ( #3923 )
...
* Fix some n+1 problems
* Use route in notification dropdown to make sure we link to correct page
* Work on better UI support for checkout to non-user. Fix links on index bootstrap table, work towards eliminating assignedUser
* Remove Asset::assigneduser() relationship. Instead add a checkedOutToUser() method and/or port to using assignedTo()
* Adjust string to fit new reality
* Fix #3780 . Move the consumables getDataView method to the ApiController. Not entirely RESTful, but it's a weird method that probably doesn't need its own controller and the functionality would be strange to stack on the userscontroller...
* Fix file uploads to assets and restore the delete route.
* Add asset maintence edit action to index.
* Suppliers asset list should link to the related asset, not to the supplier with same ID.
* Asset models page should use polymorphic formatter on assigned to to better handle assorted item types.
* Comment out more assigneduser fallacy until we figure out the query builder approach to searching for location text.
2017-09-05 17:54:58 -07:00
snipe
6310670835
Fixes #3869 - asset maintenances API endpoints
2017-08-22 13:52:06 -07:00