snipe
|
2e1c3fb51b
|
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields
Fixed #11794 Admins Cannot View Encrypted Field
|
2023-07-31 13:08:28 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
Ivan Nieto Vivanco
|
ecf522243b
|
Add the new rule to proper views and also in the Asset Transformer
|
2023-07-19 19:52:03 -06:00 |
|
|
snipe
|
a19a508a80
|
Merge pull request #13197 from akemidx/current_value_for_assets
Current value added to asset index page
|
2023-07-19 19:06:15 +01:00 |
|
|
snipe
|
3078cab7ee
|
Added ability to show/hide custom fields in list views by default
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-14 09:09:43 +01:00 |
|
|
snipe
|
016502f637
|
Added notesFormatter
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-13 13:14:10 +01:00 |
|
|
snipe
|
5d1f294f0e
|
Added parseEscapedMarkedownInline to accessories API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-13 12:03:01 +01:00 |
|
|
Ivan Nieto Vivanco
|
e0df8cc4aa
|
Add admin role to show encrypted customfield values
|
2023-07-11 17:21:32 -06:00 |
|
|
snipe
|
6d3bf1e5f5
|
Added additional method for inline
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 11:41:58 +01:00 |
|
|
snipe
|
9dc7fc93fb
|
Small fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 11:14:19 +01:00 |
|
|
snipe
|
14c61e4c17
|
Added phone, fax to departments, locations, companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:44:21 +01:00 |
|
|
snipe
|
8d8adc1639
|
Use the Helper::parseEscapedMarkedown in notes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-28 15:02:32 +01:00 |
|
Marcus Moore
|
ab51857854
|
Check to see if model relationship exists before using it
|
2023-06-27 19:35:55 -07:00 |
|
akemidx
|
8725d40f8d
|
current value added to asset index page. translations for this in reports
|
2023-06-22 17:00:42 -04:00 |
|
Godfrey M
|
fc86530c94
|
uses the trueFalseFormatter now
|
2023-06-13 09:10:42 -07:00 |
|
|
Godfrey M
|
69325beddb
|
adds warranty confirmation to asset maintenance table
|
2023-06-12 11:03:32 -07:00 |
|
|
snipe
|
b716f9f55e
|
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
Added ability to auto-add fields to new fieldsets
|
2023-05-03 11:04:33 -07:00 |
|
|
snipe
|
567e19bcc0
|
Added missing case for licenses for item_count
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-27 16:26:50 -07:00 |
|
|
snipe
|
54a766c4f9
|
Added dynamic warranty URL to manufacturers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:39:15 -07:00 |
|
|
snipe
|
28d9cec1e3
|
Added auto_add_to_fieldsets to API response
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 20:59:48 -07:00 |
|
|
snipe
|
6a94a2f515
|
Return true/false for autoassign_licenses in the API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 15:25:26 -07:00 |
|
|
snipe
|
79ff6a8fc2
|
Disallow deleting in the API view if there are things checked out
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 12:30:23 -07:00 |
|
|
snipe
|
ab7c75232b
|
Added supplier to transformers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:10:51 -07:00 |
|
|
snipe
|
6e183f2ced
|
Added counters for consumables and components
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:10:32 -07:00 |
|
|
snipe
|
6bc0df73e8
|
Merge pull request #12661 from Godmartinz/gh12655_missing_translations
Adds translations for category types to index and edit of categories
|
2023-03-24 07:09:40 -07:00 |
|
|
snipe
|
473211397f
|
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent
Livewire importer without subcomponent
|
2023-03-21 23:07:04 -07:00 |
|
|
snipe
|
ecb11c3a12
|
Fixed #12682 - add default location to maintenance report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 13:52:21 -07:00 |
|
|
snipe
|
4f8542b71b
|
Merge pull request #12680 from akemidx/clone_accessories
Clone accessories
|
2023-03-21 13:37:04 -07:00 |
|
|
akemidx
|
3134279a95
|
small edits
|
2023-03-21 15:48:53 -04: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 |
|
|
Godfrey M
|
371e142bae
|
removes unnecessary function
|
2023-03-15 15:57:45 -07:00 |
|
|
akemidx
|
a3353b8496
|
committing
|
2023-03-15 13:48:22 -04:00 |
|
|
Godfrey M
|
576b8f8c48
|
adds translations to edit and index of categories
|
2023-03-13 13:33:03 -07:00 |
|
|
snipe
|
88eb73d160
|
Use Carbon’s diffForHumans() method instead of our own home-grown stuff
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-08 16:47:54 -08:00 |
|
|
akemidx
|
ec5836dab4
|
cloning accessories first bit
|
2023-03-07 16:41:48 -05:00 |
|
|
snipe
|
2cb06165c4
|
Added missing vip field to transformer and request
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 15:00:04 -08:00 |
|
|
snipe
|
dac877f184
|
Added location clone
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-01 13:51:35 -08:00 |
|
|
snipe
|
1f7ae08d76
|
Merge branch 'develop' into features/make_eol_sortable
|
2023-02-28 18:05:09 -08:00 |
|
|
snipe
|
057f0be20a
|
Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null
Fixed ErrorException: Attempt to read property "id" on null [sc-19855]
|
2023-02-15 12:32:53 -08:00 |
|
|
snipe
|
dd5f256450
|
We shouldn’t need this because aliases??
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-07 11:02:02 -08:00 |
|
|
Ivan Nieto Vivanco
|
d4c838a979
|
Add condition in activity report to only access assigned item id if it exist
|
2023-02-07 11:26:49 -06:00 |
|
|
cram42
|
c2c009a018
|
Merge branch 'develop' into develop
|
2023-01-24 09:53:42 +08:00 |
|
|
snipe
|
5f9af7d509
|
Updated API response
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:56:28 -08:00 |
|
|
snipe
|
90c1631820
|
Added users_count to transformer for API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:40:35 -08:00 |
|
|
snipe
|
f626413502
|
Added byod to API transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-18 13:04:02 -08:00 |
|
|
snipe
|
4ef0005e7c
|
BREAKING: changed API fieldname result for 2FA
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-17 17:21:40 -08:00 |
|
|
snipe
|
8f3a237ea0
|
More comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:29:51 -08:00 |
|
|
snipe
|
249b188654
|
Refactor category API and transformer for query optimization
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 13:30:01 -08:00 |
|
|
snipe
|
381f89c5a8
|
Added format to array
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-05 13:15:30 -08:00 |
|
|
snipe
|
db43628bdc
|
Added default field info to models API response
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-05 13:12:54 -08:00 |
|
|
snipe
|
c432fb9d70
|
Merge pull request #12181 from Godmartinz/gh12163_asset_age
Adds asset age to asset index and asset view pages
|
2022-12-13 10:28:17 -08:00 |
|
|
Godfrey M
|
fa872b09a9
|
fixes a typo, the world is great again
|
2022-12-12 10:38:31 -08:00 |
|
|
snipe
|
4ac09ff4e4
|
Add email in assigned_to on asset transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-12-09 16:07:17 -08:00 |
|
|
Godfrey M
|
3206929ee4
|
adds AgeFormatter, not working yet
|
2022-11-29 09:51:42 -08:00 |
|
|
Godfrey M
|
8d861cfd82
|
adds age to the asset table
|
2022-11-28 10:59:18 -08:00 |
|
|
Godfrey M
|
86bc409d3a
|
adds serial column to the action logs
|
2022-11-17 12:57:53 -08:00 |
|
|
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 |
|
Cram42
|
4bb40adfce
|
Add Asset Tag as separate supported feature
|
2022-11-02 16:07:50 +08:00 |
|
|
Cram42
|
6b2fe582ca
|
Merge branch 'feature-label2' into develop
|
2022-11-01 20:12:28 +08:00 |
|
|
Cram42
|
5558a005b9
|
Implement API for labels
|
2022-11-01 19:57:51 +08: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 |
|