lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
9076 commits 1 branch 0 tags 220 MiB
Commit graph

2350 commits

Author SHA1 Message Date
snipe
ace73acba1
Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment 
Fixed: page-break and padding at the end of document for labels
 2023-01-05 09:59:35 -08:00
Godfrey M
301c4fda6e fixes conflicts 2023-01-05 09:55:25 -08:00
snipe
6d3c5e0659
Merge pull request #12264 from Godmartinz/gh12253_display_notes_accessories 
Added: notes to the accessories tab for user detail view
 2022-12-21 19:04:11 -08:00
Brady Wetherington
75a757d6f5 There was a bug with select-all where some bits didn't quite work 2022-12-20 14:57:58 -08:00
Godfrey M
e791e6592a adds notes to the accessories tab under users 2022-12-20 10:37:19 -08:00
Godfrey M
38575e93e8 fixes the rules for adding page-break and padding at the end of document 2022-12-20 09:45:41 -08:00
snipe
d0c5ba70f6
Merge pull request #12242 from inietov/features/add_purchase_cost_column 
Added `purchase_cost` to user's default view [sc-19680]
 2022-12-15 12:42:29 -08:00
Ivan Nieto Vivanco
d9a21cce00 Add other items' purchase_cost columns to the same permission 2022-12-15 14:12:05 -06:00
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
2e228ccb0b redid a few things. should be good now :) 2022-12-15 10:45:42 -08:00
Ivan Nieto Vivanco
b142f8e012 Add the permission to show purchase cost column to non-admin sessions 2022-12-14 23:00:35 -06: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
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
Ivan Nieto Vivanco
450ad3dcec Added the column purchase_cost to user's default view 2022-12-12 14:17:08 -06:00
Godfrey M
ec854ddc1d adjusts the margin and padding for img barcode in labels 2022-12-07 14:52:23 -08:00
snipe
43acd3b488 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-07 13:11:17 -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
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
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
Godfrey M
078e7281cd adds asset age to asset view 2022-11-28 10:45:58 -08: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
snipe
27898e660c Inherit the background color, since the field isn’t actually technically readonly 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-22 08:54:48 -08:00
Aaron
7c854c0a5c
Fix restore icon in table view 
Signed-off-by: Aaron <admin@datahoarder.dev>
 2022-11-19 10:45:10 +01:00
snipe
f0c5560c1b
Merge pull request #12141 from Godmartinz/adds_serial_number_to_history 
Added `serial` column to the user history page
 2022-11-17 21:15:26 +00:00
Godfrey M
0a9fd0b867 adds serial to activity report page 2022-11-17 13:09:06 -08:00
Godfrey M
5c94ca1403 removes dead space 2022-11-17 13:06:07 -08:00
Godfrey M
86bc409d3a adds serial column to the action logs 2022-11-17 12:57:53 -08:00
Instead of looking elsewhere, it is better to come here together
9056d48775
Fixed: 12095 2022-11-16 18:16:45 +08:00
snipe
60d7128a5e Replace error suppression with better logic 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:41:57 +00:00
Ivan Nieto Vivanco
f0ecab7bb1 Fix typo in variable (ah-hyuck!) 2022-11-15 11:00:40 -06:00
Ivan Nieto Vivanco
7cc8b39863 Checks if settings let URL's be shown in email notifications 2022-11-15 10:55:54 -06:00
Ivan Nieto Vivanco
cd2997b674 Determine if email_logo or logo setting needs to be used in the Forgot Password email 2022-11-15 08:08:26 -06:00
snipe
8122236944
Merge pull request #12096 from snipe/features/add_custom_field_option_to_view_assets 
Added custom field option to view assets
 2022-11-14 22:45:26 +00:00
snipe
602c2698d2 Fixed broken table header tag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:06:23 +00:00
snipe
d4ac7530b6 Removed download button for files that don’t exist on the server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:04:06 +00:00
snipe
4aded5e117 FIxed 500 error if model files are missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:01:33 +00:00
snipe
077d343f01 Prevent 500 if license file is missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 17:42:40 +00:00
snipe
ae95ee49f1 Hide the option if the field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:56:50 +00:00