DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7940 commits 102 branches 268 tags 288 MiB
Commit graph

1890 commits

Author SHA1 Message Date
Ivan Nieto Vivanco ac8da55270 Evaluate if an item still exists before trying to get its name in the report 2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco 1cbbf8f976 Evaluate if an item still exists before trying to get its name in the report 2022-05-01 13:11:05 -05:00
Johnson Yi 92fe1287ea Do not saml login automatically after normal logout 2022-04-29 15:35:08 +00: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 2e9cf8fa87 Added access gate to the requested assets index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 15:45:37 +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 7b891f0952
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations 
Fixes Bulk user edit not updating checked out asset locations
 2022-04-07 19:41:01 +01:00
snipe 8218b5ef47
Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop 
Fixes Bulk user edit not updating checked out asset locations
 2022-04-07 19:40:42 +01:00
Godfrey M 3eb7a87a66 fixes action_date for check-in not including H:i:s 2022-04-07 11:24:12 -07:00
Godfrey M 1325628039 fixes typo 2022-04-07 11:18:16 -07:00
Godfrey M 8498082f21 fixes typo 2022-04-07 11:16:40 -07:00
Godfrey M 6dc45c189b removed deadspace 2022-04-07 11:10:36 -07:00
Godfrey M 5d0a1ebb7a fixes action_date for check-in not including H:i:s 2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco e1927aa154 Update Assets locations when user's location changes whey they got bulk-edited 2022-04-06 19:23:49 -05:00
Ivan Nieto Vivanco 6529a75683 Update Assets locations when user's location changes whey they got bulk-edited 2022-04-06 19:12:02 -05: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 7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets 
Fix #10810 unaccepted assets
 2022-03-29 12:10:37 +01:00
snipe b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync 
This looks good, thanks!
 2022-03-29 12:06:01 +01:00
snipe 639409fb3f Backporting #10829 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-25 13:00:16 +00:00
Godfrey M a1429ce86b removed manager_name from user files 2022-03-24 11:47:13 -07:00
Godfrey M c1f8252388 adds manager field to LDAP sync 2022-03-24 11:24:39 -07:00
Godfrey M 55680762de Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync 2022-03-22 16:33:58 -07: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 3e01981576 clean up 2022-03-22 10:07:08 -07:00
Godfrey M 62352ef1a1 completes accessory eula agreement blade 2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco 319d816002 Update in the license seat the user that the asset with that license have assigned 2022-03-21 15:06:43 -06:00
Godfrey M 4956eb0410 WIP: needs to be tested. adds ldap_manager field to ldap sync 2022-03-21 11:15:39 -07:00
Godfrey M 220df9710e adds most of the fields for an accessory eula agreement pdf 2022-03-21 09:18:29 -07:00
snipe df60729140 Fixed #10769 - redirect user back to due for audit page 
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-21 14:27:18 +00: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 7db252ade3 Fixed #10840 - defaulting to 0 on supplier ID if no value provided 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-19 23:11:42 +00:00
Godfrey M b2e78e3382 formats most of the pdf blade 2022-03-16 15:53:32 -07:00
Dampfklon 9818d16834 fix showDeletedFunction by reverting #9508 2022-03-16 20:20:46 +01:00
Godfrey M 5fcc3c39f3 routes eula agreements for download correctly to the asset history 2022-03-16 11:56:56 -07:00
snipe 9db8bd782d Merging master down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:02:07 +00:00
Godfrey M 6386fa1c5e clean up 2022-03-16 09:54:10 -07:00
snipe 7498fe36e9 Removed extra space because pedantry 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 16:45:03 +00:00
snipe babf7c064b Added ability to filter status label index endpoint by status type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 16:38:45 +00:00
Godfrey M b2f7262cd2 adds table structure for asset history 2022-03-14 19:38:36 -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 3e2fe10480 Fixed getAssetBySerial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-05 09:03:29 -08:00
snipe 2d7a8b5e15
Merge pull request #10776 from snipe/added_trim_to_email_and_username 
Added trim to email and username
 2022-03-04 11:57:33 -08:00
