DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 08:47:35 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9581 commits 89 branches 265 tags 290 MiB
Commit graph

9581 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx a84081068d functionality to Apple Warranty link 2023-02-15 11:33:07 -08:00
akemidx d9857d955b translations for the layout setup 2023-02-15 11:33:07 -08:00
akemidx 66251bfd8a sweedish chef fixes up your typos 2023-02-15 11:33:07 -08:00
akemidx 677f7a446e manufacturer marker removal 2023-02-15 11:33:07 -08:00
Marcus Moore fdce6f98ff Return 422 instead of 500 when import is invalid 2023-02-15 11:33:07 -08:00
Marcus Moore 5a00685c81 Fix return type 2023-02-15 11:33:07 -08:00
Marcus Moore 18f0b1cc3d Formatting 2023-02-15 11:33:07 -08:00
Marcus Moore 6da43bc940 Catch json encoding exceptions and display them to the user 2023-02-15 11:33:07 -08:00
Ivan Nieto Vivanco 98187773f7 Adds translation strings to theinventory report sent to users 2023-02-15 11:33:07 -08:00
Brady Wetherington 3757c7e353 Make early-boot errors (syntax, others) be more easy-to-read 2023-02-15 11:31:13 -08:00
snipe 3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes 
Style fixes
 2023-02-15 11:07:59 -08:00
snipe 1ed57d30e0
Merge pull request #12516 from inietov/fixes/quotes_in_custom_field_custom_regex 
Fixed #12252 Quotes in Custom Field regex are being HTML-escaped
 2023-02-14 20:10:43 -08:00
Brady Wetherington a1b0eaf128 Got working E_WARNING-in-production going. YAY! 2023-02-14 20:00:06 -08:00
snipe f7df2ae403
Merge pull request #12513 from Godmartinz/gh12493 
adds a red icon next to the  undeployable status
 2023-02-14 14:37:06 -08:00
Godfrey M 793cf4823b missing things like mr magoo 2023-02-14 14:35:54 -08:00
Godfrey M c0d8ff1676 simplified to an else instead of elseif 2023-02-14 14:21:24 -08:00
snipe b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout 
Fix asset names being removed during API checkout requests
 2023-02-14 12:22:03 -08:00
Marcus Moore 8e00191b69
Add comment 2023-02-14 12:19:16 -08:00
Marcus Moore a94f19a68e
Use name if provided by asset checkout request 2023-02-14 12:08:20 -08:00
Godfrey M 0cd558593d adds the red x icon to a false deployable status 2023-02-14 10:34:36 -08:00
Godfrey M d03e042eda adds a red icon next to broken- not fixable status label 2023-02-14 09:55:48 -08:00
snipe 2dd7690d2d
Merge pull request #12464 from snipe/dependabot/github_actions/docker/build-push-action-4 
Bump docker/build-push-action from 3 to 4
 2023-02-13 14:45:21 -08:00
snipe 1520c9c6a7
Merge pull request #12506 from marcusmoore/fix/use-translation-strings-for-importer-errors 
Use translation strings for importer exceptions
 2023-02-13 14:17:47 -08:00
Marcus Moore 4bdb1cf552
Improve error message wording 2023-02-13 13:34:20 -08:00
Marcus Moore 2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
snipe 2bbbc8158b
Merge pull request #12477 from akemidx/apple_warranty_link 
Added functionality to Apple Warranty link
 2023-02-13 13:02:33 -08:00
snipe 2f5b4c8e1b
Merge pull request #12498 from akemidx/layout_trans 
Translations for the layout setup
 2023-02-13 13:01:58 -08:00
Ivan Nieto Vivanco 99122ccb50 Add migration to fix already escaped formats in the database 2023-02-12 17:40:04 -06:00
Ivan Nieto Vivanco 6936efd387 Remove e() function from customfield format input 2023-02-12 16:27:37 -06:00
Ivan Nieto Vivanco f0bf16d784 Fix more uneven tags 2023-02-12 12:01:40 -06:00
Ivan Nieto Vivanco 9a68a747a0 Fix uneven tags 2023-02-12 11:59:56 -06:00
Ivan Nieto Vivanco 81cc9f3700 Adds images to emailed user inventory report 2023-02-12 08:23:50 -06:00
akemidx 5714824aa7 translations for the layout setup 2023-02-09 17:24:34 -05:00
snipe e79818967d
Merge pull request #12490 from akemidx/manufacturer_marker 
Removed "required" marker for manufacturer on asset models (since it is not actually required)
 2023-02-09 12:43:14 -08:00
akemidx 32ed70259e sweedish chef fixes up your typos 2023-02-09 15:39:10 -05:00
snipe 35ab4a4cce
Merge pull request #12489 from marcusmoore/fix/encoding-errors-in-importer 
Improve error messaging around invalid characters in import
 2023-02-08 15:08:23 -08:00
akemidx 1a651b33fc manufacturer marker removal 2023-02-08 17:31:39 -05:00
Marcus Moore 73f355f3a8
Return 422 instead of 500 when import is invalid 2023-02-08 12:39:42 -08:00
Marcus Moore b3881a43a7
Fix return type 2023-02-08 12:34:25 -08:00
Marcus Moore c2c666aef0
Formatting 2023-02-08 12:32:57 -08:00
Marcus Moore 5962f1b627
Catch json encoding exceptions and display them to the user 2023-02-08 12:21:51 -08:00
snipe a4a3c03a7c
Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report 
Fixed #12064 Mail-Template missing translation strings
 2023-02-08 10:02:19 -08:00
snipe 201728989f
Merge pull request #12486 from svpernova09/patch-1 
Don't auto assign feature requests to Snipe
 2023-02-08 07:59:58 -08:00
Joe Ferguson dea175bd40
Don't auto assign feature requests to Snipe 2023-02-08 09:57:54 -06:00
snipe 23b1e8da27 Merge remote-tracking branch 'origin/develop' 2023-02-07 18:46:30 -08:00
snipe e883a61a48
Merge pull request #12480 from snipe/fixes/ui_fix_for_user_files 
Fixed UI bug where download button was missing for non-images
 2023-02-07 18:46:07 -08:00
snipe 16fcc6dc44 Fixed UI bug where download button was missing for non-images 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 18:40:00 -08:00
Ivan Nieto Vivanco 49b6a1cc53 Adds translation strings to theinventory report sent to users 2023-02-07 18:29:19 -06:00
akemidx 75f3cb3079 fixing external if statement 2023-02-07 19:02:12 -05:00
akemidx c0074baa26 functionality to Apple Warranty link 2023-02-07 17:27:39 -05:00