DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9041 commits 89 branches 265 tags 290 MiB
Commit graph

9041 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 3e7975b2c3
Merge pull request #12250 from akemidx/grey_out_pw_reset_button 
Fixed: Grey out pw reset button for consistency
 2022-12-15 11:25:53 -08:00
akemidx d870bc3b02 nested if loop 2022-12-15 14:19:51 -05:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
Godfrey M 9d44720ffd reverted changes to composer.lock 2022-12-15 11:02:34 -08:00
Godfrey M 9f3f0a25ed reverted changes to composer.lock 2022-12-15 10:53:45 -08:00
Godfrey M 2e228ccb0b redid a few things. should be good now :) 2022-12-15 10:45:42 -08:00
Godfrey M 3ee413f379 removes livewire stuff 2022-12-15 09:20:30 -08:00
snipe 418ddcfac3
Merge pull request #9876 from Toreg87/fixes/locations-deletable 
Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
 2022-12-14 17:46:53 -08:00
snipe c342668f0f Update @scoo73r as a contributor 2022-12-14 17:25:39 -08:00
snipe 2f6a26ec7d Add @scoo73r as a contributor 2022-12-14 17:25:25 -08:00
snipe f635278010
Merge pull request #12251 from snipe/security/upgrade_font_awesome 
Upgraded font awesome to 6.2.1
 2022-12-14 16:42:41 -08:00
snipe 8043b86786 Upgraded font awesome to 6.2.1 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-14 16:41:56 -08:00
snipe d13a237000
Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer 
Adds remote field to the user importer
 2022-12-14 12:13:18 -08:00
akemidx b114ffd2c3 Grey out button pw reset button for consistency 
When user has no email in their profile, the box is greyed out for
consistency accross all buttons on the user profile
 2022-12-14 14:48:59 -05:00
snipe fabefa61b0
Merge pull request #12243 from akemidx/new_grey_out_when_no_assets 
Created method in users.php for adding up all assigned to user and pr…
 2022-12-13 14:00:48 -08:00
akemidx f3e57d7dc0 fixing PR 2022-12-13 16:00:59 -05:00
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
akemi 07ae91b00f Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned. 2022-12-12 15:47:53 -05: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
Godfrey M d0d0058e79 removed unwanted changes 2022-12-06 11:19:28 -08:00
Godfrey M bbd04f8876 adds the rest of the fields for Remote 2022-12-06 11:13:24 -08:00
Godfrey M 36901d271b adds csvmatch for remote. Im a bit lost though lol 2022-12-05 16:28:19 -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