Brady Wetherington
|
8a2f3405d5
|
Merge branch 'develop' into snipeit_v7_laravel10
A lot of changes here, but hopefully this works?
|
2024-01-29 22:12:58 +00:00 |
|
Godfrey M
|
dfa33f651a
|
webhook test works
|
2024-01-29 12:58:09 -08:00 |
|
Godfrey M
|
30c2927987
|
merged develope
|
2024-01-29 11:21:00 -08:00 |
|
Godfrey M
|
e8159d97fa
|
changes
|
2024-01-29 11:12:25 -08:00 |
|
spencerrlongg
|
4cb804cf03
|
get rid of e() on store and update
|
2024-01-26 11:56:02 -06:00 |
|
spencerrlongg
|
2b0dd8851c
|
probably needs more testing... but should work
|
2024-01-26 11:47:09 -06:00 |
|
snipe
|
85a158eaef
|
Merge pull request #14170 from uberbrady/saml_nonce_storage
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
|
2024-01-25 20:14:40 +00:00 |
|
Brady Wetherington
|
81b8243e1d
|
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute
|
2024-01-25 19:53:24 +00:00 |
|
snipe
|
ab926f2e33
|
Merge pull request #14153 from Godmartinz/ms_teams_webhook
Added support for Microsoft Teams Notifications
|
2024-01-25 08:27:17 +00:00 |
|
Marcus Moore
|
f5dafc477a
|
Avoid unnecessary model hydration on asset model show page
|
2024-01-24 16:14:51 -08:00 |
|
Godfrey M
|
6e9a46e582
|
working on Chat integration test
|
2024-01-24 15:50:36 -08:00 |
|
Godfrey M
|
1d3124f89f
|
adding a test variable for test methods
|
2024-01-24 14:38:45 -08:00 |
|
snipe
|
105d4899f5
|
Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-24 20:33:13 +00:00 |
|
Godfrey M
|
ada1a593a4
|
add google placeholder
|
2024-01-24 11:29:32 -08:00 |
|
snipe
|
ba680126bc
|
Properly sort the results based on non-asset fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-24 19:09:06 +00:00 |
|
Godfrey M
|
00f07ac2ce
|
add translations, brush up code
|
2024-01-24 10:38:06 -08:00 |
|
snipe
|
fff21416be
|
Merge pull request #14051 from akemidx/email_in_license_table
Email in License Seat Table
|
2024-01-24 15:37:43 +00:00 |
|
snipe
|
661cc2b460
|
Merge pull request #14131 from Godmartinz/label_engine_translations
Adds translations for Label example
|
2024-01-24 13:36:40 +00:00 |
|
Marcus Moore
|
530ea474d1
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# resources/lang/en/admin/reports/general.php
# resources/views/reports/custom.blade.php
|
2024-01-23 13:55:07 -08:00 |
|
Marcus Moore
|
786c41ad79
|
Add some type hints
|
2024-01-17 17:41:03 -08:00 |
|
Godfrey M
|
ce02e43ab2
|
fixed integration link, added some conditionals
|
2024-01-17 16:30:27 -08:00 |
|
Godfrey M
|
9f2af40ef2
|
adds MS teams integration test
|
2024-01-17 13:41:45 -08:00 |
|
Marcus Moore
|
82f4cc799b
|
Improve variable name
|
2024-01-17 11:54:37 -08:00 |
|
Godfrey M
|
93ef8317e8
|
added payload, new MS webhook test method
|
2024-01-17 11:49:31 -08:00 |
|
Marcus Moore
|
8aa5cf530b
|
Improve radio button values in custom report form
|
2024-01-16 12:33:16 -08:00 |
|
Godfrey M
|
74dc17b4b9
|
adds translations for Label example
|
2024-01-16 10:47:45 -08:00 |
|
snipe
|
66c24e152f
|
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation
Fixed [FD-39640]: preserve sort order when generating asset labels
|
2024-01-11 21:46:01 +00:00 |
|
akemidx
|
a5099b5163
|
translations/messages on report template controller
|
2024-01-10 15:23:42 -05:00 |
|
akemidx
|
27103124bf
|
messages/translations
|
2024-01-09 16:49:56 -05:00 |
|
Marcus Moore
|
423b636db9
|
Guard against non-integers being passed for company_id
|
2024-01-09 10:57:43 -08:00 |
|
Brady Wetherington
|
4b90f85372
|
Fixed [FD-39640]: preserve sort order when generating asset labels
|
2024-01-09 16:37:33 +00:00 |
|
Brady Wetherington
|
f734e196e5
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-01-08 18:57:55 +00:00 |
|
snipe
|
2707c399ea
|
Check that the asset exists before trying to get properties
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-08 12:42:05 +00:00 |
|
snipe
|
f8a21bdb2d
|
Moved limit and offset to after additional qualifiers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-05 11:59:31 +00:00 |
|
Marcus Moore
|
742e183b02
|
Add guard against adding null values to query
Since $request->filled(null) returns true
|
2024-01-04 14:04:00 -08:00 |
|
Marcus Moore
|
740d46a50e
|
Repopulate report after validation error
|
2024-01-02 17:59:30 -08:00 |
|
spencerrlongg
|
901b1b83d0
|
rm code, was probably fixed through rules at some point
|
2024-01-02 18:27:17 -06:00 |
|
Spencer Long
|
8546407083
|
Merge branch 'develop' into refactor/store_asset_form_request
|
2024-01-02 18:05:15 -06:00 |
|
snipe
|
38bd530fae
|
Update en defaults for controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-24 19:44:20 +00:00 |
|
Marcus Moore
|
71761a48ad
|
A few more small clean ups
|
2023-12-20 17:50:55 -08:00 |
|
Marcus Moore
|
9a5c8c4ce6
|
Formatting and clean ups
|
2023-12-20 16:24:48 -08:00 |
|
Marcus Moore
|
0504c09a9a
|
Implement ability to delete templates
|
2023-12-20 16:19:04 -08:00 |
|
Marcus Moore
|
0527201ae5
|
Allow templates to be updated
|
2023-12-20 14:41:23 -08:00 |
|
Marcus Moore
|
26cc4497eb
|
Use dedicated show route for report templates
|
2023-12-20 14:01:46 -08:00 |
|
akemidx
|
ebf760a477
|
translations, UI fixes
|
2023-12-19 18:01:19 -05:00 |
|
snipe
|
a5947b8109
|
Added warning in middleware
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 20:34:45 +00:00 |
|
snipe
|
db138479aa
|
Updated locale middleware for mapping
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 17:43:22 +00:00 |
|
snipe
|
f9139e0f10
|
Changed to use instanceof
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 13:25:32 +00:00 |
|
snipe
|
f13c1a53ef
|
Get an object instead of a collection
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 12:51:35 +00:00 |
|
snipe
|
f08ce34036
|
Fixed translation string in JSON
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 12:31:55 +00:00 |
|