Godfrey Martinez
|
0ac5d4d582
|
Merge pull request #8 from Godmartinz/fix-companyable
Fix companyable
|
2023-08-28 19:38:27 -07:00 |
|
Godfrey Martinez
|
d86c63cf23
|
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
|
2023-08-28 19:38:16 -07:00 |
|
Godfrey M
|
74f45a4473
|
reworks company queries for asset history
|
2023-08-28 19:35:46 -07:00 |
|
Godfrey Martinez
|
92e88a0ae2
|
Merge branch 'develop' into ignore_encrypt_and_other_changes
|
2023-08-28 10:14:41 -07:00 |
|
snipe
|
535ca0e3c0
|
Merge pull request #13535 from snipe/fixes/13521_make_modal_upload_button_wider
Fixed #13521 - make modal “select files” button wider
|
2023-08-28 12:41:27 +01:00 |
|
snipe
|
582cad2dc5
|
Fixed #13521 - make modal “select files” button wider
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-28 12:37:42 +01:00 |
|
snipe
|
e3a9c34818
|
Merge pull request #13533 from snipe/improvements/labels_clearer_barcode_text
Clearer labels barcode text
|
2023-08-26 18:08:10 +01:00 |
|
snipe
|
20e9f05a64
|
Tighter layout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-26 17:43:02 +01:00 |
|
snipe
|
844fe0938c
|
Added link to the help docs
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-26 17:42:56 +01:00 |
|
snipe
|
26dd992d3c
|
Merge pull request #13525 from marcusmoore/bug/sc-23660
Fixed undeclared variable in ActionlogsTransformer
|
2023-08-24 17:09:30 +01:00 |
|
Marcus Moore
|
e32c07be02
|
Clear commented log statements
|
2023-08-24 08:15:40 -07:00 |
|
Marcus Moore
|
5a0b0522b0
|
Explicitly declare $clean_meta variable
|
2023-08-24 08:15:07 -07:00 |
|
Godfrey Martinez
|
28cf533d19
|
Merge branch 'develop' into ignore_encrypt_and_other_changes
|
2023-08-23 00:42:59 -07:00 |
|
Godfrey M
|
0fc79ec936
|
fixes conflicts
|
2023-08-23 00:40:59 -07:00 |
|
Godfrey M
|
ffe1b11419
|
merged develop
|
2023-08-23 00:38:58 -07:00 |
|
Godfrey M
|
27488c1009
|
adds soft deletes to eager loading
|
2023-08-23 00:34:09 -07:00 |
|
Godfrey M
|
ce60db009c
|
adds soft deletes to eager loading
|
2023-08-23 00:32:43 -07:00 |
|
snipe
|
d393bd5c97
|
Merge pull request #13511 from snipe/fixes/13510_no_translations_in_migrations
Fixed #13510 - do not use translations in migrations
|
2023-08-23 08:21:18 +01:00 |
|
snipe
|
ea37325806
|
Remove trans() from default values
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-23 08:19:05 +01:00 |
|
snipe
|
31a7758ab1
|
Merge pull request #13509 from marcusmoore/bug/sc-23636
Fixed asset model query in action log transformer
|
2023-08-23 06:58:41 +01:00 |
|
Marcus Moore
|
bee680683d
|
Add withTrashed to asset model query
|
2023-08-22 17:05:06 -07:00 |
|
Godfrey M
|
92ddf8fc67
|
removed dead space
|
2023-08-22 12:38:50 -07:00 |
|
Godfrey M
|
1019287c76
|
retarget key
|
2023-08-22 12:36:43 -07:00 |
|
Godfrey M
|
9e438c3ed0
|
eager loaded changedInfo queries, reworked encrypted data change log changes
|
2023-08-22 12:34:45 -07:00 |
|
Godfrey M
|
c7f2acf2c6
|
removes encrypted info from change log, renames asset_eol_date in the change log
|
2023-08-22 11:39:38 -07:00 |
|
snipe
|
79b330f492
|
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
Fixed Asset acceptance error when user company and asset company don't match
|
2023-08-22 15:49:56 +01:00 |
|
snipe
|
3da21e73e2
|
Merge pull request #13501 from snipe/fixes/checkbox_layout_in_settings
Small fixes to checkbox layout in general settings blade
|
2023-08-22 14:12:15 +01:00 |
|
snipe
|
da38945a53
|
Small fixes to checkbox layout in general settings blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-22 14:10:39 +01:00 |
|
snipe
|
a48762c64d
|
Merge pull request #13496 from snipe/features/setting_for_name_order
Fixed #13495 added setting for name order
|
2023-08-22 12:50:58 +01:00 |
|
snipe
|
23237e5cd3
|
Removed unused translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-22 12:50:32 +01:00 |
|
snipe
|
aafb7668f5
|
Merge pull request #13453 from inietov/fixes/accessories_declined_issue
Fixed #13317 Accessories declined by user remain assigned
|
2023-08-22 12:42:55 +01:00 |
|
snipe
|
fea11ec7f1
|
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
Bulk Editing Custom Fields
|
2023-08-22 12:40:18 +01:00 |
|
snipe
|
303b45c9e9
|
Merge pull request #13485 from Godmartinz/history_info_clean_up
Added better handling of information of asset history
|
2023-08-22 12:25:17 +01:00 |
|
snipe
|
8c7925e703
|
Merge pull request #13436 from marcusmoore/chore/dependency-updates
Bumped dependencies
|
2023-08-21 22:58:52 +01:00 |
|
Marcus Moore
|
191c4f959f
|
Bump guzzlehttp/psr7 to 2.4.5
|
2023-08-21 14:46:08 -07:00 |
|
Marcus Moore
|
1e10a7ee23
|
Bump nyholm/psr7 to 1.6.1
|
2023-08-21 14:45:21 -07:00 |
|
Marcus Moore
|
4e8537a1c7
|
Merge branch 'develop' into chore/dependency-updates
# Conflicts:
# composer.lock
|
2023-08-21 14:44:15 -07:00 |
|
snipe
|
79a4d915db
|
Merge pull request #13456 from marcusmoore/fixes/auto-incrementing-on-74
Fixed passing invalid argument to `strpos()`
|
2023-08-21 22:25:52 +01:00 |
|
Godfrey M
|
b54aaefefb
|
adds some spacing
|
2023-08-21 13:43:06 -07:00 |
|
Godfrey M
|
5076b45a0d
|
adds id to history info
|
2023-08-21 13:40:39 -07:00 |
|
snipe
|
36a343365e
|
Switched from fullName() to getFullNameAttribute()
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:14:07 +01:00 |
|
snipe
|
c617bf89b6
|
Tweak layout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:13:45 +01:00 |
|
snipe
|
ba0643f6a4
|
Added name display format, tweaked some
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:13:28 +01:00 |
|
snipe
|
bfd674b622
|
Switched to getFullNameAttribute() from fullName() in User Presenter
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:12:25 +01:00 |
|
snipe
|
d73d15b8a2
|
Added form macro for name format
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:11:59 +01:00 |
|
snipe
|
8660d41aa3
|
Changed width of locale field
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:11:45 +01:00 |
|
snipe
|
c39579b170
|
New strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:11:25 +01:00 |
|
snipe
|
354550b52e
|
Removed getCompleteNameAttribute(), modified getFullNameAttribute()
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:11:17 +01:00 |
|
snipe
|
f3460b5a4f
|
Switch to getFullNameAttribute() in user transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:10:48 +01:00 |
|
snipe
|
474c03e3fc
|
Added name order to settings save controller method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-21 20:10:03 +01:00 |
|