snipe
|
7df3be3a54
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-08-09 10:54:49 +01:00 |
|
snipe
|
bd3ba9a5f7
|
Merge pull request #13428 from snipe/security/update_autotable
Updated autotable
|
2023-08-09 10:49:01 +01:00 |
|
snipe
|
a65ac1ccdf
|
Updated autotable
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-09 10:47:45 +01:00 |
|
snipe
|
ffabc9c331
|
Merge pull request #13414 from marcusmoore/fixes/chipperci-config
Fixes ChipperCi Pipeline
|
2023-08-09 10:37:21 +01:00 |
|
snipe
|
a6a742d8d8
|
Merge pull request #13407 from marcusmoore/feature/sc-23465
Added messaging to category edit page to improve clarity around when users will be emailed
|
2023-08-09 10:36:19 +01:00 |
|
snipe
|
15122bbb55
|
Merge pull request #13425 from snipe/security/upgrade_webpack_snyk_13416
Updated webpack
|
2023-08-08 22:24:59 +01:00 |
|
snipe
|
c18349d75f
|
Updated webpack
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 22:07:49 +01:00 |
|
snipe
|
70903f068c
|
Merge remote-tracking branch 'origin/develop'
|
2023-08-08 19:01:40 +01:00 |
|
snipe
|
521961457d
|
Merge pull request #13424 from snipe/bug/sc-23552
Fixed tooltip not loading on encrypted field lock icon on asset detail view
|
2023-08-08 19:00:56 +01:00 |
|
snipe
|
6a3a38b6f6
|
Call tooltip again on custom fields jquery
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 18:53:57 +01:00 |
|
snipe
|
40aca9709a
|
Added container to the tooltip invocation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 18:52:26 +01:00 |
|
snipe
|
5a43c5906f
|
Merge remote-tracking branch 'origin/develop'
|
2023-08-08 17:54:17 +01:00 |
|
snipe
|
9e6f23c8c7
|
Merge pull request #13421 from uberbrady/re_add_asset_eol_date
Re-add the option for asset_eol_date as an import field
|
2023-08-08 17:52:05 +01:00 |
|
Brady Wetherington
|
6afbf1b152
|
Re-add the option for asset_eol_date as an import field
|
2023-08-08 17:45:33 +01:00 |
|
snipe
|
4b2bf057c7
|
Merge remote-tracking branch 'origin/develop'
|
2023-08-08 12:57:27 +01:00 |
|
snipe
|
af91ffb2da
|
Merge pull request #13418 from snipe/fixes/add_mailgun_endpoint
Added mailgun endpoint option, defaulting to the US
|
2023-08-08 12:56:37 +01:00 |
|
snipe
|
94bef046b8
|
Added mailgun endpoint option, defaulting to the US
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 12:50:38 +01:00 |
|
snipe
|
3091d2cdf0
|
Merge remote-tracking branch 'origin/develop'
|
2023-08-08 08:19:15 +01:00 |
|
Marcus Moore
|
b56bcd3596
|
Troubleshooting pipeline: create both .env and .env.testing
|
2023-08-07 11:59:58 -07:00 |
|
Marcus Moore
|
999605b591
|
Troubleshooting pipeline: create .env.testing in place of .env
|
2023-08-07 11:57:34 -07:00 |
|
Marcus Moore
|
d3a45f73cf
|
Troubleshooting pipeline: re-add creating .env.testing
|
2023-08-07 11:48:09 -07:00 |
|
Marcus Moore
|
0d40979724
|
Troubleshooting pipeline: Remove commented commands
|
2023-08-07 11:36:51 -07:00 |
|
Marcus Moore
|
81efa7d84e
|
Revert "Troubleshooting pipeline: use phpunit in place of artisan test"
This reverts commit a7d1657111.
|
2023-08-07 11:35:18 -07:00 |
|
Marcus Moore
|
a7d1657111
|
Troubleshooting pipeline: use phpunit in place of artisan test
|
2023-08-07 11:31:00 -07:00 |
|
Marcus Moore
|
8ea8ff05e5
|
Troubleshooting pipeline: fix filename
|
2023-08-07 11:26:04 -07:00 |
|
Marcus Moore
|
6398805fc3
|
Troubleshooting pipeline: use .env.testing in place of .env.example
|
2023-08-07 11:24:38 -07:00 |
|
Marcus Moore
|
119ed9c882
|
Troubleshooting pipeline: remove comment to trigger build
|
2023-08-07 11:09:10 -07:00 |
|
snipe
|
32d8d8c50e
|
Merge pull request #13397 from uberbrady/fix_locationless_ldap_sync
Fixed #13372: Put guard around assigning location via LDAP
|
2023-08-07 17:06:58 +01:00 |
|
Marcus Moore
|
ae9cf1e5b6
|
Formatting
|
2023-08-02 18:24:32 -07:00 |
|
Marcus Moore
|
d019e62d39
|
Remove lazy from eula field to avoid race condition
|
2023-08-02 18:22:40 -07:00 |
|
Marcus Moore
|
b70a5280f9
|
Remove unneed jquery
|
2023-08-02 18:04:21 -07:00 |
|
Marcus Moore
|
cbe5a9bc8a
|
Persist eula text even when field is disabled
|
2023-08-02 18:03:09 -07:00 |
|
Marcus Moore
|
3fd0853fd0
|
Ensure eula field enabled when not using default eula
|
2023-08-02 18:02:56 -07:00 |
|
Marcus Moore
|
2e7aa01abe
|
Pass checkin_email value to backend even when unchecked
|
2023-08-02 17:45:39 -07:00 |
|
Marcus Moore
|
896f038054
|
Set send email back to original value when eulas cleared
|
2023-08-02 17:03:56 -07:00 |
|
Marcus Moore
|
48979ce177
|
Disable send email when it should not be modified
|
2023-08-02 16:52:56 -07:00 |
|
Marcus Moore
|
e12935f7fa
|
Disable eula textarea when using global eula
|
2023-08-02 16:18:57 -07:00 |
|
Marcus Moore
|
6400034435
|
Improve variable name
|
2023-08-02 16:06:59 -07:00 |
|
Marcus Moore
|
269414e4f2
|
Automatically check the send email to user checkbox in certain conditions
|
2023-08-02 16:04:01 -07:00 |
|
Marcus Moore
|
dee6ebf8e0
|
Scaffold component test
|
2023-08-02 12:58:07 -07:00 |
|
Marcus Moore
|
105c94aea9
|
Implement toggling message when email will be sent
|
2023-08-02 11:36:20 -07:00 |
|
snipe
|
c52a1f94dc
|
Merge remote-tracking branch 'origin/develop'
|
2023-08-02 15:19:23 +01:00 |
|
Brady Wetherington
|
0af205dade
|
Put guard around assigning location via LDAP
|
2023-08-02 15:01:14 +01:00 |
|
Marcus Moore
|
6349d52803
|
WIP: migrate to livewire
|
2023-08-01 17:29:23 -07:00 |
|
Marcus Moore
|
65de9c5e07
|
Extract translation strings
|
2023-08-01 15:21:49 -07:00 |
|
Marcus Moore
|
ebfc395e78
|
Improve messaging
|
2023-08-01 14:39:30 -07:00 |
|
Marcus Moore
|
5c8c2ca027
|
Improve variable names
|
2023-08-01 14:26:21 -07:00 |
|
snipe
|
924f5287f7
|
Merge pull request #13392 from Godmartinz/change_webhook_variable_type
Fixed `webhook_endpoint` data type from varchar to a text
|
2023-08-01 20:28:39 +01:00 |
|
Godfrey M
|
7560afb8c4
|
changes webhook_endpoint var to a text
|
2023-08-01 10:45:39 -07:00 |
|
snipe
|
ffb605a37c
|
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
|
2023-07-31 15:04:22 +01:00 |
|