akemidx
|
ad7a1d6c3b
|
edits from Github comments
|
2023-05-01 15:50:48 -04:00 |
|
snipe
|
609b1646e9
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-30 18:40:52 -07:00 |
|
snipe
|
031c9c1204
|
Added nobr tag to prevent external link icon and link from breaking
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:40:40 -07:00 |
|
snipe
|
77b51136cf
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-30 18:38:19 -07:00 |
|
snipe
|
0222a922a1
|
Added tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:20:23 -07:00 |
|
snipe
|
8ad600085a
|
Moved external link icon into link
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:17:56 -07:00 |
|
akemidx
|
cd389368f7
|
adding in script
|
2023-04-27 19:00:17 -04:00 |
|
akemidx
|
d3675831bb
|
snippet rewrite
|
2023-04-27 18:58:59 -04:00 |
|
akemidx
|
84134b45e6
|
form work
|
2023-04-27 18:58:59 -04:00 |
|
akemidx
|
b1e68be545
|
delete button progress
|
2023-04-27 18:58:59 -04:00 |
|
akemidx
|
d94bed3f57
|
push for testing
|
2023-04-27 18:58:59 -04:00 |
|
akemidx
|
aabcf22b40
|
commiting
|
2023-04-27 18:58:59 -04:00 |
|
akemidx
|
af549a0be9
|
Mock Up of the Buttons
|
2023-04-27 18:58:59 -04:00 |
|
snipe
|
1384ca658a
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-26 18:42:58 -07:00 |
|
snipe
|
e25dc42121
|
Switch to externalLinkFormatter
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:42:34 -07:00 |
|
snipe
|
99ef435d40
|
Fixed translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:32:38 -07:00 |
|
snipe
|
e853f8b7fd
|
Removed SR text for exporting
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:23:21 -07:00 |
|
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 |
|