spencerrlongg
e7b9903341
delete some extra lines
2024-03-20 15:29:06 -05:00
spencerrlongg
e3e01e07b1
final cleanup
2024-03-20 15:23:45 -05:00
spencerrlongg
d18aa1db98
some more cleanup + tests
2024-03-20 15:18:15 -05:00
spencerrlongg
fdf0be09db
all tests passing
2024-03-20 13:43:01 -05:00
Spencer Long
b4b4927370
Merge branch 'develop' into bug/sc-24884
2024-03-20 12:36:39 -05:00
snipe
321414f6e3
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:38:48 +00:00
snipe
7787fe42c8
Added avif to helpers
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:30:28 +00:00
snipe
3b66912742
Fixed #14460 - added support for avif
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:25:02 +00:00
spencerrlongg
0ffceb9691
some notes and a little progress
2024-03-20 00:07:52 -05:00
spencerrlongg
1e810d2426
most tests now passing, still one broken
2024-03-19 19:47:26 -05:00
spencerrlongg
c0110e7f29
some more tests and refinement
2024-03-19 19:27:35 -05:00
Godfrey M
62745923cf
fixes API location delete
2024-03-19 15:25:28 -07:00
Godfrey M
090466123f
add withCount to query instead
2024-03-19 15:18:18 -07:00
Godfrey M
38a3e36cd6
fixes translation usage
2024-03-19 14:32:21 -07:00
Godfrey M
e8dc634a40
fixes translation usage
2024-03-19 14:30:53 -07:00
Godfrey M
0d0984a400
Bulk Delete Locations does not work [sc-25100]
2024-03-19 14:26:40 -07:00
snipe
7bae4c39c6
Merge pull request #14401 from uberbrady/fix_locale_warning
...
Fix [sc-25008] - correct and improve legacy language warnings
2024-03-14 15:42:28 +00:00
snipe
cce8cb4f5e
Move requestable scope below sorting, etc
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-14 13:24:22 +00:00
spencerrlongg
f6ab0f8f46
lots of cleanup to do, but this DOES work
2024-03-13 15:57:10 -05:00
spencerrlongg
f01b205486
some changes
2024-03-13 15:10:51 -05:00
spencerrlongg
8962ced038
push to switch branches
2024-03-13 10:40:50 -05:00
spencerrlongg
04d7884af8
some more testing stuff
2024-03-12 23:17:40 -05:00
spencerrlongg
6732b6601e
some cool progress, but something with unique not working
2024-03-12 18:33:59 -05:00
snipe
3f5cc2507d
Used updated_at instead
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-10 16:39:49 +00:00
snipe
5a85424295
Added created_at to license pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-10 16:33:04 +00:00
snipe
a289dfaf88
Cleanup
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-10 14:33:53 +00:00
snipe
cde5502f94
Handle blank labels on asset label fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-10 14:03:21 +00:00
spencerrlongg
eb8f1dd553
some cleanup
2024-03-09 12:29:26 -06:00
spencerrlongg
c8341d9dc4
aha, got it working.
2024-03-08 19:48:47 -06:00
spencerrlongg
b239b3a4db
some good progress, lots of testing needs to be done on the new inclusion of SubstituteBindings
2024-03-08 18:24:41 -06:00
snipe
37dfecf098
Fixed uninitialized offset in labels
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-08 16:46:56 +00:00
Brady Wetherington
a2e70dd6b2
Fix [sc-25008] - correct and improve legacy language warnings
...
The legacy language warning was misfiring when a user's language
didn't match the APP_LOCALE from .env.
Additionally, we weren't properly warning when the legacy-language
came from Settings or from the user themselves. Both of which should
be impossible but still probably not a bad idea to warn on it, anyways
2024-03-08 14:04:21 +00:00
snipe
112ddaf55b
Merge pull request #14394 from marcusmoore/fixes/check-endpoint-is-set-for-checkout-in-notifications
...
Ensure Chat and Teams endpoints are not blank before attempting to send webhook on checkout and check in
2024-03-08 08:44:52 +00:00
Marcus Moore
4b0bfc52b4
Ensure webhook endpoint is set before attempting to send to google or microsoft
2024-03-07 18:10:10 -08:00
snipe
e8be178ac7
Merge pull request #14393 from marcusmoore/bug/sc-24862
...
Guard against checking require acceptance on non-existent relationship in accessory model
2024-03-08 01:04:26 +00:00
Marcus Moore
695428cd44
Guard against unrelated category
2024-03-07 16:59:01 -08:00
snipe
5cf10cec34
Remloved unneeded validation message
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 23:40:30 +00:00
snipe
c66267a0f9
Merge pull request #14389 from Godmartinz/remove-pdf-for-old-labels
...
old engine works as intended
2024-03-07 21:06:57 +00:00
Godfrey M
d83974e07f
old engine works as intended
2024-03-07 13:03:10 -08:00
Marcus Moore
f270f30728
Redirect if no assets are returned from query
2024-03-07 12:30:08 -08:00
snipe
d64ee42ec3
Wrapped in a transaction
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 15:04:08 +00:00
snipe
fe08f39900
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 14:43:06 +00:00
snipe
5123ab57c9
Added console command to encrypt previously unencrypted fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 14:40:52 +00:00
snipe
4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug
...
Default label setup with custom fields
2024-03-07 10:33:43 +00:00
snipe
4231058aa1
Merge pull request #14371 from Godmartinz/RB17900_notification_bug
...
Adds User email check when sending Asset acceptance reminder
2024-03-07 10:18:19 +00:00
Godfrey M
ff7d25c0f2
simplified 1dbarcode logic
2024-03-06 15:30:53 -08:00
Godfrey M
5f0b7f328c
if statement order change
2024-03-06 15:24:03 -08:00
Godfrey M
6559581bad
conditions 1dbarcode to populate based on settings
2024-03-06 15:10:42 -08:00
Godfrey M
d78262f52b
resolved merge conflicts
2024-03-06 14:48:47 -08:00
snipe
a85e2f7aad
Merge pull request #14372 from snipe/bug/sc-24158
...
Added route parameter
2024-03-06 19:45:33 +00:00
