snipe
|
50431c046f
|
Fixed missing slash in stdClass
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-15 17:04:06 +00:00 |
|
|
snipe
|
ae259f36ae
|
Merge pull request #12106 from fernando-almeida/develop
Fix HTTP AssetTransformer to generate an empty object for missing custom fields
|
2022-11-15 15:54:43 +00:00 |
|
Fernando Almeida
|
47ee2a8153
|
Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array.
|
2022-11-14 16:31:08 +00:00 |
|
|
snipe
|
52dc5aa4ba
|
Added field to controller and tranformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-08 15:26:59 +00:00 |
|
|
snipe
|
12c7223bcd
|
Renamed column back to assets_count for legacy
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 09:39:03 -07:00 |
|
|
snipe
|
e670ffe349
|
Added Assets Assigned to tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 00:16:06 -07:00 |
|
|
snipe
|
9d641573b5
|
Make the APU return null instead of blank
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 17:01:04 -07:00 |
|
|
snipe
|
bdfac1a345
|
Added start/end to the users API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 16:58:37 -07:00 |
|
|
snipe
|
36484d50ef
|
Fixed depreciation API call
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-29 17:07:42 -07:00 |
|
Brady Wetherington
|
420c216973
|
Added counts to Dashboard Pie Chart legends and tooltips
|
2022-09-29 13:20:58 -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 |
|
Godfrey M
|
6b6a079440
|
fixes current value and monthly depreciation on reports and calculations
|
2022-09-14 17:01:18 -07:00 |
|
|
snipe
|
6f0f6c8042
|
Don’t prevent deletion if user has consumables checked out
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-25 12:51:02 -07:00 |
|
Warren White
|
ba7d6dde3f
|
Fixed #11706: changes the display of managers username to First Last name
|
2022-08-19 10:17:25 -07:00 |
|
|
snipe
|
ef099aa644
|
Reverted notes to note since pivot
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 16:09:56 -07:00 |
|
|
snipe
|
e3293151a2
|
Added note on checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:59 -07:00 |
|
|
snipe
|
3ec77724d8
|
Added note pivot
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:34 -07:00 |
|
|
snipe
|
024a014298
|
Changed notes to note
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:19 -07:00 |
|
|
Godfrey M
|
92e6ea96b2
|
if eol is missing from asset model monthly depreciation will be recalculated
|
2022-08-09 15:05:15 -07:00 |
|
|
snipe
|
9acfceba29
|
Added relations to report search
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 23:50:10 -07:00 |
|
mikeroq
|
f21824a8e2
|
Changed comparing the action type from translated in presenter to actual value
|
2022-07-12 17:59:03 -05: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
|
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
|
bee694e605
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-27 09:57:20 -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
|
7f05029089
|
Added created_by to API output
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 17:18:31 -07:00 |
|
|
snipe
|
6bc525bc25
|
Merge pull request #11352 from inietov/fixes/assets_transformer_date_customfields_fixes
Fixed #11335 Assets transformer date customfields issues
|
2022-06-21 17:56:17 -07:00 |
|
Ivan Nieto Vivanco
|
3a5c09c424
|
Used the getFormattedDateObject() function with the expected parameters
|
2022-06-20 19:58:51 -05:00 |
|
|
Mike Roquemore
|
8a27ef30d5
|
Missing total argument on transformDeprecations method
Removed duplicate array key on transformDeprecation method
|
2022-06-15 21:52:15 -05:00 |
|
|
snipe
|
af66f83a3d
|
Check for blank (not null) values i asset transformer date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 13:42:30 -07:00 |
|
|
snipe
|
74bc06cc49
|
Removed debugging code
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 02:07:58 -07:00 |
|
|
Ivan Nieto Vivanco
|
50c008ead5
|
Adds check in condition that format custom dates
|
2022-06-14 01:37:15 -05:00 |
|
|
snipe
|
20a0c4e3b5
|
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields
Fixes #8143 Date localization not working on custom fields
|
2022-06-13 19:47:20 -07:00 |
|
|
Ivan Nieto Vivanco
|
0c3972d7b7
|
Add spaces to the code for consistency
|
2022-06-09 13:02:31 -05:00 |
|
|
Ivan Nieto Vivanco
|
4a0eb2b3f1
|
Add element type of customfield to API response
|
2022-06-09 12:57:20 -05:00 |
|
|
Ivan Nieto Vivanco
|
740f27198f
|
Evaluate if a custom field is a Date to present it with the correct format
|
2022-06-07 18:00:46 -05:00 |
|
|
snipe
|
e0102ddbf0
|
Fixes #11093 Return true/false for custom fields/fieldsets required in API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 20:03:20 -07:00 |
|
|
Ivan Nieto Vivanco
|
1f6ab340a6
|
Give a more descriptive name to variable
|
2022-05-25 18:53:17 -05:00 |
|
|
Ivan Nieto Vivanco
|
f208869aff
|
Add column to show filenames in Activity Report if the log action is 'uploaded'
|
2022-05-25 18:50:32 -05:00 |
|
|
snipe
|
8e85d316c9
|
Removed stored_eula_file from API transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -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
|
f623d05d0c
|
Escape checkout target name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-24 15:27:11 +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 |
|
|
snipe
|
9db8bd782d
|
Merging master down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 18:02:07 +00:00 |
|
|
Godfrey M
|
b2f7262cd2
|
adds table structure for asset history
|
2022-03-14 19:38:36 -07: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
|
e9d297e97d
|
Added cache comment
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 19:37:06 -08:00 |
|
|
snipe
|
9269d5945e
|
Added QR and alt barcode urls to asset transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 19:32:18 -08:00 |
|
|
snipe
|
43c1949092
|
Add remote option to user
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:35:26 -08:00 |
|