snipe
|
d187174f00
|
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator
Added: validation for department names at Company locations
|
2022-12-22 11:29:12 -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 |
|
snipe
|
a6c7471bf5
|
Merge remote-tracking branch 'origin/develop'
|
2022-12-20 15:11:36 -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
|
b89979fbec
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2022-12-14 17:06:26 -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 |
|
Ivan Nieto Vivanco
|
450ad3dcec
|
Added the column purchase_cost to user's default view
|
2022-12-12 14:17:08 -06:00 |
|
snipe
|
e26036e998
|
Merge remote-tracking branch 'origin/develop'
|
2022-12-08 17:36:01 -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
|
163b3f6c0b
|
Merge remote-tracking branch 'origin/develop'
|
2022-12-08 14:37:35 -08:00 |
|
snipe
|
743264fd0e
|
Merge remote-tracking branch 'origin/develop'
|
2022-12-07 16:23:50 -08: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 |
|
snipe
|
97731cd7c8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/mix-manifest.json
|
2022-12-05 16:34:34 -08:00 |
|
Godfrey M
|
36901d271b
|
adds csvmatch for remote. Im a bit lost though lol
|
2022-12-05 16:28:19 -08: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
|
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 |
|
snipe
|
9c205f63ae
|
Merge remote-tracking branch 'origin/develop'
|
2022-11-28 19:21:19 -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
|
c46dc99e86
|
Merge remote-tracking branch 'origin/develop'
|
2022-11-28 17:20:57 -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
|
d5e702ac74
|
Merge remote-tracking branch 'origin/develop'
|
2022-11-28 14:12: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 |
|
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 |
|
Ivan Nieto Vivanco
|
b1985a08c4
|
Checks the status before activate the submit button on users bulk-checkin
|
2022-11-23 17:45:59 -06:00 |
|