DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12507 commits 53 branches 269 tags 314 MiB
Commit graph

3971 commits

Author SHA1 Message Date
Marcus Moore 0881301b6d
Fix language strings 2024-01-23 13:55:20 -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
snipe aceb072a1b Updated URL for apple manufacturer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-18 11:49:30 +00:00
Marcus Moore 1a1f417633
Change variable name to keep foreach scoped 2024-01-17 17:00:03 -08:00
Marcus Moore 82f4cc799b
Improve variable name 2024-01-17 11:54:37 -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
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
akemidx 5f8e91455f clarifying name box 2024-01-10 15:39:32 -05:00
akemidx a5099b5163 translations/messages on report template controller 2024-01-10 15:23:42 -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
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
snipe 50eb257cec Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:12:29 +00:00
Marcus Moore f2d34b2c03
Remove inline javascript 2024-01-02 18:23:57 -08:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe eead7b49e3 Fixed language code 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:07:11 +00: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
Marcus Moore 495d74f7c9
Formatting 2023-12-20 17:11:03 -08:00
Marcus Moore fda77179a3
Simplify url 2023-12-20 16:48:25 -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 9d062f9849
Make control statements more explicit 2023-12-20 16:08:25 -08:00
Marcus Moore 0527201ae5
Allow templates to be updated 2023-12-20 14:41:23 -08:00
Marcus Moore cf5c78029c
Only show template name input on default screen 2023-12-20 14:12:42 -08:00
Marcus Moore 26cc4497eb
Use dedicated show route for report templates 2023-12-20 14:01:46 -08:00