Skip to content

Staging v1.0.10 #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DNikolaevAtRocket merged 6 commits into from
May 30, 2025
Merged

Staging v1.0.10 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cfba5c9
Enforce UTC timestamps (regression affecting Windows)
DNikolaevAtRocket May 29, 2025
321edd8
Merge pull request #141 from DNikolaevAtRocket/staging/v1.x
DNikolaevAtRocket May 29, 2025
231758e
Doc update v1.0.10
DNikolaevAtRocket May 30, 2025
5e4bd1d
Merge branch 'staging/v1.x' into staging/v1.x
DNikolaevAtRocket May 30, 2025
bffbc5a
Merge pull request #142 from DNikolaevAtRocket/staging/v1.x
DNikolaevAtRocket May 30, 2025
bbe3bdc
Merge branch 'release/v1.x' into staging/v1.x
DNikolaevAtRocket May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/access_grafana_zosmf.html
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/alerts.html
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/apply_visualize.html
View file
Open in desktop

Large diffs are not rendered by default.

642 changes: 642 additions & 0 deletions docs/grafana/rmf-app/commonltr.css
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 692 additions & 0 deletions docs/grafana/rmf-app/commonrtl.css
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/create_datasources.html
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions docs/grafana/rmf-app/cshelp.html
View file
Open in desktop

This file was deleted.

30 changes: 18 additions & 12 deletions docs/grafana/rmf-app/db_ovw.html
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/define_grafana_zosmf.html
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/error_reports.html
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 20 additions & 13 deletions docs/grafana/rmf-app/grafana_config_parms.html
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 18 additions & 12 deletions docs/grafana/rmf-app/grafana_via_zosmf.html
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/historical_data.html
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions docs/grafana/rmf-app/index.html
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions docs/grafana/rmf-app/indexTerms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" data-whc_version="24.1" lang="en" dir="ltr">
<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" data-whc_version="24.0" lang="en" dir="ltr">
<head><link rel="shortcut icon" href="oxygen-webhelp\template\images/ResourceMeasurementFacility.svg"/><link rel="icon" href="oxygen-webhelp\template\images/ResourceMeasurementFacility.svg"/><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="wh-path2root" content=""/><title>Index Terms - IBM RMF for z/OS Grafana Plugin </title>


Expand All @@ -10,11 +10,12 @@
<!-- Latest compiled and minified Bootstrap CSS -->
<link rel="stylesheet" href="./oxygen-webhelp/lib/bootstrap/css/bootstrap.min.css"/>

<link rel="stylesheet" type="text/css" href="./oxygen-webhelp/app/indexterms-page.css?buildId=2022110310"/>
<link rel="stylesheet" type="text/css" href="./oxygen-webhelp/app/indexterms-page.css?buildId=2022012605"/>

<script data-main="./oxygen-webhelp/app/indexterms-page.js" src="./oxygen-webhelp/lib/requirejs/require.js"></script>

<link rel="stylesheet" type="text/css" href="oxygen-webhelp/template/oxygen-gray.css?buildId=2022110310"/><link rel="stylesheet" type="text/css" href="oxygen-webhelp/template/notes.css?buildId=2022110310"/>
<!-- Skin resources -->
<link rel="stylesheet" type="text/css" href="oxygen-webhelp/template/oxygen-gray.css?buildId=2022012605"/><link rel="stylesheet" type="text/css" href="oxygen-webhelp/template/notes.css?buildId=2022012605"/>



