Brady Wetherington
|
350b627ce1
|
Fix numeric sort 'ambiguous order clause' error
|
2024-10-03 14:23:40 +01:00 |
|
akemidx
|
0c84904bf9
|
un'required'ing the rule. not sure what's breaking here but looking
|
2024-10-02 18:56:41 -04:00 |
|
akemidx
|
e00a1aec02
|
note box is now missing when unchecking setting
|
2024-10-02 18:52:33 -04:00 |
|
akemidx
|
06e3bb7fd1
|
requested changes
|
2024-10-02 18:37:11 -04:00 |
|
akemidx
|
492e686b7a
|
Merge remote-tracking branch 'origin/feature/sc-26415' into feature/sc-26415
# Conflicts:
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Assets/AssetCheckoutController.php
# app/Http/Requests/AssetCheckinRequest.php
|
2024-10-02 18:17:38 -04:00 |
|
akemidx
|
17706f150e
|
requested changes
|
2024-10-02 18:15:53 -04:00 |
|
akemidx
|
6fef127cd1
|
missing closing )
|
2024-10-02 18:15:53 -04:00 |
|
akemidx
|
f45b836010
|
backend form validation. +cleanup
|
2024-10-02 18:15:53 -04:00 |
|
akemidx
|
925aea8531
|
back to having tests pass. needed to comment out the notes rules() i added
|
2024-10-02 18:15:53 -04:00 |
|
akemidx
|
bd6698de2a
|
fixing some formatting
|
2024-10-02 18:15:53 -04:00 |
|
akemidx
|
515f59fed9
|
more test work
|
2024-10-02 18:15:52 -04:00 |
|
akemidx
|
5e74b109d9
|
front end changes/updates from gh
|
2024-10-02 18:15:52 -04:00 |
|
akemidx
|
8b643cb3b9
|
note field optional
|
2024-10-02 18:15:52 -04:00 |
|
akemidx
|
700647c53f
|
setting created
|
2024-10-02 18:15:52 -04:00 |
|
akemidx
|
081c5706c4
|
required, but not optional
|
2024-10-02 18:15:52 -04:00 |
|
Marcus Moore
|
ee046a8688
|
Add matching Model::reguard()
|
2024-10-02 10:50:40 -07:00 |
|
snipe
|
b34a7c8aad
|
Removed die()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:48:35 +01:00 |
|
snipe
|
f92bf5dc20
|
Updated language for failure
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:39:27 +01:00 |
|
snipe
|
4d9e85026a
|
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:36:01 +01:00 |
|
snipe
|
1695b8250f
|
Bumped version for master
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 12:41:31 +01:00 |
|
snipe
|
f42eeee666
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-02 12:40:59 +01:00 |
|
snipe
|
54fbd0540d
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-10-02 12:40:49 +01:00 |
|
snipe
|
b483bb1633
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 12:40:45 +01:00 |
|
snipe
|
4db7358086
|
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
|
2024-10-02 12:38:46 +01:00 |
|
snipe
|
dc0949da78
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-02 11:05:06 +01:00 |
|
snipe
|
0dd6f41f66
|
Simplified 2fa if/else
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 11:04:55 +01:00 |
|
snipe
|
0470a7c946
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-02 11:01:05 +01:00 |
|
snipe
|
684c20ae39
|
Fixed parenthasis
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 11:00:49 +01:00 |
|
spencerrlongg
|
3153bbb13f
|
dumb fix
|
2024-10-01 17:04:18 -05:00 |
|
akemidx
|
73a059c9ac
|
missing closing )
|
2024-10-01 16:37:30 -04:00 |
|
Marcus Moore
|
3dc64cc5e0
|
Reference accessory checkout and not the accessory
|
2024-10-01 13:35:39 -07:00 |
|
snipe
|
c32f4e34b4
|
Minor formatting fix
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 20:35:49 +01:00 |
|
snipe
|
c8981f5031
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-01 20:32:41 +01:00 |
|
snipe
|
ca1886cebc
|
Merge pull request #15594 from snipe/localizations/update-2024-10-01
Updated strings
|
2024-10-01 20:31:38 +01:00 |
|
snipe
|
a79dfea40a
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 20:30:58 +01:00 |
|
snipe
|
45ab49eeab
|
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
|
2024-10-01 20:26:42 +01:00 |
|
spencerrlongg
|
8232618a9f
|
change the other one too
|
2024-10-01 14:26:32 -05:00 |
|
spencerrlongg
|
9a651b567d
|
change error to warning
|
2024-10-01 14:24:03 -05:00 |
|
snipe
|
97d00e5aa8
|
Fixed erroneous form tag on anchor
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 20:08:54 +01:00 |
|
Marcus Moore
|
5b90d79494
|
Use created_by
|
2024-10-01 11:50:48 -07:00 |
|
Godfrey M
|
b9cfdf2e54
|
reworked monthly depreciation variable value
|
2024-10-01 11:41:59 -07:00 |
|
spencerrlongg
|
1139acd9f3
|
catch errors around request notifications
|
2024-10-01 13:36:47 -05:00 |
|
Godfrey M
|
b7ad80bd31
|
fix monthly depreciation value
|
2024-10-01 11:24:24 -07:00 |
|
Godfrey M
|
5ffd1b8daa
|
fixes if statement in transformer
|
2024-10-01 11:02:39 -07:00 |
|
snipe
|
9a2117466e
|
Removed placeholder
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 18:23:40 +01:00 |
|
snipe
|
7e3a062984
|
Use <th> for table header in bulk interstitial
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 18:23:07 +01:00 |
|
snipe
|
9cf4b03f59
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-01 14:33:29 +01:00 |
|
snipe
|
d274fb6963
|
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
|
2024-10-01 14:32:48 +01:00 |
|
snipe
|
27ba641aa5
|
Added checkin on delete to API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 14:30:34 +01:00 |
|
snipe
|
5823197e6f
|
Added checkin action on delete for checked out assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 14:29:02 +01:00 |
|