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 2016/09/19 09:41:48 UTC
[1/3] incubator-ponymail git commit: Only count hits if user can
access email
Repository: incubator-ponymail
Updated Branches:
refs/heads/master a894cf513 -> 07e8338cb
Only count hits if user can access email
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/bd27ae9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/bd27ae9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/bd27ae9a
Branch: refs/heads/master
Commit: bd27ae9a5099b1591d3d2c27a2c2c631350553ca
Parents: e8e5b9f
Author: Ulises Cervino Beresi <uc...@apache.org>
Authored: Fri Sep 16 13:37:15 2016 +0100
Committer: Ulises Cervino Beresi <uc...@apache.org>
Committed: Fri Sep 16 13:37:15 2016 +0100
----------------------------------------------------------------------
site/api/stats.lua | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/bd27ae9a/site/api/stats.lua
----------------------------------------------------------------------
diff --git a/site/api/stats.lua b/site/api/stats.lua
index 9107287..078885c 100644
--- a/site/api/stats.lua
+++ b/site/api/stats.lua
@@ -572,7 +572,7 @@ function handle(r)
dhh = doc.hits.hits
end
- local h = #dhh
+ local h = 0
-- Debug time point 7
table.insert(t, r:clock() - tnow)
@@ -606,6 +606,8 @@ function handle(r)
end
end
if canUse then
+
+ h = h + 1
if not config.slow_count then
local eml = email.from:match("<(.-)>") or email.from:match("%S+@%S+") or nil
[2/3] incubator-ponymail git commit: Merge remote-tracking branch
'origin/count-if-allowed' +1'ed by Humbedooh
Posted by hu...@apache.org.
Merge remote-tracking branch 'origin/count-if-allowed'
+1'ed by Humbedooh
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/d12277cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/d12277cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/d12277cb
Branch: refs/heads/master
Commit: d12277cb57b08b6a5bbaf949f26c925e807e4436
Parents: a894cf5 bd27ae9
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 19 11:39:21 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 19 11:39:21 2016 +0200
----------------------------------------------------------------------
site/api/stats.lua | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] incubator-ponymail git commit: record commit as merged
Posted by hu...@apache.org.
record commit as merged
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/07e8338c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/07e8338c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/07e8338c
Branch: refs/heads/master
Commit: 07e8338cbb8787aacd72e989afacca07ba1f674a
Parents: d12277c
Author: Daniel Gruno <hu...@apache.org>
Authored: Mon Sep 19 11:41:05 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Mon Sep 19 11:41:05 2016 +0200
----------------------------------------------------------------------
STATUS | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/07e8338c/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 9e6c7bb..a364226 100644
--- a/STATUS
+++ b/STATUS
@@ -13,9 +13,12 @@ the changes to master.
PATCHES/ISSUES THAT ARE PROPOSED FOR MASTER:
- * Only count hits if user can access email
+
+--------
+ Example:
+ * Fix all the Ponies
commit: bd27ae9a5099b1591d3d2c27a2c2c631350553ca
- shortlog: https://git-wip-us.apache.org/repos/asf?p=incubator-ponymail.git;a=shortlog;h=refs/heads/count-if-allowed
- +1: Humbedooh
+ shortlog: https://git-wip-us.apache.org/repos/asf?p=incubator-ponymail.git;a=shortlog;h=refs/heads/fix-ponies
+ +1: Humbedooh, ucb