Expand Down
26 changes: 16 additions & 10 deletions docs/grafana/rmf-app/install_grafana_plugin.html
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion docs/grafana/rmf-app/license-3rd-party.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ highlight v3
(https://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html)
- oxygen-webhelp/lib/jquery-highlight/jquery.highlight-3.js

jQuery UI v1.13.2 (http://jqueryui.com) MIT License (https://jquery.org/license/)
jQuery UI v1.12.1 (http://jqueryui.com) MIT License (https://jquery.org/license/)
- oxygen-webhelp/lib/jquery-ui/jquery-ui.min.css
- oxygen-webhelp/lib/jquery-ui/jquery-ui.min.js

Expand Down Expand Up @@ -91,6 +91,8 @@ xsl/dita/original/relpath_util.xsl Apache-2.0 (
Additional Third Party Code in standalone Oxygen WebHelp distribution:

../com.oxygenxml.common/lib/ant-contrib-1.0b3.jar Apache-2.0 (see ../com.oxygenxml.common/lib/ant.LICENSE.txt)
../com.oxygenxml.common/lib/log4j-core-2.17.1.jar Apache-2.0 (see ../com.oxygenxml.common/lib/log4j.LICENSE.txt)
../com.oxygenxml.common/lib/log4j-1.2-api-2.17.1.jar Apache-2.0 (see ../com.oxygenxml.common/lib/log4j.LICENSE.txt)
../com.oxygenxml.common/lib/lucene-analyzers-common-4.7.2.jar Apache-2.0 with additional 3rd party licenses (see ../com.oxygenxml.common/lib/lucene.LICENSE.txt)
../com.oxygenxml.common/lib/lucene-analyzers-kuromoji-4.7.2.jar Apache-2.0 with additional 3rd party licenses (see ../com.oxygenxml.common/lib/lucene.LICENSE.txt)
../com.oxygenxml.common/lib/lucene-core-4.7.2.jar Apache-2.0 with additional 3rd party license (see ../com.oxygenxml.common/lib/lucene.LICENSE.txt)
Expand Down
8 changes: 2 additions & 6 deletions docs/grafana/rmf-app/oxygen-webhelp/app/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,9 @@ define(function() {
// search
"search-init" : "search/search-init",
"search" : "search/search",
"searchAPI" : "search/searchAPI",
"searchEngine" : "search/searchEngine",
"searchPresenter" : "search/searchPresenter",
"nwSearchFnt" : "search/nwSearchFnt",
"searchAutocomplete" : "search/searchAutocomplete",
"searchHistoryItems" : "search/searchHistoryItems",
"webhelpSearchEngine" : "search/webhelpSearchEngine",
// search index
"index" : "search/index/index",
"link2parent" : "search/index/link-to-parent",
Expand Down Expand Up @@ -110,11 +106,11 @@ define(function() {
paths : modulePaths,
shim : shimConfig,
urlArgs: function(id, url) {
var args = '2022110310';
var args = '2022012605';

if(id === 'index-1' || id === 'index-2' || id === 'index-3' || id === 'stopwords'
||id === 'htmlFileInfoList' || id === 'keywords') {
args = '20250513175015';
args = '20250529171030';
}

return (url.indexOf('?') === -1 ? '?' : '&') + args;
Expand Down
5 changes: 2 additions & 3 deletions docs/grafana/rmf-app/oxygen-webhelp/app/context-help/context-help.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(["require", "util", "dom-sanitizer"], function (require, util, domSanitizer) {
define(["require", "util"], function (require, util) {
$(document).ready(function () {
// If we have a contextID, we must to redirect to the corresponding topic
var contextId = util.getParameter('contextId');
Expand All @@ -12,8 +12,7 @@ define(["require", "util", "dom-sanitizer"], function (require, util, domSanitiz
if (contextId == ctxt["appid"] && (appname == undefined || appname == ctxt["appname"])) {
var path = ctxt["path"];
if (path != undefined) {
var anchor = decodeURI(window.location.hash);
var sanitizedAnchor = domSanitizer.sanitize(anchor);
var sanitizedAnchor = util.sanitize(window.location.hash);
window.location = path + sanitizedAnchor;
}
break;
Expand Down
14 changes: 5 additions & 9 deletions docs/grafana/rmf-app/oxygen-webhelp/app/core/permalink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(["options", "jquery"], function (options, $) {
define(["jquery"], function ($) {


var selectors = {
Expand Down Expand Up @@ -33,15 +33,11 @@ define(["options", "jquery"], function (options, $) {
var hash = '#' + id;
e.preventDefault();
history.replaceState({}, '', hash);
if(options.getBoolean("webhelp.enable.sticky.header")) {
var toolsHeight = $(".wh_tools").parent().outerHeight();
var headerHeight = $(".wh_header").outerHeight();

$('html, body').animate({scrollTop: $("[id='" + id + "']").offset().top - toolsHeight - headerHeight}, 1000);
} else {
$('html, body').animate({scrollTop: $("[id='" + id + "']").offset().top}, 1000);
}

var toolsHeight = $(".wh_tools").parent().outerHeight();
var headerHeight = $(".wh_header").outerHeight();

$('html, body').animate({scrollTop: $("[id='" + id + "']").offset().top - toolsHeight - headerHeight}, 1000);
});
});
});
34 changes: 17 additions & 17 deletions docs/grafana/rmf-app/oxygen-webhelp/app/core/webhelp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
@import "fonts.css?buildId=2022110310";
@import "icons.css?buildId=2022110310";
@import "../indexterms/indexterms.css?buildId=2022110310";
@import "fonts.css?buildId=2022012605";
@import "icons.css?buildId=2022012605";
@import "../indexterms/indexterms.css?buildId=2022012605";
/* WH-2488 Refactoring */
@import "wh-elements.css?buildId=2022110310";
@import "wh-responsive-images.css?buildId=2022110310";
@import "wh-modal.css?buildId=2022110310";
@import "wh-bootstrap-fix.css?buildId=2022110310";
@import "wh-publication-logo-and-title.css?buildId=2022110310";
@import "wh-welcome-area.css?buildId=2022110310";
@import "wh-breadcrumb.css?buildId=2022110310";
@import "wh-tools-and-navigation.css?buildId=2022110310";
@import "wh-index-link.css?buildId=2022110310";
@import "wh-toc.css?buildId=2022110310";
@import "wh-search.css?buildId=2022110310";
@import "wh-common.css?buildId=2022110310";
@import "wh-sticky.css?buildId=2022110310";
@import "footer-fix.css?buildId=2022110310";
@import "wh-elements.css?buildId=2022012605";
@import "wh-responsive-images.css?buildId=2022012605";
@import "wh-modal.css?buildId=2022012605";
@import "wh-bootstrap-fix.css?buildId=2022012605";
@import "wh-publication-logo-and-title.css?buildId=2022012605";
@import "wh-welcome-area.css?buildId=2022012605";
@import "wh-breadcrumb.css?buildId=2022012605";
@import "wh-tools-and-navigation.css?buildId=2022012605";
@import "wh-index-link.css?buildId=2022012605";
@import "wh-toc.css?buildId=2022012605";
@import "wh-search.css?buildId=2022012605";
@import "wh-common.css?buildId=2022012605";
@import "wh-sticky.css?buildId=2022012605";
@import "footer-fix.css?buildId=2022012605";
Loading
Loading