Commit graph

9443 commits

Author SHA1 Message Date
Brady Wetherington
3a2b54fd47 Add libsodium shim, and mark the sodium extension as 'optional'
Trying to handle some composer.lock conflicts, as savely as possible.
2023-02-15 18:16:39 -08:00
snipe
df64e0e291
Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks
Fixes slack settings submit button availability
2023-02-15 16:28:57 -08:00
snipe
51c9a7d4f8
Merge pull request #12521 from akemidx/weird_checkout_text
Fixed awkward checkout text in checkedout side panel
2023-02-15 16:28:05 -08:00
akemidx
d8d713426d indent? 2023-02-15 19:24:20 -05:00
akemidx
7dd789d5c0 translate no assets at checkout 2023-02-15 19:22:13 -05:00
Godfrey M
2d8c8e8f48 removes lazy loading 2023-02-15 16:16:14 -08:00
Godfrey M
7b510d5f2b greys out submit button conditionally 2023-02-15 15:46:05 -08:00
snipe
221f5f5ca7
Merge pull request #12522 from snipe/fixes/slack_livewire_translations
Fixes slack livewire translations, UI
2023-02-15 14:45:46 -08:00
snipe
d4634e83c9 Nicer padding, removed unused ids
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:45:18 -08:00
snipe
6c3ffa7918 Removed unused CSS
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:39:24 -08:00
snipe
27e5832a28 Use existing slack translations
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:52 -08:00
snipe
2d0bd2b292 Make spinner actually spin
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:40 -08:00
akemidx
b96f2f738d fixed weird phrasing in asset checkout screen 2023-02-15 16:47:48 -05:00
snipe
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
snipe
de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
snipe
25461caa2c Removed date validation rule
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 12:53:55 -08:00
snipe
bfac0fc811
Merge pull request #12470 from inietov/fixes/rollbar_16883_attempt_assign_on_null
Fixed Rollbar 16883 Error: Attempt to assign property "assigned_to" on null
2023-02-15 12:33:32 -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
7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions
Silence E_WARNING "exceptions"
2023-02-15 11:56:37 -08:00
Brady Wetherington
3757c7e353 Make early-boot errors (syntax, others) be more easy-to-read 2023-02-15 11:31:13 -08:00
snipe
3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes
Style fixes
2023-02-15 11:07:59 -08:00
snipe
1ed57d30e0
Merge pull request #12516 from inietov/fixes/quotes_in_custom_field_custom_regex
Fixed #12252 Quotes in Custom Field regex are being HTML-escaped
2023-02-14 20:10:43 -08:00
Brady Wetherington
a1b0eaf128 Got working E_WARNING-in-production going. YAY! 2023-02-14 20:00:06 -08:00
snipe
f7df2ae403
Merge pull request #12513 from Godmartinz/gh12493
adds a red icon next to the  undeployable status
2023-02-14 14:37:06 -08:00
Godfrey M
793cf4823b missing things like mr magoo 2023-02-14 14:35:54 -08:00
Godfrey M
c0d8ff1676 simplified to an else instead of elseif 2023-02-14 14:21:24 -08:00
snipe
b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout
Fix asset names being removed during API checkout requests
2023-02-14 12:22:03 -08:00
Marcus Moore
8e00191b69
Add comment 2023-02-14 12:19:16 -08:00
Marcus Moore
a94f19a68e
Use name if provided by asset checkout request 2023-02-14 12:08:20 -08:00
Godfrey M
0cd558593d adds the red x icon to a false deployable status 2023-02-14 10:34:36 -08:00
Godfrey M
d03e042eda adds a red icon next to broken- not fixable status label 2023-02-14 09:55:48 -08:00
snipe
1520c9c6a7
Merge pull request #12506 from marcusmoore/fix/use-translation-strings-for-importer-errors
Use translation strings for importer exceptions
2023-02-13 14:17:47 -08:00
Marcus Moore
4bdb1cf552
Improve error message wording 2023-02-13 13:34:20 -08:00
Marcus Moore
2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
snipe
2bbbc8158b
Merge pull request #12477 from akemidx/apple_warranty_link
Added functionality to Apple Warranty link
2023-02-13 13:02:33 -08:00
snipe
2f5b4c8e1b
Merge pull request #12498 from akemidx/layout_trans
Translations for the layout setup
2023-02-13 13:01:58 -08:00
Ivan Nieto Vivanco
99122ccb50 Add migration to fix already escaped formats in the database 2023-02-12 17:40:04 -06:00
Ivan Nieto Vivanco
6936efd387 Remove e() function from customfield format input 2023-02-12 16:27:37 -06:00
akemidx
5714824aa7 translations for the layout setup 2023-02-09 17:24:34 -05:00
snipe
e79818967d
Merge pull request #12490 from akemidx/manufacturer_marker
Removed "required" marker for manufacturer on asset models (since it is not actually required)
2023-02-09 12:43:14 -08:00
akemidx
32ed70259e sweedish chef fixes up your typos 2023-02-09 15:39:10 -05:00
snipe
35ab4a4cce
Merge pull request #12489 from marcusmoore/fix/encoding-errors-in-importer
Improve error messaging around invalid characters in import
2023-02-08 15:08:23 -08:00
akemidx
1a651b33fc manufacturer marker removal 2023-02-08 17:31:39 -05:00
Marcus Moore
73f355f3a8
Return 422 instead of 500 when import is invalid 2023-02-08 12:39:42 -08:00
Marcus Moore
b3881a43a7
Fix return type 2023-02-08 12:34:25 -08:00
Marcus Moore
c2c666aef0
Formatting 2023-02-08 12:32:57 -08:00
Marcus Moore
5962f1b627
Catch json encoding exceptions and display them to the user 2023-02-08 12:21:51 -08:00
snipe
a4a3c03a7c
Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report
Fixed #12064 Mail-Template missing translation strings
2023-02-08 10:02:19 -08:00
snipe
e883a61a48
Merge pull request #12480 from snipe/fixes/ui_fix_for_user_files
Fixed UI bug where download button was missing for non-images
2023-02-07 18:46:07 -08:00
snipe
16fcc6dc44 Fixed UI bug where download button was missing for non-images
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 18:40:00 -08:00