On Sun, 21 Nov 2021 at 19:52, <[email protected]> wrote: > > This is an automated email from the ASF dual-hosted git repository. > > humbedooh pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git > > commit fc2dcaf955c2273d608682aadaa784c936685c42 > Author: Daniel Gruno <[email protected]> > AuthorDate: Sun Nov 21 20:52:27 2021 +0100 > > Regen JS > --- > webui/admin.html | 8 ++++---- > webui/index.html | 6 +++--- > webui/js/ponymail.js | 2 +- > webui/list.html | 8 ++++---- > webui/oauth.html | 8 ++++---- > webui/thread.html | 8 ++++---- > 6 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/webui/admin.html b/webui/admin.html > index 8cd3b9b..7b31e6f 100644 > --- a/webui/admin.html > +++ b/webui/admin.html > @@ -25,7 +25,7 @@ the License. --> > <!-- Bootstrap --> > > <link href="css/bootstrap.min.css" rel="stylesheet" media="all"> > - <link href="css/scaffolding.css" rel="stylesheet" media="all"> > + <link href="css/scaffolding.css?revision=d31a784" rel="stylesheet" > media="all">
Adding revision here won't work properly with build.sh as it stands. This is because the script extracts the latest js/ commit, and css/ is not under js/ The commit hash cannot be taken from the webui parent, as this includes the html files which are themselves updated to include the revision of dependent items. This would cause a never-ending update sequence. > <link href="css/modal.css" rel="stylesheet" media="all"> > <link href="css/spinner.css" rel="stylesheet" media="all"> > <link rel="alternate" href="/api/static.lua"/> > @@ -79,9 +79,9 @@ the License. --> > <script src="js/jquery-1.12.4.min.js" > integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script> > <!-- Include all compiled plugins (below), or include individual files > as needed --> > <script src="js/bootstrap.min.js"></script> > - <script src="js/config.js"></script> > - <script src="js/wordcloud.js"></script> > - <script src="js/ponymail.js"></script> > + <script src="js/config.js?revision=d31a784"></script> > + <script src="js/wordcloud.js?revision=d31a784"></script> > + <script src="js/ponymail.js?revision=d31a784"></script> > <div id="splash" class="splash fade-in"> </div> > <div style="clear: both;"></div> > </body> > diff --git a/webui/index.html b/webui/index.html > index a290681..9ee4dd8 100644 > --- a/webui/index.html > +++ b/webui/index.html > @@ -24,7 +24,7 @@ the License. --> > <!-- Bootstrap --> > > <link href="css/bootstrap.min.css" rel="stylesheet" media="all"> > - <link href="css/scaffolding.css" rel="stylesheet" media="all"> > + <link href="css/scaffolding.css?revision=d31a784" rel="stylesheet" > media="all"> > <link href="css/modal.css" rel="stylesheet" media="all"> > <link href="css/spinner.css" rel="stylesheet" media="all"> > <link rel="alternate" href="/api/static.lua"/> > @@ -60,8 +60,8 @@ the License. --> > <script src="js/jquery-1.12.4.min.js" > integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script> > <!-- Include all compiled plugins (below), or include individual files > as needed --> > <script src="js/bootstrap.min.js"></script> > - <script src="js/config.js"></script> > - <script src="js/ponymail.js"></script> > + <script src="js/config.js?revision=d31a784"></script> > + <script src="js/ponymail.js?revision=d31a784"></script> > <div id="splash" class="splash fade-in"> </div> > <div style="clear: both;"></div> > > diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js > index b4f8fbd..d7922ce 100644 > --- a/webui/js/ponymail.js > +++ b/webui/js/ponymail.js > @@ -16,7 +16,7 @@ > */ > // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT source/*.js!! > > -const PONYMAIL_REVISION = "fe71caf"; > +const PONYMAIL_REVISION = "d31a784"; > > > > diff --git a/webui/list.html b/webui/list.html > index 21b51c7..e6e0d5d 100644 > --- a/webui/list.html > +++ b/webui/list.html > @@ -24,7 +24,7 @@ the License. --> > <!-- Bootstrap --> > > <link href="css/bootstrap.min.css" rel="stylesheet" media="all"> > - <link href="css/scaffolding.css" rel="stylesheet" media="all"> > + <link href="css/scaffolding.css?revision=d31a784" rel="stylesheet" > media="all"> > <link href="css/modal.css" rel="stylesheet" media="all"> > <link href="css/spinner.css" rel="stylesheet" media="all"> > <link rel="alternate" href="/api/static.lua"/> > @@ -173,9 +173,9 @@ the License. --> > </script> > <!-- Include all compiled plugins (below), or include individual files > as needed --> > <script src="js/bootstrap.min.js"></script> > - <script src="js/config.js"></script> > - <script src="js/wordcloud.js"></script> > - <script src="js/ponymail.js"></script> > + <script src="js/config.js?revision=d31a784"></script> > + <script src="js/wordcloud.js?revision=d31a784"></script> > + <script src="js/ponymail.js?revision=d31a784"></script> > <div id="splash" class="splash fade-in"> </div> > <div style="clear: both;"></div> > <script type="text/javascript"> > diff --git a/webui/oauth.html b/webui/oauth.html > index 0038904..744cb3e 100644 > --- a/webui/oauth.html > +++ b/webui/oauth.html > @@ -21,7 +21,7 @@ the License. --> > > <!-- CSS --> > <link href="css/bootstrap.min.css" rel="stylesheet" media="all"> > - <link href="css/scaffolding.css" rel="stylesheet" media="all"> > + <link href="css/scaffolding.css?revision=d31a784" rel="stylesheet" > media="all"> > <link href="css/modal.css" rel="stylesheet" media="all"> > <link href="css/spinner.css" rel="stylesheet" media="all"> > > @@ -54,8 +54,8 @@ the License. --> > <script src="js/jquery-1.12.4.min.js" > integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script> > <!-- Include all compiled plugins (below), or include individual files > as needed --> > <script src="js/bootstrap.min.js"></script> > - <script src="js/config.js"></script> > - <script src="js/ponymail.js"></script> > - <script src="js/oauth.js"></script> > + <script src="js/config.js?revision=d31a784"></script> > + <script src="js/ponymail.js?revision=d31a784"></script> > + <script src="js/oauth.js?revision=d31a784"></script> > </body> > </html> > \ No newline at end of file > diff --git a/webui/thread.html b/webui/thread.html > index ee59354..c71e9f4 100644 > --- a/webui/thread.html > +++ b/webui/thread.html > @@ -25,7 +25,7 @@ the License. --> > <!-- Bootstrap --> > > <link href="css/bootstrap.min.css" rel="stylesheet" media="all"> > - <link href="css/scaffolding.css" rel="stylesheet" media="all"> > + <link href="css/scaffolding.css?revision=d31a784" rel="stylesheet" > media="all"> > <link href="css/modal.css" rel="stylesheet" media="all"> > <link href="css/spinner.css" rel="stylesheet" media="all"> > <link rel="alternate" href="/api/static.lua"/> > @@ -97,9 +97,9 @@ the License. --> > <script src="js/jquery-1.12.4.min.js" > integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script> > <!-- Include all compiled plugins (below), or include individual files > as needed --> > <script src="js/bootstrap.min.js"></script> > - <script src="js/config.js"></script> > - <script src="js/wordcloud.js"></script> > - <script src="js/ponymail.js"></script> > + <script src="js/config.js?revision=d31a784"></script> > + <script src="js/wordcloud.js?revision=d31a784"></script> > + <script src="js/ponymail.js?revision=d31a784"></script> > <div id="splash" class="splash fade-in"> </div> > <div style="clear: both;"></div> > </body>
