incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [37/50] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura
Date Fri, 24 May 2013 17:05:13 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5f7d3823
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5f7d3823
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5f7d3823

Branch: refs/heads/db/6255
Commit: 5f7d38233c52e512011ab5406ae5043dc4d356d6
Parents: df1fe08 621931f
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Thu May 23 12:09:58 2013 -0400
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Thu May 23 12:09:58 2013 -0400

----------------------------------------------------------------------
 Allura/allura/app.py                               |   14 +++
 Allura/allura/ext/admin/admin_main.py              |    4 +-
 Allura/allura/lib/macro.py                         |   89 +++++++--------
 Allura/allura/lib/widgets/macros.py                |   22 ++++
 Allura/allura/templates/macro/__init__.py          |    1 +
 Allura/allura/templates/macro/blog_posts.html      |   10 ++
 Allura/allura/templates/macro/members.html         |    9 ++
 .../allura/templates/macro/neighborhood_feeds.html |   10 ++
 Allura/allura/templates/macro/project_admins.html  |    6 +
 Allura/allura/tests/functional/test_admin.py       |   20 ++++
 Allura/allura/tests/test_globals.py                |   28 +++--
 ForgeWiki/forgewiki/model/wiki.py                  |    1 +
 requirements-common.txt                            |    2 +-
 requirements-optional.txt                          |    4 +
 14 files changed, 158 insertions(+), 62 deletions(-)
----------------------------------------------------------------------



Mime
View raw message