snipe 9a358087ec Add remote user to bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 06:47:23 -08:00
snipe 67134ca387 Do a trim() before inserting/updating 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 06:18:52 -08:00
snipe 0dfc27f56e Added remote to allowed_columns for sorting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 05:44:46 -08:00
snipe 43c1949092 Add remote option to user 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 05:35:26 -08:00
snipe f840652395 Suppress errors for missing signatures 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 03:18:28 -08:00
snipe 67ed0d91c0 Handle file_get_contents more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 02:54:37 -08: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 9acb5413f6 Added notes field to controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:29:25 -08:00
snipe 08a2fe4edb
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api 
Features/adds ldap import and assets count to user api
 2022-03-03 19:15:14 -08:00
snipe 6abe8f296b We don’t need the users table here 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:12:03 -08:00
snipe a53a67be4a Added consumables, licenses, accessories count filters too 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:08:08 -08:00
snipe b72cac3511 Adds ldap_import and assets_count filter to user API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:03:35 -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 cd12028845 Use “update” instead of edit in gate 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 18:47:20 -08:00
snipe 3339a691e1
Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint 
Added consumables endpoint to user API
 2022-03-02 14:33:45 -08:00
Godfrey M 533670f3f1 faulty method for converting asset acceptance to pdf 2022-02-24 14:50:16 -08:00
snipe 42fcd29200 Fixed #10436 on master, applies #10449 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 21:06:54 -08:00
snipe dc2e6c2b06 Adds consumables endpoint to user API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 20:44:34 -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
Ivan Nieto Vivanco 23a6907975 Some minor stylistic changes 2022-02-17 18:05:06 -06:00
Ivan Nieto Vivanco 5b2a5ff124 Put the 'remember_token' column as null in the users table 2022-02-17 18:03:00 -06:00
Ivan Nieto Vivanco 548b172744 Logout every connected user 2022-02-17 18:00:24 -06:00
Ivan Nieto Vivanco 263893b3c6 Search logged in user that made the restore, if they doesn't exist in the restored system, add it again 2022-02-17 17:42:06 -06:00
Ivan Nieto Vivanco 811ca51c4f Wipe database before restoration 2022-02-17 16:59:44 -06:00
snipe d1b45a83b8 Blergh, one more linebreak 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:51:06 -08:00
snipe 01a8701a8c Removed extra linebreaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:50:38 -08:00
snipe 67fe53e32a Removed debugging, added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:50:07 -08:00
snipe 7f6b8cc43d Removed carbon, since we went with PHP's datetime instead 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:48:12 -08:00
snipe 5fe999eb02 Shored up the date math, updated the explanation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-17 14:34:33 -08:00
snipe ea429d650e Initial audit date fix 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-16 20:19:38 -08:00
snipe 824eedf7c2 Added UI elements for is_unique 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-16 13:47:48 -08:00
snipe 4f89dfee49
Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password 
Added usleep random to forgotten password method to mitigate timing attacks
 2022-02-16 11:17:00 -07:00
snipe 5540069cce Be more specific with deleted license point 
Require this value to be "true" speciically to get the deleted list

Signed-off-by: snipe <snipe@snipe.net>
 2022-02-16 09:14:04 -08:00
