snipe
5f8e63717d
Merge pull request #14058 from Godmartinz/ldap_test_table_fix
...
Fixed Ldap sync test table and table data from overflowing
2024-01-24 19:31:04 +00:00
snipe
2c7bbfa637
Added additional sort/order hidden fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 19:09:20 +00:00
snipe
dd3b2da670
Updated variable names for clarity, remove the concat of order and sort
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 19:08:47 +00:00
snipe
e6f94cfebf
Missed one
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:47:54 +00:00
snipe
c54eb22754
Moved URL string to general
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:46:52 +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
2d5631284b
Indent
2024-01-23 15:19:36 -08:00
Marcus Moore
3952fc10a6
Re-render order number properly
2024-01-23 15:18:02 -08: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
219540281f
Add trailing commas
2024-01-22 12:42:01 -08:00
Marcus Moore
1630392953
Uncheck a couple boxes by default to match existing behavior
2024-01-18 13:30:51 -08:00
Marcus Moore
861ef6312e
Use is_iterable for checks instead of is_array
2024-01-18 13:04:41 -08:00
Marcus Moore
1a1f417633
Change variable name to keep foreach scoped
2024-01-17 17:00: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
4d8d069bbc
Update placeholder
2024-01-17 11:43:34 -08:00
akemidx
2768f19b7c
code cleanup
2024-01-16 18:56:29 -05:00
Marcus Moore
8aa5cf530b
Improve radio button values in custom report form
2024-01-16 12:33:16 -08:00
Godfrey M
6be8c063a9
added moar translations
2024-01-16 12:05:09 -08:00
akemidx
20bd83232e
standardizing naming to use Template
2024-01-11 19:41:19 -05: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
Marcus Moore
82df7a66ec
Add form label and remove info box from show and edit pages
2024-01-11 13:19:36 -08:00
Marcus Moore
0202a97e97
Add missing tag
2024-01-11 13:08:08 -08:00
Marcus Moore
b34886ead6
Move box header into box
2024-01-11 13:04:46 -08:00
snipe
f610afb1b8
Merge pull request #14121 from Godmartinz/checkout_bug_fix
...
Fixed multiple click checkouts for consumables, accessories and components
2024-01-11 11:15:48 +00:00
akemidx
6f6341bc09
about saved reports box
2024-01-10 16:33:35 -05:00
Godfrey M
1f7f9717c5
fixes checkout bug
2024-01-10 11:35:32 -08:00
akemidx
27103124bf
messages/translations
2024-01-09 16:49:56 -05:00
MrM
9d16eacad5
Added license expiration date in "view asset"
...
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
2024-01-09 18:30:51 +01: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
7c5d29ccd9
Move Google Login prompt higher, made it bigger
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 14:56:34 +00:00
snipe
432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link
...
fixed `departmentNameLinkFormatter` url
2024-01-04 22:40:24 +00:00
Godfrey M
a110b5fcca
ugh
2024-01-04 12:37:53 -08:00
Godfrey M
1f1e58eb1e
remove unintentional change
2024-01-04 12:36:57 -08:00
Godfrey M
32b34ca9b9
departmentNameLinkFormatter had a bad url
2024-01-04 12:33:33 -08:00
spencerrlongg
41e0275c95
htmlentities()
2024-01-03 12:42:36 -06:00
Marcus Moore
f2d34b2c03
Remove inline javascript
2024-01-02 18:23:57 -08:00
Marcus Moore
fcef60445c
Implement radioValue properly
2023-12-21 18:07:46 -08:00
Marcus Moore
7f153b32e4
Always return an array from selectValues method
2023-12-21 16:38:51 -08:00
Marcus Moore
48e5ee2310
Add filtering to remaining selects
2023-12-21 14:19:16 -08:00
Marcus Moore
dc27e67b19
Remove edit and delete buttons from edit template view
2023-12-21 13:13:28 -08:00
Marcus Moore
87853921c3
Formatting
2023-12-21 13:07:11 -08:00
Marcus Moore
8a496ccebc
Formatting
2023-12-21 13:05:56 -08:00
Marcus Moore
3e5f804791
Display "Save" on the update template page button
2023-12-21 13:05:49 -08:00
Marcus Moore
62f8353bd7
Implement model filtering for selectValue method
2023-12-21 13:03:43 -08:00
Marcus Moore
5c0c60a5b9
Formatting
2023-12-21 12:02:54 -08:00
Marcus Moore
6fcbb108c6
Implement test for filtering out invalid models from selectValues
2023-12-21 12:02:48 -08:00
