You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2021/12/29 23:09:18 UTC
[incubator-ponymail-foal] branch master updated (f55d781 -> 1fdb282)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from f55d781 bump server version
new bd3cdbd Add postface option for adding custom text to 404s
new 1fdb282 regen JS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/config.js | 3 ++-
webui/js/ponymail.js | 5 ++++-
webui/js/source/base-http-extensions.js | 3 +++
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
8 files changed, 28 insertions(+), 21 deletions(-)
[incubator-ponymail-foal] 02/02: regen JS
Posted by hu...@apache.org.
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 1fdb28263a14b5b087cbe5c4bf01573c78eb0599
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Thu Dec 30 00:09:08 2021 +0100
regen JS
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 5 ++++-
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index b3f9f4f..8d7a66c 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?revision=723b4fd" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=bd3cdbd" 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"/>
@@ -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?revision=723b4fd"></script>
- <script src="js/wordcloud.js?revision=723b4fd"></script>
- <script src="js/ponymail.js?revision=723b4fd"></script>
+ <script src="js/config.js?revision=bd3cdbd"></script>
+ <script src="js/wordcloud.js?revision=bd3cdbd"></script>
+ <script src="js/ponymail.js?revision=bd3cdbd"></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 3d8d0e2..28e2845 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?revision=723b4fd" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=bd3cdbd" 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?revision=723b4fd"></script>
- <script src="js/ponymail.js?revision=723b4fd"></script>
+ <script src="js/config.js?revision=bd3cdbd"></script>
+ <script src="js/ponymail.js?revision=bd3cdbd"></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 fc2c966..7bc457a 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = '723b4fd';
+const PONYMAIL_REVISION = 'bd3cdbd';
/******************************************
@@ -152,6 +152,9 @@ async function async_snap(error) {
msg = msg.replace(/<.*?>/g, ""); // strip HTML tags
if (error.status === 404) {
msg += "\n\nYou may need to be logged in with additional permissions in order to view this resource.";
+ if (pm_config.perm_error_postface) {
+ msg += pm_config.perm_error_postface;
+ }
}
modal("An error occured", "An error code %u occured while trying to fetch %s:\n%s".format(error.status, error.url, msg), "error");
}
diff --git a/webui/list.html b/webui/list.html
index 4e0d416..356e2d9 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?revision=723b4fd" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=bd3cdbd" 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"/>
@@ -180,9 +180,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?revision=723b4fd"></script>
- <script src="js/wordcloud.js?revision=723b4fd"></script>
- <script src="js/ponymail.js?revision=723b4fd"></script>
+ <script src="js/config.js?revision=bd3cdbd"></script>
+ <script src="js/wordcloud.js?revision=bd3cdbd"></script>
+ <script src="js/ponymail.js?revision=bd3cdbd"></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 05c7f09..61b57bc 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?revision=723b4fd" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=bd3cdbd" 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?revision=723b4fd"></script>
- <script src="js/ponymail.js?revision=723b4fd"></script>
- <script src="js/oauth.js?revision=723b4fd"></script>
+ <script src="js/config.js?revision=bd3cdbd"></script>
+ <script src="js/ponymail.js?revision=bd3cdbd"></script>
+ <script src="js/oauth.js?revision=bd3cdbd"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 92732bf..61abcd3 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?revision=723b4fd" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=bd3cdbd" 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?revision=723b4fd"></script>
- <script src="js/wordcloud.js?revision=723b4fd"></script>
- <script src="js/ponymail.js?revision=723b4fd"></script>
+ <script src="js/config.js?revision=bd3cdbd"></script>
+ <script src="js/wordcloud.js?revision=bd3cdbd"></script>
+ <script src="js/ponymail.js?revision=bd3cdbd"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
[incubator-ponymail-foal] 01/02: Add postface option for adding custom text to 404s
Posted by hu...@apache.org.
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 bd3cdbd477cb727d8887de536fa9e8aca38caa59
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Thu Dec 30 00:08:42 2021 +0100
Add postface option for adding custom text to 404s
---
webui/js/config.js | 3 ++-
webui/js/source/base-http-extensions.js | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/webui/js/config.js b/webui/js/config.js
index 9d177f6..7900f20 100644
--- a/webui/js/config.js
+++ b/webui/js/config.js
@@ -46,7 +46,8 @@ const pm_config = {
boring_lists: ['commits', 'cvs', 'site-cvs', 'security', 'notifications'], // we'd rather not default to these, noisy!
favorite_list: 'dev', // if we have this, default to it
long_tabs: false, // tab name format (long or short)
- LOTS_OF_LISTS: 25 // Beyond this number of list domains we start using the old phonebook.
+ LOTS_OF_LISTS: 25, // Beyond this number of list domains we start using the old phonebook.
+ perm_error_postface: "" // Optional text to append to potential permission error messages
}
// Gravatar support. Defaults to using the gravatar proxy.
diff --git a/webui/js/source/base-http-extensions.js b/webui/js/source/base-http-extensions.js
index 5ac6238..dce2abf 100644
--- a/webui/js/source/base-http-extensions.js
+++ b/webui/js/source/base-http-extensions.js
@@ -67,6 +67,9 @@ async function async_snap(error) {
msg = msg.replace(/<.*?>/g, ""); // strip HTML tags
if (error.status === 404) {
msg += "\n\nYou may need to be logged in with additional permissions in order to view this resource.";
+ if (pm_config.perm_error_postface) {
+ msg += pm_config.perm_error_postface;
+ }
}
modal("An error occured", "An error code %u occured while trying to fetch %s:\n%s".format(error.status, error.url, msg), "error");
}