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

9011 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 389ec3a3cb
Merge pull request #12247 from Godmartinz/gh12225_serial_added_to_components 
adds serial to components tab of assets
 2022-12-13 12:57:50 -08:00
Godfrey M 6a72c344b7 removed the cuddlers 2022-12-13 12:32:30 -08:00
Godfrey M 4442b446b9 adds serial to components tab of assets 2022-12-13 10:30:37 -08:00
snipe c432fb9d70
Merge pull request #12181 from Godmartinz/gh12163_asset_age 
Adds asset age to asset index and asset view pages
 2022-12-13 10:28:17 -08:00
Godfrey M fa872b09a9 fixes a typo, the world is great again 2022-12-12 10:38:31 -08:00
snipe 9e8fff6e5b
Merge pull request #12238 from snipe/features/add_email_to_endpoint 
Add email in assigned_to on asset transformer
 2022-12-09 16:08:35 -08:00
snipe 4ac09ff4e4 Add email in assigned_to on asset transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-09 16:07:17 -08:00
snipe 1017148bad
Merge pull request #12233 from snipe/fixes/translation_placeholder_for_ola_pt-BR 
Fixed #12215 - string for “Hello, :name” in pt-BR was using `%`
 2022-12-08 17:25:19 -08:00
snipe 00ed197651 Fixed #12215 - string for “Hello, :name” in pt-BR was using % 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-08 17:21:55 -08:00
snipe 775df0ab60
Merge pull request #12221 from snipe/fixes/throttles_reset_password_form 
Add throttle for password reset form
 2022-12-08 14:51:22 -08:00
snipe bc2a455a89 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-08 14:48:55 -08:00
snipe 97c28d9adc Add @oguzbilgic as a contributor 2022-12-08 14:44:28 -08:00
snipe 9b3df40ed6
Merge pull request #12231 from oguzbilgic/patch-2 
Use `heroku-redis:mini` instead of `hobby` as It is deprecated
 2022-12-08 11:22:14 -08:00
Oguz Bilgic 1c8ee0f706
Use heroku-redis:mini instead of hobby as It is deprecated 
Heroku has renamed it's plan to `mini`.
 2022-12-08 11:20:33 -08:00
snipe d7c5a6af71
Merge pull request #12224 from Godmartinz/gh12211_img_barcode_adjustment 
Fixes the margin and padding for img barcode in labels
 2022-12-07 16:35:04 -08:00
snipe f7da87520c
Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing 
fixes a regression with the csv assigned to fields
 2022-12-07 16:18:32 -08:00
Godfrey M ec854ddc1d adjusts the margin and padding for img barcode in labels 2022-12-07 14:52:23 -08:00
snipe 1a8b2a169b
Merge pull request #12219 from snipe/fixes/typo_in_sr_text_for_apple 
Fixed typo in screen reader text
 2022-12-07 13:12:07 -08:00
snipe 43acd3b488 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-07 13:11:17 -08:00
snipe c3a6874b16 Add throttle for password reset form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-06 20:42:40 -08:00
snipe b7a5467f8b
Merge pull request #12204 from akemidx/fixcurlyquotes 
Fixed: curly quotes in #12182
 2022-12-05 15:33:47 -08:00
akemi 2f8a435e18 fixing curly quotes 2022-12-05 18:06:28 -05:00
snipe 9ca40716ce
Merge pull request #12197 from inietov/fixes/custom_regex_defaults_to_any 
Fixed #11682  Custom field type of CUSTOM REGEX defaults back to ANY on editing
 2022-12-05 13:24:22 -08:00
snipe 7518cab7c8
Merge pull request #12194 from Godmartinz/FDD32094_Icon_color_change 
changes the life-ring icon color with themes
 2022-12-01 10:04:55 -08:00
Ivan Nieto Vivanco 8d36971c8b Properly select 'CUSTOM REGEX' from the select list if the format declares onee 2022-11-30 16:21:23 -06:00
Godfrey M 371a5bf4d6 changes the icon color with themes 2022-11-30 10:37:47 -08:00
snipe cfc4229308 Add @akemidx as a contributor 2022-11-29 13:15:28 -08:00
snipe 8bf01715a9
Merge pull request #12182 from akemidx/translate_inventory_notification 
Fixed #12119 - updated user inventory language to use strings
 2022-11-29 13:14:32 -08:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
Godfrey M 3206929ee4 adds AgeFormatter, not working yet 2022-11-29 09:51:42 -08:00
snipe 0cc7389b85
Merge pull request #12187 from snipe/features/added_jobtitle_to_print 
Fixed #12133 - Added job title to header in print assets view
 2022-11-28 19:20:46 -08:00
snipe e21d0729c1 Add jobh title to header in print assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:19:42 -08:00
snipe 64a8d1d207
Merge pull request #12185 from snipe/features/add_serial_to_inventory_email 
Added serial number to emailed inventory report
 2022-11-28 17:20:34 -08:00
snipe 8de59d117f Added serial number to emailed inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 17:14:38 -08:00
snipe 6113afe36e
Merge pull request #12125 from inietov/fixes/email_issues 
Fixed #11699 and #12065 Email issues
 2022-11-28 14:09:42 -08:00
snipe 305df42f92
Merge pull request #12167 from inietov/features/no_submit_until_status_selected 
Fixed #11980 Submit button deactivated in Users' Bulk Checkin if no status selected
 2022-11-28 13:17:33 -08:00
snipe 9aa0356de7
Merge pull request #12159 from uberbrady/upgrade_scim_server_to_upstream 
Pulled in latest upstream changes for improved standards-compliance
 2022-11-28 13:15:27 -08:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M 8d861cfd82 adds age to the asset table 2022-11-28 10:59:18 -08:00
Godfrey M 078e7281cd adds asset age to asset view 2022-11-28 10:45:58 -08:00
snipe 3ef578eb56
Merge pull request #12164 from Robert-Azelis/patch-7 
Fix categories view columns matching
 2022-11-23 18:47:02 -08:00
snipe 11a1ab971c
Merge pull request #12166 from inietov/fixes/custom_fields_values_develop 
Fixed #12046 #12137 Custom field checkboxes not holding value for develop
 2022-11-23 18:44:23 -08:00
snipe d226cf189b
Merge pull request #12168 from inietov/fixes/error_accepting_assets 
Fixed #12161 500 error when accepting assets
 2022-11-23 18:41:42 -08:00
Ivan Nieto Vivanco c082d8b90e Return empty string if no MAIL_REPLYTO_ADDR var set 2022-11-23 18:22:31 -06:00
Ivan Nieto Vivanco b1985a08c4 Checks the status before activate the submit button on users bulk-checkin 2022-11-23 17:45:59 -06:00
Ivan Nieto Vivanco 9bafe795b0 Corrected the view when editing custom fields values 2022-11-23 16:34:29 -06:00
Robert-Azelis c2cfd8ff53
Update CategoryPresenter.php 2022-11-23 19:00:08 +01:00
Robert-Azelis 20ad4fb681
Update CategoryPresenter.php 
Fix snipe#12153
 2022-11-23 18:42:38 +01:00
Brady Wetherington 06a1fe5b38 Pulled in latest upstream changes for improved standards-compliance 2022-11-22 12:52:11 -08:00
snipe e426846c23
Merge pull request #12157 from snipe/fixes/inherit_bgcolor_for_readonly 
Fixed background color for readonly date picker fields
 2022-11-22 16:57:34 +00:00