snipe
|
deff312381
|
Remove auto-link from from manufacturer warranty
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:16:23 -07:00 |
|
snipe
|
7bffe30fae
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-26 17:55:48 -07:00 |
|
snipe
|
7974c172fd
|
Switch back to “normal” url for support
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:48:38 -07:00 |
|
snipe
|
54a766c4f9
|
Added dynamic warranty URL to manufacturers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:39:15 -07:00 |
|
snipe
|
27de5c62c5
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-26 15:15:43 -07:00 |
|
snipe
|
7c0ef581c5
|
Added help text to the now-dynamic manufacturer URLS
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 15:12:36 -07:00 |
|
snipe
|
0c5837e4a0
|
Merge pull request #12929 from snipe/fixes/use_asset_tag_if_no_asset_name_given
Use the asset tag instead of asset name if no name is given
|
2023-04-26 14:49:38 -07:00 |
|
snipe
|
5eac314f4d
|
Merge pull request #12906 from akemidx/feature/sc-20622
Dynamic warranty link for manufacturers' support urls
|
2023-04-26 14:49:22 -07:00 |
|
snipe
|
b5b335a2ca
|
Use the asset tag instead of asset name if no name is given
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 14:41:19 -07:00 |
|
snipe
|
d6ea5de5b8
|
Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset
|
2023-04-25 22:20:50 -07:00 |
|
snipe
|
42f0975414
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-04-25 22:19:27 -07:00 |
|
snipe
|
31a3be4c6a
|
Small refactor of HTML, added top submit button
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 21:51:59 -07:00 |
|
snipe
|
67212f9d57
|
Changed layout, added fieldsets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 20:59:29 -07:00 |
|
snipe
|
4e3ccb74bc
|
Fixed slightly weird padding
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 15:59:19 -07:00 |
|
Godfrey M
|
cb68f41d9c
|
added ldap_location to settings
|
2023-04-25 11:44:04 -07:00 |
|
Godfrey M
|
c9eb1410d7
|
swaps version and open source text in the footer
|
2023-04-25 11:03:05 -07:00 |
|
Godfrey M
|
b8c424fca0
|
adds users total cost to user profile
|
2023-04-24 09:17:42 -07:00 |
|
snipe
|
0c425ed0e7
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-21 05:19:19 -07:00 |
|
akemidx
|
16a5a883e5
|
new request, preparing support_url for validation
|
2023-04-20 16:34:25 -04:00 |
|
Godfrey M
|
97df39001d
|
adds optional breakdowns for total cost
|
2023-04-19 17:51:37 -07:00 |
|
Godfrey M
|
6872f8da7b
|
adding total cost to user view
|
2023-04-19 17:31:09 -07:00 |
|
Godfrey M
|
bd212b3108
|
adds component costs to asset view
|
2023-04-19 16:35:06 -07:00 |
|
Godfrey M
|
0e1f50c226
|
adds checkout-range to jquery
|
2023-04-19 10:11:26 -07:00 |
|
Godfrey M
|
d2118ba230
|
removed space from un deployable total in sidebar
|
2023-04-19 09:46:15 -07:00 |
|
Godfrey M
|
8a5612d1c9
|
fixes comment
|
2023-04-19 09:13:43 -07:00 |
|
Godfrey M
|
bdd1045272
|
adds a checkout range for custom asset reports
|
2023-04-19 09:11:44 -07:00 |
|
Godfrey M
|
0ab400f5bc
|
removed deadspace and pull
|
2023-04-18 15:23:11 -07:00 |
|
Godfrey M
|
f15b0d8591
|
fix for footer
|
2023-04-18 15:20:38 -07:00 |
|
snipe
|
c68563ae08
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-18 13:01:37 -07:00 |
|
snipe
|
d3bdaf7cd3
|
Fixed destination name
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 12:59:46 -07:00 |
|
snipe
|
92f516484e
|
Small tooltip improvements for undeployable items
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 12:54:06 -07:00 |
|
snipe
|
b626e5a3bf
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-18 12:33:32 -07:00 |
|
snipe
|
bfda46276a
|
Merge pull request #12849 from snipe/features/adds_license_checkin_checkout_to_all_in_gui
Added license checkin/checkout to all in license GUI
|
2023-04-18 12:32:30 -07:00 |
|
snipe
|
031586495a
|
Small cosmetic tweaks to 2FA reset class, fixed weird layout on 2FA reset button
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 12:09:41 -07:00 |
|
snipe
|
d871a14687
|
Added fa-fw for nicer display
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 11:49:40 -07:00 |
|
snipe
|
00a9591c4c
|
Added autoassign_licenses in view, added fa-fw
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 11:49:29 -07:00 |
|
snipe
|
41358eba85
|
Updated label
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 11:29:28 -07:00 |
|
snipe
|
59f4fe67d6
|
Removed duplicate tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 11:28:35 -07:00 |
|
snipe
|
2c5c4ab974
|
Nicer layout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 04:40:06 -07:00 |
|
snipe
|
95767c46ac
|
Fixed delete modal
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 04:37:13 -07:00 |
|
snipe
|
0eadc00f4d
|
Removed unneeded css class
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 04:37:04 -07:00 |
|
snipe
|
7aab4290c7
|
Updated tooltips with data-tooltip=true from old method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:44:50 -07:00 |
|
snipe
|
8a41f37054
|
Persists buttons through tabs
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 02:00:06 -07:00 |
|
snipe
|
ec0413254e
|
Removed action menu
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:09:40 -07:00 |
|
snipe
|
220e20d208
|
Changed tooltip invocation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:02:36 -07:00 |
|
snipe
|
d3b087b5da
|
Clearer padding between buttons, added tooltips
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 01:02:19 -07:00 |
|
snipe
|
0dd967cf2b
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-17 21:05:09 -07:00 |
|
snipe
|
912f6c45ee
|
Reverted #12832
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 21:04:47 -07:00 |
|
snipe
|
9a73f5eca3
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-04-17 20:27:49 -07:00 |
|
snipe
|
c12ac9912c
|
Merge pull request #12832 from Godmartinz/fix_footer_space
Fixed footer space when customized
|
2023-04-17 20:11:15 -07:00 |
|