akemidx
|
a8643e5d35
|
cleaning up/adding variable
|
2023-02-01 15:55:16 -05:00 |
|
Godfrey M
|
f95a904d90
|
adds integration button, working on its functionality
|
2023-02-01 12:08:13 -08:00 |
|
snipe
|
f7ae5db4f3
|
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories
|
2023-01-31 19:56:43 -08:00 |
|
snipe
|
de1141491a
|
Replaced help text
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-31 19:41:42 -08:00 |
|
Brady Wetherington
|
02ca5248b1
|
Don't append username to the user's name if it's already there
|
2023-01-31 17:44:09 -08:00 |
|
Godfrey M
|
1e0c58c3cf
|
saves data correctly now
|
2023-01-31 11:32:05 -08:00 |
|
Ivan Nieto Vivanco
|
a7a578bf51
|
Added head only logo to be used as default in apple-touch-icon
|
2023-01-31 00:13:44 -06:00 |
|
Godfrey M
|
fc044528b8
|
validation is working, success message appears, database is not updating
|
2023-01-30 16:10:02 -08:00 |
|
akemidx
|
214a1af61a
|
apostrophe updates
|
2023-01-30 16:54:23 -05:00 |
|
snipe
|
583a0412fe
|
Added edit fieldsets translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-26 17:03:23 -08:00 |
|
snipe
|
a16604285c
|
Normalize the fieldset form
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-26 17:03:07 -08:00 |
|
snipe
|
37f5cfa8ce
|
Added edit button for fieldsets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-26 17:02:53 -08:00 |
|
Godfrey M
|
a63ea560ae
|
adds submit button, getting setAttribute error
|
2023-01-26 15:17:08 -08:00 |
|
akemidx
|
79d9cff22a
|
translations added for the hardware blades
|
2023-01-26 16:26:31 -05:00 |
|
Godfrey M
|
a69cb6204a
|
adds rest of inputs, and corrects Data binding
|
2023-01-25 16:22:34 -08:00 |
|
Godfrey M
|
2e22eeade5
|
adds one input
|
2023-01-25 14:29:20 -08:00 |
|
akemidx
|
53d8008a5f
|
Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag
|
2023-01-25 17:14:29 -05:00 |
|
akemidx
|
b363524305
|
vipuser label updated to vip
|
2023-01-25 15:58:44 -05:00 |
|
snipe
|
4c3354b778
|
Merge branch 'develop' into vip_tag
|
2023-01-24 20:29:43 -08:00 |
|
Brady Wetherington
|
b00333c9f5
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2023-01-24 17:36:39 -08:00 |
|
Brady Wetherington
|
c9f0f5fe8b
|
Change Accessories report to use server-side pagination from URL
|
2023-01-24 17:35:44 -08:00 |
|
snipe
|
a61ccbb965
|
Added very clunky but better error messages on that validation for date_format
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-24 17:33:49 -08:00 |
|
snipe
|
91394f7262
|
Removed duplicate comment section
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-24 17:23:06 -08:00 |
|
akemidx
|
3ba79600fb
|
checkin limit for the components checkin
|
2023-01-24 18:17:49 -05:00 |
|
akemidx
|
cafe8f3074
|
notification for slack message
|
2023-01-24 16:20:20 -05:00 |
|
akemidx
|
596846a94a
|
Add VIP Checkbox
|
2023-01-24 15:29:27 -05:00 |
|
Godfrey M
|
4b51424723
|
fixes a couple buttons color choices in high contrast
|
2023-01-24 09:42:03 -08:00 |
|
Godfrey M
|
0f8ee22053
|
Creates Slack Setting Form
|
2023-01-24 09:25:05 -08:00 |
|
snipe
|
7a9ea91be0
|
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
|
2023-01-23 21:39:55 -08:00 |
|
akemidx
|
25996cbe03
|
translating the quick info printed out on accept x eula blades
|
2023-01-23 16:18:21 -05:00 |
|
snipe
|
4104d7260f
|
Include new eol date picker blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:55:31 -08:00 |
|
snipe
|
3587017591
|
Updated EOL date in view blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:55:19 -08:00 |
|
snipe
|
8040d08e8c
|
Removed formatter from EOL date
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:54:37 -08:00 |
|
snipe
|
abad579306
|
Added eol date picker
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-22 00:45:33 -08:00 |
|
snipe
|
72295c093a
|
Add CSS to the div to correct the weird indenting - fixes #12388
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 18:24:23 -08:00 |
|
snipe
|
2dc1182582
|
Don’t offer the delete option if there is no avatar currently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 18:20:26 -08:00 |
|
snipe
|
93ad0d02b9
|
Use fieldname for aria labels too
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 18:20:02 -08:00 |
|
snipe
|
3674f46ce0
|
Added arial labels
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 16:42:44 -08:00 |
|
snipe
|
cfa342c81a
|
Updated HTML for “standard” image edit/delete
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 16:23:04 -08:00 |
|
snipe
|
563a252d18
|
Updated checkboxed with missing minimal class for iCheck
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:57:52 -08:00 |
|
snipe
|
2bdf3d3f44
|
Missed a few strong HTML tags
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:44:10 -08:00 |
|
snipe
|
56090bc645
|
Re-ordered notes to be more consistent, fixed missing iCheck class
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:38:35 -08:00 |
|
snipe
|
fd73bee850
|
Fixed hardcoded string and added new checkout count to accessory view
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:38:05 -08:00 |
|
Marcus Moore
|
0fa956403c
|
Fix row divider overflow
|
2023-01-19 14:16:28 -08:00 |
|
Ivan Nieto Vivanco
|
f045008237
|
Add index to deleteFile() call, so it knows what element delete
|
2023-01-19 13:04:49 -06:00 |
|
snipe
|
fa9116b184
|
Merge pull request #12369 from snipe/features/add_byod_to_assets
Added BYOD to assets
|
2023-01-18 16:09:45 -08:00 |
|
Marcus Moore
|
c089f6eff2
|
Reference the accessory instance instead of the model
|
2023-01-18 13:48:01 -08:00 |
|
Marcus Moore
|
e506ed7950
|
Remove extra quote
|
2023-01-18 13:42:09 -08:00 |
|
Marcus Moore
|
07744ca7bd
|
Reference the consumable instance instead of the model
|
2023-01-18 13:41:58 -08:00 |
|
snipe
|
0c39c7a53d
|
Updated blades to add byod as a “status”
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-18 13:25:46 -08:00 |
|
snipe
|
fce620b54f
|
Added byod to blades
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-18 13:11:02 -08:00 |
|
snipe
|
33fe2b57f7
|
Added new byod strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-18 13:10:48 -08:00 |
|
Marcus Moore
|
ca1198ceb2
|
Constrain the bottom bar to the content window
|
2023-01-18 12:55:20 -08:00 |
|
Marcus Moore
|
b31e000165
|
Have Info and History tables in accessory show page span entire width of row
|
2023-01-18 12:54:52 -08:00 |
|
Godfrey M
|
7ce230fadc
|
missed a few renames
|
2023-01-18 08:57:59 -08:00 |
|
Godfrey M
|
6fbb484dfd
|
renames db column for auto_assign boolean, rewords trans string, default value of 1 now
|
2023-01-18 08:43:03 -08:00 |
|
Marcus Moore
|
5282ca47b3
|
Allow users with consumables.files ability to upload files for consumables
|
2023-01-17 17:16:50 -08:00 |
|
Marcus Moore
|
1f12137245
|
Close divs in correct location
|
2023-01-17 17:09:55 -08:00 |
|
Marcus Moore
|
6c89f08193
|
Register the accessories.files ability and allow users with the ability to upload files for accessories
|
2023-01-17 16:59:50 -08:00 |
|
Marcus Moore
|
1fef992fa8
|
Allow users with components.files ability to upload files for components
|
2023-01-17 15:58:11 -08:00 |
|
snipe
|
50cc69c427
|
Added South Sudan to country list
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-13 13:23:57 -08:00 |
|
snipe
|
d508374c57
|
Disallowed category type change string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:15:51 -08:00 |
|
snipe
|
f50b622eb8
|
Disallow editing of category type once created, added help text
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:15:40 -08:00 |
|
snipe
|
62bf7b1bce
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-10 01:56:27 -08:00 |
|
snipe
|
c5c37fa95f
|
Fixed copypasta
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 01:54:26 -08:00 |
|
snipe
|
9dc016aecc
|
Fixed issue where assets sidenav would collapse if custom status label is selected
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 01:31:00 -08:00 |
|
snipe
|
e67bd5a275
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 16:00:33 -08:00 |
|
snipe
|
8d35583634
|
Merge pull request #12324 from snipe/features/add_username_to_asset_list
Added username to display in asset listings
|
2023-01-09 16:00:01 -08:00 |
|
snipe
|
b39a9e0fe1
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 15:54:04 -08:00 |
|
Brady Wetherington
|
cbffd105a2
|
Fix LDAP default group feature
|
2023-01-09 15:23:19 -08:00 |
|
snipe
|
a57315aed5
|
Added username to display in asset listings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 12:58:58 -08:00 |
|
snipe
|
014eab3abc
|
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 11:09:26 -08:00 |
|
snipe
|
91d0c383df
|
Production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-05 18:47:55 -08:00 |
|
snipe
|
e05764ac34
|
Truncate URL with ellipsis if too long
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-05 18:42:26 -08:00 |
|
snipe
|
4d0fc99773
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-05 14:19:51 -08:00 |
|
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
|
9c63f426d9
|
Added missing translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-04 14:09:14 -08:00 |
|
snipe
|
b77d5801fa
|
English is hard, apparently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-04 13:56:16 -08:00 |
|
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 |
|
Ivan Nieto Vivanco
|
9bafe795b0
|
Corrected the view when editing custom fields values
|
2022-11-23 16:34:29 -06:00 |
|
Ivan Nieto Vivanco
|
feeb1c7ac8
|
Corrected the view when editing custom fields values
|
2022-11-23 12:21:07 -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 |
|
Godfrey M
|
8a0517fb5d
|
removes data dump
|
2022-11-15 15:59:47 -08:00 |
|
Godfrey M
|
90828e3a87
|
fixes variable name
|
2022-11-15 15:51:52 -08:00 |
|
Godfrey M
|
45636b8114
|
adds should_autoassign boolean to users table
|
2022-11-15 15:42:57 -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 |
|
snipe
|
2ac558494d
|
Set column width instead of letting BS tables guess
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-10 17:21:07 +00:00 |
|
snipe
|
ede16ad2c2
|
Removed unused block
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-10 17:19:35 +00:00 |
|
snipe
|
7a5fcfb87a
|
Loop through fields array
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-10 16:46:59 +00:00 |
|
Godfrey M
|
92ae271292
|
adds validation for department names at Company locations
|
2022-11-09 13:11:33 -08:00 |
|
snipe
|
097821b818
|
Slight revamping of column layouts and also added new general.display_in_user_view column
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-08 15:28:19 +00:00 |
|
snipe
|
2e56c9b521
|
Added new general.display_in_user_view field to form
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-08 15:27:59 +00:00 |
|
snipe
|
b95d24b5eb
|
Additional translations
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-08 15:27:44 +00:00 |
|
snipe
|
236684ec92
|
Fixed model file image path/variable
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-03 14:12:49 -07:00 |
|
snipe
|
7cb1ca8754
|
Fixed image path to show preview
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-03 13:51:48 -07:00 |
|
snipe
|
eb81c290dc
|
Accessory file upload
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:50:39 -07:00 |
|
snipe
|
71a7176a6e
|
Updated component blade
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:28:57 -07:00 |
|
snipe
|
def89bfa0c
|
Added some generic file translations
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:28:49 -07:00 |
|
snipe
|
2106b64da6
|
Fixed some layout issues
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:06:49 -07:00 |
|
snipe
|
fa79a6c15f
|
Skip storage:: facade on missing images
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 18:19:13 -07:00 |
|
snipe
|
761da534f3
|
Updated consumables UI to allow uploads and display files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 17:53:08 -07:00 |
|
snipe
|
a930661150
|
Check for valid category
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-31 12:16:39 -07:00 |
|
snipe
|
c233d7fb1c
|
Removed extra spaces
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 10:51:06 -07:00 |
|
snipe
|
dea0fcefbd
|
Reflect color in sidenav if one is given
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 10:48:42 -07:00 |
|
snipe
|
e670ffe349
|
Added Assets Assigned to tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 00:16:06 -07:00 |
|
snipe
|
b503b672ba
|
Merge pull request #11951 from Godmartinz/AccessKey_shortcuts
adds shortcuts for listing, creating, and saving
|
2022-10-25 15:53:57 -07:00 |
|
snipe
|
85a85082b7
|
Changed button icon for importer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-21 16:59:19 -07:00 |
|
snipe
|
515b14a001
|
Updated JS to better handle input IDs
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-20 19:21:09 -07:00 |
|
snipe
|
4eed2baa31
|
Added default tab to locations
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-20 19:06:58 -07:00 |
|
Godfrey M
|
f9ac447dd1
|
adds default group to LDAP
|
2022-10-18 15:18:09 -07:00 |
|
snipe
|
23e613f903
|
Fixed kit parse error on model edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-18 15:00:33 -07:00 |
|
snipe
|
2543fa6b98
|
Fixed user icon for tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-17 20:04:42 -07:00 |
|
snipe
|
7c34652da0
|
Fixed incorrect icons for mobile view on location tabs
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-17 20:02:27 -07:00 |
|
snipe
|
fb228d6ded
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:57:10 -07:00 |
|
snipe
|
1360ce90a5
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:52:45 -07:00 |
|
snipe
|
3549afe157
|
Added strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:43:24 -07:00 |
|
snipe
|
cfb780b20b
|
Remove unused files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:39:10 -07:00 |
|
snipe
|
eb9f17122e
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:21:09 -07:00 |
|
snipe
|
2ef45afb2b
|
Removed extraneous files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 12:18:57 -07:00 |
|
snipe
|
e7ae7742b0
|
Merge pull request #11949 from nh314/Remove-required-mark
Remove required mark
|
2022-10-12 10:55:49 -07:00 |
|
snipe
|
06803092c5
|
Merge pull request #11952 from snipe/features/clearer_activated_helptext
Added clearer LDAP activated helptext
|
2022-10-12 10:52:56 -07:00 |
|
Ivan Nieto Vivanco
|
ab0c5bcd9d
|
Add precision parameter to the diffForHumans() Carbon function to report
|
2022-10-12 12:16:13 -05:00 |
|
snipe
|
5ba01728d9
|
More text tweaking
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:51:25 -07:00 |
|
snipe
|
ae0eb378e4
|
Additional clarification
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:43:54 -07:00 |
|
snipe
|
ad8a2387f0
|
Updated help text to be more clear
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:38:37 -07:00 |
|
Godfrey M
|
4fa01350c3
|
adds shortcuts for listing, creating, and saving
|
2022-10-11 12:00:15 -07:00 |
|
Phan Nguyen
|
d3161fad02
|
Remove required mark
Because it actually not required by model.
|
2022-10-11 15:49:56 +07:00 |
|
snipe
|
15da3b831d
|
Merge pull request #11937 from Godmartinz/gh11868_sidebar_unclickable
Fixes the margin top adjustment for desktop
|
2022-10-06 10:43:27 -07:00 |
|
Godfrey M
|
0c6441ebed
|
removes the margin top adjustment for desktop
|
2022-10-06 10:35:28 -07:00 |
|
Ivan Nieto Vivanco
|
f1edbc9810
|
Send item variable that the datepicker needs
|
2022-10-06 09:15:00 -05:00 |
|
snipe
|
ca937667b4
|
Indented divs per @uberbrady
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 17:21:39 -07:00 |
|
snipe
|
3605aa8f5a
|
Added clear button to generic datepicker and made it wider
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 16:59:06 -07:00 |
|
snipe
|
0817308822
|
Added start/end to edit/view screens
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 16:58:49 -07:00 |
|
snipe
|
d23e178c62
|
Adde language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 16:56:10 -07:00 |
|
snipe
|
18663c2599
|
Merge pull request #11925 from inietov/fixes/checkbox_customfields_comma_issues
Fixed #11710 - Validation of checkbox data with multiple values
|
2022-10-05 16:48:32 -07:00 |
|
Ivan Nieto Vivanco
|
5b8e0b3af1
|
Use a regex (gulp) to admit ',' (comma) and ', '(comma plus space) as customfields checkbox value delimiter
|
2022-10-05 18:40:07 -05:00 |
|
snipe
|
018f71a157
|
Switched to translations for better autoglossonym support
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-05 11:46:42 -07:00 |
|
snipe
|
c70c8ce856
|
Merge pull request #11916 from Godmartinz/gh11868_sidebar_unclickable
fixes mobile views and clickability of sidebar menu
|
2022-10-04 18:07:02 -07:00 |
|
snipe
|
81d2a3acda
|
Updated lnaguage strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 17:48:43 -07:00 |
|
snipe
|
ba0483b33e
|
Phrasing!
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 16:21:10 -07:00 |
|
snipe
|
97b9f96030
|
Added nag alert for unaccepted assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 16:16:21 -07:00 |
|
snipe
|
891b5b2882
|
Added routes, language
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 15:45:25 -07:00 |
|
Godfrey M
|
e21660ae05
|
off by a pixel
|
2022-10-04 12:11:37 -07:00 |
|
Godfrey M
|
53392d6069
|
fixes mobile views and clickability of sidebar menu
|
2022-10-04 12:01:13 -07:00 |
|
snipe
|
3469e49470
|
First UI overhaul
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-03 21:28:22 -07:00 |
|
Brady Wetherington
|
0424308863
|
Modified dashboard tooltips to add percentage as well as count
|
2022-09-29 13:46:56 -07:00 |
|
Brady Wetherington
|
420c216973
|
Added counts to Dashboard Pie Chart legends and tooltips
|
2022-09-29 13:20:58 -07:00 |
|
snipe
|
70c766e8b3
|
Added setting to choose dashboard type
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-29 04:16:46 -07:00 |
|
snipe
|
0b2ce7be07
|
Fixed #11521 - switch to using status meta from status label name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-29 03:48:58 -07:00 |
|
snipe
|
8168ca4074
|
Merge pull request #11853 from Godmartinz/ldap_test_results_color
Fixes the color choice for the ldap_test_results
|
2022-09-27 14:46:46 -07:00 |
|
snipe
|
c194c8a0c8
|
Merge pull request #11764 from BasO12/master
Added notes to audit mail notification
|
2022-09-27 14:43:50 -07:00 |
|
Ivan Nieto Vivanco
|
06ba9356ca
|
Delete another set of duplicates
|
2022-09-26 18:57:35 -05:00 |
|
Ivan Nieto Vivanco
|
e034f7b674
|
Delete another duplicate that somehow has survived
|
2022-09-26 18:56:24 -05:00 |
|
Ivan Nieto Vivanco
|
4d14243f57
|
Delete duplicate fields from the importer dropdown menu
|
2022-09-26 18:51:13 -05:00 |
|
snipe
|
9d93c72534
|
Use BS datepicker’s built in clear button
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-26 14:34:35 -07:00 |
|
Ivan Nieto Vivanco
|
23cf556a8b
|
Adds cursor:pointer to indicate a clickable link
|
2022-09-20 22:24:52 -05:00 |
|
Ivan Nieto Vivanco
|
f75917d34d
|
Add a link used to clear the purchase date input
|
2022-09-20 17:53:55 -05:00 |
|
Godfrey M
|
c55f2d5417
|
corrects color for query and results of ldap sync test
|
2022-09-20 10:35:55 -07:00 |
|
Godfrey M
|
571ce5b741
|
corrects the color choice for the ldap_test_results
|
2022-09-19 11:59:02 -07:00 |
|
snipe
|
dcab1381e7
|
Check for licenses.files permissions
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-16 14:00:27 -07:00 |
|
snipe
|
ca70988879
|
Larger checkbox in lists
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 21:42:16 -07:00 |
|
snipe
|
62ad3fad1c
|
Remove DL button if file doesn’t exist
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 16:11:27 -07:00 |
|
snipe
|
eb1e287c15
|
Better handle missing files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 16:08:13 -07:00 |
|
snipe
|
1885e73704
|
Ignore warning icon if no purchase date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 15:42:47 -07:00 |
|
snipe
|
24910433a1
|
Fixed 500 when depreciation is set but no purchase_date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 15:39:47 -07:00 |
|
Ivan Nieto Vivanco
|
9b2eda2d70
|
Save and show the default values properly on custom fields of type checkbox
|
2022-09-15 11:52:49 -05:00 |
|
Ivan Nieto Vivanco
|
20220764bb
|
Add possible values for custom fields of type checkbox
|
2022-09-15 11:18:54 -05:00 |
|
snipe
|
72feaee6c0
|
Added Applecare lookup link if manufacturer is apple
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-14 19:43:48 -07:00 |
|
Godfrey M
|
9b448227f7
|
tinkering to no avail
|
2022-09-13 11:40:10 -07:00 |
|
snipe
|
93428e1ed4
|
Increased colspan for checkboxes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-31 13:34:27 -07:00 |
|
Godfrey M
|
193b31e427
|
select options working, testing sync then done
|
2022-08-31 12:58:33 -07:00 |
|
Godfrey M
|
70ac8af9c4
|
.
|
2022-08-31 09:53:20 -07:00 |
|
BasO12
|
61e1650542
|
Add files via upload
|
2022-08-31 13:08:09 +02:00 |
|
BasO12
|
ab54ac9408
|
Add files via upload
|
2022-08-31 13:07:05 +02:00 |
|
snipe
|
dcbd407698
|
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance
Send notifications when Acceptance Assets actions occur [sc-9917]
|
2022-08-30 12:14:58 -07:00 |
|
Godfrey M
|
0c362e8b57
|
gets the groups selector to appear but options are blank
|
2022-08-29 12:09:56 -07:00 |
|
snipe
|
9cf5f30c77
|
Set safeMode to true and use helper for all parsedown
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-29 11:26:47 -07:00 |
|
David Sferruzza
|
f60ea9581d
|
Fixed #11742: display correct file sizes when using S3(-like) storage
|
2022-08-28 12:07:14 +02:00 |
|
Godfrey M
|
fc6fefdb4e
|
adds migration, variables, checkbox,working on groups
|
2022-08-25 15:19:38 -07:00 |
|
snipe
|
36ab794adc
|
Added signature field to user history
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-24 18:05:43 -07:00 |
|
snipe
|
a5fd9ebbb1
|
Added style to readonly datetime picker field
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-24 17:10:15 -07:00 |
|
Ivan Nieto Vivanco
|
581cae94ab
|
Add readonly property to datepickers
|
2022-08-24 18:21:54 -05:00 |
|
snipe
|
af34fc207c
|
Suppress error output if file doesn’t exist on server
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-24 13:47:56 -07:00 |
|
Godfrey M
|
2994c3613a
|
adds clearfix to settings page
|
2022-08-22 10:46:15 -07:00 |
|
snipe
|
368bd5da3f
|
Adds the category in the side info on Models > View
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-14 14:01:58 -07:00 |
|