snipe 1ad56760ce Adds delete endpoint for licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-16 09:08:50 -08:00
snipe f878e0ad66 Fixes 2FA cookie -> user issue 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-15 18:29:23 -08:00
snipe 178e440951 Added usleep :( 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-15 18:09:58 -08:00
snipe cab4fa1687 Fixes some conceptual gates 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-14 15:42:23 -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 1c0a96b0ce Added gate to supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 11:58:12 -07:00
snipe d77a47765e Adds gate to supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 11:53:45 -07:00
snipe 2dad27eed6 Added additional gate for selectlists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 11:46:14 -08:00
snipe f5ffda8053 Ahem. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-10 22:43:51 -08:00
snipe 70af10ae6c
Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date 
Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API
 2022-02-10 09:54:20 -08:00
snipe b9a8d45c07 Better messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 16:30:42 -08:00
snipe 7794c2f44b Check that the fieldset exists before trying to detach it from the fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-09 16:16:16 -08:00
snipe 6b25b53462
Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio 
Fixes #10299 Default Values do not allow Checkbox/Radio Buttons
 2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco 6d79c9f3e2 Save the default values for custom fields with same format than Assets do for actual values 2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco a36957dd77 Finish the implementation of custom fields default values for checkboxes 2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco 2f3499e4b9 Show checkboxes a little less assy, actually save the data checked by them 2022-02-09 10:49:10 -06:00
Jonathon Reinhart 3536d08477 Add checkin_at parameter to /hardware/:id/checkin API 
Fixes #10552
 2022-02-08 20:23:09 -05:00
Jonathon Reinhart cd963179fd Fix /hardware/{id}/checkin API response on error 
Fixes #10629
 2022-02-08 01:08:42 -05:00
Ivan Nieto Vivanco eac8e0bdba Add a casting to a truthy/falsy that needs to be integer 2022-02-02 13:54:57 -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
snipe 06a5ea1530 Fixed duplicate use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 18:57:45 -08:00
snipe 5fded57ec6 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/ProfileController.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	app/Models/License.php
#	app/Providers/AppServiceProvider.php
#	app/Services/LdapAd.php
#	config/version.php
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/lang/ar/button.php
#	resources/lang/de/admin/companies/general.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/groups/titles.php
#	resources/lang/de/admin/hardware/form.php
#	resources/lang/de/admin/hardware/general.php
#	resources/lang/de/admin/hardware/message.php
#	resources/lang/de/admin/hardware/table.php
#	resources/lang/de/admin/kits/general.php
#	resources/lang/de/admin/locations/table.php
#	resources/lang/de/admin/reports/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/de/admin/users/general.php
#	resources/lang/de/general.php
#	resources/lang/de/mail.php
#	resources/lang/en/admin/asset_maintenances/message.php
#	resources/lang/en/admin/asset_maintenances/table.php
#	resources/lang/en/admin/companies/general.php
#	resources/lang/en/admin/companies/message.php
#	resources/lang/en/admin/custom_fields/general.php
#	resources/lang/en/admin/depreciations/general.php
#	resources/lang/en/admin/groups/titles.php
#	resources/lang/en/admin/hardware/form.php
#	resources/lang/en/admin/hardware/general.php
#	resources/lang/en/admin/hardware/table.php
#	resources/lang/en/admin/kits/general.php
#	resources/lang/en/admin/locations/table.php
#	resources/lang/en/admin/reports/general.php
#	resources/lang/en/admin/settings/general.php
#	resources/lang/en/admin/settings/message.php
#	resources/lang/en/admin/users/general.php
#	resources/lang/en/button.php
#	resources/lang/en/general.php
#	resources/lang/en/help.php
#	resources/lang/en/mail.php
#	resources/lang/en/passwords.php
#	resources/lang/hu/admin/hardware/general.php
#	resources/lang/hu/admin/hardware/table.php
#	resources/lang/hu/admin/locations/table.php
#	resources/lang/is/admin/locations/table.php
#	resources/lang/ko/admin/custom_fields/general.php
#	resources/lang/ko/general.php
#	resources/lang/nl/admin/hardware/general.php
#	resources/lang/nl/admin/hardware/message.php
#	resources/lang/nl/admin/hardware/table.php
#	resources/lang/nl/admin/locations/table.php
#	resources/lang/nl/admin/statuslabels/message.php
#	resources/lang/nl/admin/users/general.php
#	resources/lang/no/admin/companies/general.php
#	resources/lang/no/admin/custom_fields/general.php
#	resources/lang/no/admin/depreciations/general.php
#	resources/lang/no/admin/depreciations/table.php
#	resources/lang/no/admin/groups/titles.php
#	resources/lang/no/admin/hardware/form.php
#	resources/lang/no/admin/hardware/general.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/locations/table.php
#	resources/lang/no/admin/reports/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/admin/settings/message.php
#	resources/lang/no/admin/statuslabels/message.php
#	resources/lang/no/admin/users/general.php
#	resources/lang/no/button.php
#	resources/lang/no/general.php
#	resources/lang/no/mail.php
#	resources/lang/no/validation.php
#	resources/lang/pl/admin/companies/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/pl/admin/depreciations/general.php
#	resources/lang/pl/admin/depreciations/table.php
#	resources/lang/pl/admin/groups/titles.php
#	resources/lang/pl/admin/hardware/form.php
#	resources/lang/pl/admin/hardware/general.php
#	resources/lang/pl/admin/hardware/table.php
#	resources/lang/pl/admin/kits/general.php
#	resources/lang/pl/admin/locations/table.php
#	resources/lang/pl/admin/reports/general.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/admin/settings/message.php
#	resources/lang/pl/admin/users/general.php
#	resources/lang/pl/button.php
#	resources/lang/pl/general.php
#	resources/lang/pt-PT/admin/companies/general.php
#	resources/lang/pt-PT/admin/custom_fields/general.php
#	resources/lang/pt-PT/admin/depreciations/general.php
#	resources/lang/pt-PT/admin/depreciations/table.php
#	resources/lang/pt-PT/admin/groups/titles.php
#	resources/lang/pt-PT/admin/hardware/form.php
#	resources/lang/pt-PT/admin/hardware/general.php
#	resources/lang/pt-PT/general.php
#	resources/lang/pt-PT/help.php
#	resources/lang/pt-PT/validation.php
#	resources/lang/ro/admin/companies/general.php
#	resources/lang/ro/admin/custom_fields/general.php
#	resources/lang/ro/admin/groups/titles.php
#	resources/lang/ro/admin/hardware/form.php
#	resources/lang/ro/admin/hardware/general.php
#	resources/lang/ro/admin/hardware/message.php
#	resources/lang/ro/admin/hardware/table.php
#	resources/lang/ro/admin/locations/table.php
#	resources/lang/ro/admin/settings/message.php
#	resources/lang/ru/admin/companies/general.php
#	resources/lang/ru/admin/custom_fields/general.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/general.php
#	resources/lang/ru/validation.php
#	resources/lang/sk/admin/settings/general.php
#	resources/lang/sk/button.php
#	resources/lang/sk/general.php
#	resources/lang/tr/admin/hardware/form.php
#	resources/lang/tr/admin/hardware/table.php
#	resources/lang/tr/admin/kits/general.php
#	resources/lang/tr/admin/locations/table.php
#	resources/lang/tr/admin/reports/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/admin/settings/message.php
#	resources/lang/tr/admin/statuslabels/message.php
#	resources/lang/tr/admin/users/general.php
#	resources/lang/tr/button.php
#	resources/lang/tr/general.php
#	resources/lang/zh-CN/admin/companies/general.php
#	resources/lang/zh-CN/admin/custom_fields/general.php
#	resources/lang/zh-CN/admin/depreciations/general.php
#	resources/lang/zh-CN/admin/depreciations/table.php
#	resources/lang/zh-CN/admin/groups/titles.php
#	resources/lang/zh-CN/admin/hardware/form.php
#	resources/lang/zh-CN/admin/hardware/general.php
#	resources/lang/zh-CN/admin/hardware/message.php
#	resources/lang/zh-CN/admin/hardware/table.php
#	resources/lang/zh-CN/admin/kits/general.php
#	resources/lang/zh-CN/admin/locations/table.php
#	resources/lang/zh-CN/admin/reports/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/lang/zh-CN/admin/settings/message.php
#	resources/lang/zh-CN/admin/statuslabels/message.php
#	resources/lang/zh-CN/admin/users/general.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-CN/general.php
#	resources/lang/zh-CN/mail.php
#	resources/views/depreciations/edit.blade.php
 2022-02-01 18:53:05 -08:00