snipe
|
3868e711f4
|
Return null if asset was hard-deleted/purged
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-09 21:08:07 +00:00 |
|
|
snipe
|
55b3050ca8
|
Re-applied previous withTrashed PR
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-09 20:37:18 +00:00 |
|
|
snipe
|
84f8eee869
|
Revert "Fixed barcodes crashing if asset was deleted"
|
2024-02-09 20:35:45 +00:00 |
|
|
snipe
|
fa47707974
|
Use withTrashed() to get the barcode on deleted assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-09 20:26:49 +00:00 |
|
spencerrlongg
|
6e5f296a13
|
gets rid of depreciate
|
2023-11-30 16:08:49 -06:00 |
|
|
spencerrlongg
|
68d85385a2
|
get rid of physical
|
2023-11-30 16:03:30 -06:00 |
|
|
spencerrlongg
|
88b6a541ee
|
removed references to archived
|
2023-11-30 15:59:03 -06:00 |
|
|
snipe
|
1307ef19cf
|
Escape the asset tag before passing it to the view
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 23:20:47 +00:00 |
|
|
snipe
|
20c0f687e9
|
Added restored to asset observer, removed manual logging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 20:09:10 +00:00 |
|
|
snipe
|
e2d0136336
|
Fixed goofy translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 18:14:44 +00:00 |
|
|
snipe
|
f7ccef16e7
|
Refactorer controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 18:02:47 +00:00 |
|
|
snipe
|
08153d418f
|
Use new alert box and linked string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-08 14:40:18 +00:00 |
|
Robert-Azelis
|
bd195a6911
|
Update AssetsController.php
when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate
|
2023-10-22 18:11:19 +02:00 |
|
|
spencerrlongg
|
4660a2e5b7
|
rm more duplicate
|
2023-09-20 14:37:32 -05:00 |
|
|
spencerrlongg
|
a9123754f5
|
remove unnecessary code
|
2023-09-20 14:34:42 -05:00 |
|
|
spencerrlongg
|
7dab59c98d
|
fix for no eol, fix for optional in view
|
2023-09-20 14:17:30 -05:00 |
|
|
spencerrlongg
|
70a251de55
|
fix up gui edit
|
2023-09-13 13:51:14 -05:00 |
|
|
spencerrlongg
|
e21a8b6717
|
fix up this file
|
2023-09-12 18:11:36 -05:00 |
|
|
slong753
|
78c400e948
|
fix conflicts
|
2023-09-11 17:21:50 -05:00 |
|
|
slong753
|
75d7e3e1a0
|
fix conflicts
|
2023-09-11 17:20:21 -05:00 |
|
|
slong753
|
5948679a4a
|
fix purchase date update
|
2023-09-11 17:17:59 -05:00 |
|
|
slong753
|
774f21bb7f
|
some more cleanup
|
2023-09-11 17:17:59 -05:00 |
|
|
slong753
|
cda9dd57dd
|
asset update logic
|
2023-09-11 17:15:25 -05:00 |
|
|
slong753
|
1ea0de8bca
|
prevent injection, fix asset update
|
2023-09-11 17:15:25 -05:00 |
|
|
slong753
|
17ccfa9ada
|
resolve some conflicts
|
2023-09-11 17:15:24 -05:00 |
|
|
slong753
|
c1daabef08
|
progress
|
2023-09-11 17:10:41 -05:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
|
snipe
|
a01cb26aac
|
Merge pull request #12940 from akemidx/delete_asset_from_view_page
Delete button on asset view page
|
2023-07-25 12:11:35 +01:00 |
|
Godfrey M
|
8e3cbdad90
|
removes assigned_to if archived
|
2023-05-15 11:52:57 -07:00 |
|
akemidx
|
d94bed3f57
|
push for testing
|
2023-04-27 18:58:59 -04:00 |
|
|
snipe
|
8f0b823fb3
|
Applies #12868
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 23:39:32 -07:00 |
|
Dominik Both
|
3271c9dc9f
|
Fix #8208, #8896, #8985, #9789
|
2023-03-29 09:56:34 +02:00 |
|
|
snipe
|
545d023a18
|
Handled a few more hard-coded strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 23:56:07 -07:00 |
|
|
snipe
|
f9e190eb32
|
Updates the Gate “use” statement to be more specific
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-18 11:58:09 -07:00 |
|
|
slong753
|
60b70a4074
|
catch and redirect back with error
|
2023-03-14 16:07:09 -05:00 |
|
cram42
|
0f3c5d10ba
|
Merge branch 'feature-label2' into develop
|
2023-02-01 18:01:46 +11:00 |
|
|
cram42
|
4b4c228f1a
|
Correct parameter order
|
2023-02-01 17:56:23 +11:00 |
|
|
cram42
|
c2c009a018
|
Merge branch 'develop' into develop
|
2023-01-24 09:53:42 +08:00 |
|
|
snipe
|
41537a2449
|
Added field to the API controller endpoints
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:56:44 -08:00 |
|
|
snipe
|
b80d52a9c3
|
Added byod to asset controller for create and update methods
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-18 13:03:51 -08:00 |
|
Cram42
|
a8b6a4a259
|
Allow passing "template" param
|
2022-11-02 16:04:40 +08:00 |
|
|
Cram42
|
7b29ddd283
|
Tie into tag generation
|
2022-11-01 20:02:12 +08:00 |
|
|
Cram42
|
0e69e4248c
|
Fix: Multiple outputs at hardware/{id}/label
|
2022-10-27 08:12:42 +08:00 |
|
|
snipe
|
14d8fb66aa
|
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value
Only care about the custom field's converted name when updating the custom field itself
|
2022-06-27 17:36:26 -07:00 |
|
|
snipe
|
bf08e73f8f
|
Removed comments and server side cookie info
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-27 16:36:09 -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
|
d70b36750c
|
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset
Fixes #8155 - improve the workflow during asset creation
|
2022-06-24 18:53:07 -07:00 |
|
Achmad Fienan Rahardianto
|
fe65de1207
|
implements cookie to maintain display preference
|
2022-06-01 11:54:05 +07:00 |
|
|
snipe
|
6fc222a648
|
Fixed #11014 - Removed double escaping on custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:45:00 -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 |
|