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/12/10 17:21:48 UTC
[1/2] git commit: applied patch for MARMOTTA-381
Updated Branches:
refs/heads/develop a097b4e09 -> 5ede51633
applied patch for MARMOTTA-381
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/92e66019
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/92e66019
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/92e66019
Branch: refs/heads/develop
Commit: 92e66019d95a9310d0075612cdf25323a239fb52
Parents: 2be634a
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Dec 10 17:16:20 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Dec 10 17:16:20 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/web/admin/console.html | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/92e66019/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
index 87b6835..95543c3 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
@@ -21,17 +21,12 @@
<head>
<!--###BEGIN_HEAD###-->
<title>Core Module</title>
- <script type="text/javascript">
- (function() {
- window.open('../../database/');
- })();
- </script>
<!--###END_HEAD###-->
</head>
<body>
<!--###BEGIN_CONTENT###-->
<h1>Manage Marmotta database via web-interface</h1>
-<a href="../../database/" target="_blank">Open database administration page in new window.</a>
+<iframe src="../../database/" width="100%" height="500px" scrolling="no" style="border:none;"></iframe>
<!--###END_CONTENT###-->
</body>
</html>
\ No newline at end of file
[2/2] git commit: Merge remote-tracking branch 'origin/develop' into
develop
Posted by ss...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5ede5163
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5ede5163
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5ede5163
Branch: refs/heads/develop
Commit: 5ede516336f6c184d8f722418f520f73c0fd7cdd
Parents: 92e6601 a097b4e
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Dec 10 17:21:32 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Dec 10 17:21:32 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------