Godfrey M
|
3f8916ea2e
|
fix duplicate emails being sent in unaccepted reminder command
|
2024-12-05 11:37:03 -08:00 |
|
Godfrey M
|
f6b9ae6aee
|
missed a spot
|
2024-12-05 10:18:35 -08:00 |
|
Godfrey M
|
de41def2b3
|
fixed conditionals
|
2024-12-05 10:15:57 -08:00 |
|
Godfrey M
|
52b051e940
|
add mail class for unaccepted assets reminders
|
2024-12-05 10:08:39 -08:00 |
|
snipe
|
a137e31797
|
Merge pull request #15920 from akemidx/asset-category-in-emails
|
2024-12-04 21:46:43 +00:00 |
|
akemidx
|
ca0f8ace99
|
fixed
|
2024-12-03 16:57:28 -05:00 |
|
akemidx
|
6252f0ac5e
|
layout / added category id
|
2024-12-03 16:10:42 -05:00 |
|
snipe
|
43d66a8fcc
|
Merge pull request #15918 from Godmartinz/mail_name_fix
Adds `MAIL_FROM_NAME` to mail envelope
|
2024-12-03 17:17:26 +00:00 |
|
Godfrey M
|
e5284c03e2
|
fix typo
|
2024-12-03 09:10:50 -08:00 |
|
Godfrey M
|
16283b8fc0
|
adds mail from name to mail envelope
|
2024-12-03 09:08:39 -08:00 |
|
Godfrey M
|
983b78edd9
|
add property check
|
2024-12-02 14:27:04 -08:00 |
|
snipe
|
2ad1407d51
|
Merge pull request #15909 from Godmartinz/checkin-out-notifications
Fixed general webhook option notifications not firing
|
2024-12-02 22:03:32 +00:00 |
|
Godfrey M
|
ab67c48352
|
fix unaccepted assets report resend acceptance
|
2024-12-02 13:03:09 -08:00 |
|
Marcus Moore
|
1d0d14876c
|
Harden asset checkout validation
|
2024-12-02 12:49:02 -08:00 |
|
snipe
|
14730184c9
|
Fixed sr-only blank text
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 18:48:02 +00:00 |
|
snipe
|
8ff099e802
|
Merge pull request #15910 from marcusmoore/chore/include-testing-variable
Included MAIL_FROM_ADDR in phpunit configuration
|
2024-12-02 18:34:08 +00:00 |
|
Marcus Moore
|
ea1f8328b9
|
Include MAIL_FROM_ADDR in phpunit configuration
|
2024-12-02 10:23:02 -08:00 |
|
Godfrey M
|
99464fcd86
|
fixes general webhook not firing
|
2024-12-02 10:19:24 -08:00 |
|
snipe
|
93d4d24194
|
Fixed funky layout in importer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 17:56:15 +00:00 |
|
snipe
|
1bbe9bf6c9
|
Merge remote-tracking branch 'origin/develop'
|
2024-12-02 17:43:03 +00:00 |
|
snipe
|
6874f703bf
|
Some CSS twiddling
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 17:42:26 +00:00 |
|
snipe
|
a7d5b3944e
|
Merge pull request #15908 from snipe/revert-15892-bug/harden-checkout-validation
Revert "Hardened asset checkout validation by requiring integer"
|
2024-12-02 17:42:02 +00:00 |
|
Marcus Moore
|
b5e83899c6
|
Revert "Hardened asset checkout validation by requiring integer"
|
2024-12-02 09:37:21 -08:00 |
|
snipe
|
dcd586e3cd
|
Merge remote-tracking branch 'origin/develop'
|
2024-12-02 17:17:20 +00:00 |
|
snipe
|
1246ab1de7
|
Fixed bulk user form in user detail view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 17:14:36 +00:00 |
|
snipe
|
5a4a3aa8f3
|
Merge remote-tracking branch 'origin/develop'
|
2024-12-02 15:59:25 +00:00 |
|
snipe
|
2220828b00
|
Merge pull request #15904 from snipe/fixes/#15901
Fixed #15901 - re-added required indicator on text and select custom fields
|
2024-12-02 15:51:32 +00:00 |
|
snipe
|
716c67d4b8
|
Fixed #15901 - re-added required indicator on text and select custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 15:45:07 +00:00 |
|
snipe
|
ee4a54be24
|
Fixed order by notes for users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-27 15:48:13 +00:00 |
|
snipe
|
46be1ada60
|
Merge pull request #15892 from marcusmoore/bug/harden-checkout-validation
Hardened asset checkout validation by requiring integer
|
2024-11-27 14:55:11 +00:00 |
|
snipe
|
e1c0a80c20
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-27 13:52:03 +00:00 |
|
snipe
|
2cb1b6d462
|
Use transformer on API update
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-27 13:51:53 +00:00 |
|
snipe
|
37ac7fe25c
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-11-26 20:38:46 +00:00 |
|
snipe
|
11f83b4cd9
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-11-26 20:12:14 +00:00 |
|
snipe
|
0f1d10bd69
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-26 20:12:09 +00:00 |
|
snipe
|
82108f8a18
|
Merge pull request #15208 from akemidx/feature/sc-26415
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
|
2024-11-26 20:11:04 +00:00 |
|
akemidx
|
a7dae10a82
|
fixing line
|
2024-11-26 15:06:25 -05:00 |
|
akemidx
|
2727210c78
|
requested changes from pr
|
2024-11-26 15:04:54 -05:00 |
|
Marcus Moore
|
fcbd5dcae5
|
Harden asset checkout validation by requiring ints
|
2024-11-26 11:33:17 -08:00 |
|
snipe
|
fa80716320
|
Merge pull request #15890 from Godmartinz/mobile-view-fix
Mobile view fix
|
2024-11-26 19:13:39 +00:00 |
|
Godfrey M
|
15c9df0ab1
|
fix mobile view for asset and user
|
2024-11-26 10:59:31 -08:00 |
|
snipe
|
6ee0c93c87
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-26 18:47:22 +00:00 |
|
snipe
|
37e091adbb
|
Merge pull request #15889 from Godmartinz/Fix-user-API-location-update
Fixed Users API `update` from clearing `location_id` unnecessarily
|
2024-11-26 18:45:20 +00:00 |
|
Godfrey M
|
021e82927e
|
fixed mobile view of assets
|
2024-11-26 10:42:59 -08:00 |
|
Godfrey M
|
60642cd902
|
fix user api update from clearing location_id unnecessarily
|
2024-11-26 09:58:17 -08:00 |
|
snipe
|
fd07550803
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-11-25 14:19:05 +00:00 |
|
snipe
|
30b481bc93
|
Updated version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-25 14:18:31 +00:00 |
|
snipe
|
25bfd3e845
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-25 13:05:28 +00:00 |
|
snipe
|
0f18ee86f7
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-25 13:05:05 +00:00 |
|
snipe
|
4a5f65616f
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-25 12:56:08 +00:00 |
|