You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/01/21 23:09:22 UTC
[07/22] git commit: [#7046] Using different published date format.
Fixes FF/Mozilla
[#7046] Using different published date format. Fixes FF/Mozilla
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2d459762
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2d459762
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2d459762
Branch: refs/heads/tv/6393
Commit: 2d459762463ed2eddcc999a9da2e387151d3712b
Parents: 05f5804
Author: Wayne Witzel III <ww...@slashdotmedia.com>
Authored: Wed Jan 15 22:02:25 2014 +0000
Committer: Wayne Witzel III <ww...@slashdotmedia.com>
Committed: Wed Jan 15 23:31:58 2014 +0000
----------------------------------------------------------------------
ForgeActivity/forgeactivity/main.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2d459762/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index a1bb21d..6bf1199 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -16,6 +16,7 @@
# under the License.
import logging
+import calendar
from pylons import tmpl_context as c, app_globals as g
from pylons import request, response
@@ -191,7 +192,7 @@ class ForgeActivityRestController(BaseController):
'activity_extras': {},
},
'timeline': [{
- 'published': '%s UTC' % a.published,
+ 'published': calendar.timegm(a.published.timetuple()) * 1000,
'actor': a.actor._deinstrument(),
'verb': a.verb,
'obj': a.obj._deinstrument(),