Commit 16ba21b2 authored by Ivanq's avatar Ivanq

Rename 'Network' to 'Log'

parent 94349973
<?xml version="1.0" ?><svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><defs><style>.cls-1{fill:none;stroke:#000;stroke-linejoin:round;stroke-width:2px;}</style></defs><title/><g data-name="21-List" id="_21-List"><line class="cls-1" x1="10" x2="32" y1="2" y2="2"/><line class="cls-1" x1="10" x2="20" y1="6" y2="6"/><line class="cls-1" x1="10" x2="32" y1="14" y2="14"/><line class="cls-1" x1="10" x2="20" y1="18" y2="18"/><line class="cls-1" x1="10" x2="32" y1="26" y2="26"/><line class="cls-1" x1="10" x2="20" y1="30" y2="30"/><circle class="cls-1" cx="4" cy="4" r="3"/><circle class="cls-1" cx="4" cy="16" r="3"/><circle class="cls-1" cx="4" cy="28" r="3"/></g></svg>
\ No newline at end of file
......@@ -58,9 +58,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../img/settings.svg" width="16">
......
......@@ -58,9 +58,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../img/settings.svg" width="16">
......
......@@ -56,9 +56,9 @@
<img src="../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../img/settings.svg" width="16">
......
......@@ -57,9 +57,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../img/settings.svg" width="16">
......
......@@ -58,9 +58,9 @@
<img src="../../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../../img/settings.svg" width="16">
......
......@@ -58,9 +58,9 @@
<img src="../../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../../img/settings.svg" width="16">
......
......@@ -16,9 +16,9 @@ function showTabs(level) {
"?" + address
);
document.getElementById("network_link").href = (
document.getElementById("log_link").href = (
"../".repeat(level) +
"network/" +
"log/" +
"?" + address
);
......
......@@ -55,9 +55,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab tab-current">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab tab-current">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../img/settings.svg" width="16">
......@@ -82,7 +82,6 @@
<script type="text/javascript" src="../../js/ZeroDB.js"></script>
<script type="text/javascript" src="../../js/pako.js"></script>
<script type="text/javascript" src="../../js/sha.js"></script>
<script type="text/javascript" src="../../gitgraph/gitgraph.js"></script>
<script type="text/javascript" src="../../js/git.js"></script>
<script type="text/javascript" src="../../js/repo.js"></script>
<script type="text/javascript" src="../js/user_common.js"></script>
......
......@@ -67,18 +67,10 @@ repo.addMerger()
});
*/
return repo.getCommits(branch, 100);
return repo.getCommits(branch, 10);
})
.then(commits => {
commits.forEach(commit => {
if(commit.content.parents.length > 1) {
let note = document.createElement("div");
note.className = "note";
note.innerHTML = "Commits " + commit.content.parents.map(commit => commit.id).join(", ") + " were merged into " + commit.id;
document.getElementById("commits").appendChild(note);
}
let node = document.createElement("div");
node.className = "commit";
......@@ -101,6 +93,12 @@ repo.addMerger()
document.getElementById("commits").appendChild(node);
if(commit.content.parents.length > 1) {
let note = document.createElement("div");
note.className = "note";
note.innerHTML = "Commits " + commit.content.parents.map(commit => commit.id).join(", ") + " were merged into " + commit.id;
document.getElementById("commits").appendChild(note);
}
if(commit.content.delivered) {
let note = document.createElement("div");
......
......@@ -58,9 +58,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../img/settings.svg" width="16">
......
......@@ -57,9 +57,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab">
<img src="../../img/settings.svg" width="16">
......
......@@ -53,9 +53,9 @@
<img src="../../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="tab">
<img src="../../../img/settings.svg" width="16">
......
......@@ -57,9 +57,9 @@
<img src="../../img/pr-merged.svg" width="16">
Pull requests
</a>
<a id="network_link" class="tab">
<img src="../../img/network.svg" width="16">
Network
<a id="log_link" class="tab">
<img src="../../img/log.svg" width="16">
Log
</a>
<a id="settings_link" class="settings-link tab tab-current">
<img src="../../img/settings.svg" width="16">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment