You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/30 18:45:01 UTC
[24/50] [abbrv] git commit: Merge remote-tracking branch
'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/34a2c5c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/34a2c5c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/34a2c5c2
Branch: refs/heads/master
Commit: 34a2c5c2890b44ca25f944972a442589589b0d77
Parents: e53965c 4acdca5
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Sep 12 17:30:39 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Sep 12 17:30:39 2013 +0200
----------------------------------------------------------------------
.../core/api/modules/ModuleService.java | 29 +++
.../core/api/templating/TemplatingService.java | 8 +
.../platform/core/model/template/MenuItem.java | 75 ++++++-
.../core/model/template/MenuItemType.java | 12 ++
.../services/modules/ModuleServiceImpl.java | 160 ++++++++++++--
.../templating/AdminTemplatingServiceImpl.java | 210 +++++--------------
.../src/main/resources/kiwi-module.properties | 42 +++-
.../src/main/resources/templates/admin.ftl | 110 ++++++++--
.../src/main/resources/kiwi-module.properties | 6 +-
.../src/main/resources/kiwi-module.properties | 12 +-
.../src/main/resources/kiwi-module.properties | 6 +-
.../src/main/resources/kiwi-module.properties | 13 +-
.../src/main/resources/kiwi-module.properties | 14 +-
.../src/main/resources/kiwi-module.properties | 8 +-
.../src/main/resources/kiwi-module.properties | 6 +-
15 files changed, 498 insertions(+), 213 deletions(-)
----------------------------------------------------------------------