added in remote
their 100644 f0ab30079de1d929c4f97a87894534b0cca16ccc root/themes/default/compare.html
@@ -0,0 +1,66 @@
+<div class="main_title">Git hosting solutions comparison</div>
+<div><b>Notes</b>:<br />- To contribute to this document, just e-mail us to in@rocketgit.com or clone the RocketGit <a href="https://rocketgit.com/user/catalinux/rocketgit">repository</a>, make changes and push them.<br />- Move mouse over features field for more information.</div>
+<table class="compare">
+<tr><th>Features / Product</th><th>RocketGit</th><th>Gitlab CE</th><th>GitHub</th><th>gitolite</th><th>Pagure.io</th><th>Gogs.io</th></tr>
+<tr><td colspan="7"><b>Legal</b></td></tr>
+<tr><td>License</td><td bgcolor="">Affero GPLv3+</td><td class="ccl-g">MIT</td><td class="ccl-r">Proprietary</td><td class="ccl-g">GPLv2</td><td class="ccl-g">GPLv2 or later</td><td class="ccl-g">MIT</td></tr>
+<tr><td><span title="This is about contributing to the Git hosting project, not about projects hosted inside. Signing/agreeing a Contributor Licence Agreement (CLA) is very bad for free software.">Developers keep copyright when contributing</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-r">n/a</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td></tr>
+<tr><td>GNU Ethical Repository Criteria Evaluations (see 3)</td><td class="ccl-g">A (-A4, +A+0, +A+1, +A+2, +A+5)</td><td class="ccl-r">C</td><td class="ccl-r">F</td><td>?</td><td class="ccl-g">A?</td><td>?</td></tr>
+<tr><td colspan="7">&nbsp;</td></tr>
+<tr><td colspan="7"><b>Features</b></td></tr>
+<tr><td><span title="How easy can you install the software on your server?">Easy installation</span></td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes?</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td></tr>
+<tr><td><span title="SELinux is an application firewall used to improve the security">SELinux policy</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td><td class="ccl-g">not needed</td><td>?</td><td>?</td></tr>
+<tr><td><span title="Is a &#039;yum/dnf/apt-get/etc. update&#039; is enough to update the software? Is it free of a inner package manager?">Distro friendly</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No (see 1)</td><td class="ccl-r">No (see 1)</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes?</td><td class="ccl-g">Yes?</td></tr>
+<tr><td>Bug tracker</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td><td>?</td></tr>
+<tr><td><span title="Allow SSH commands to show the list of repositories show a repo status etc.">CLI commands (SSH)</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td>API</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td class="ccl-g">Yes</td><td>?</td></tr>
+<tr><td><span title="With no user created, clone, make changes, will push result in a merge request, making it super easy to contribute to a project?">Anonymous push</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-r">No</td><td class="ccl-r">No?</td><td class="ccl-r">No</td><td>?</td></tr>
+<tr><td>Languages available (i18n)</td><td>1</td><td>?</td><td>?</td><td>1</td><td>?</td><td>14</td></tr>
+<tr><td>IPv6</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td></tr>
+<tr><td><span title="Are Git submodules supported?">Submodules</span></td><td>?</td><td>?</td><td>?</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td>Usable with lynx</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>n/a</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td></tr>
+<tr><td>2fa (two-factor authentication)</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes (see 2)</td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td></tr>
+<tr><td>Web Hooks</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td></tr>
+<tr><td>Web Hooks - provide client certs</td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-r">No</td><td>n/a</td><td>?</td><td class="ccl-r">No</td></tr>
+<tr><td>Web Hooks - authenticate server (CA cert)</td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-r">No</td><td>n/a</td><td>?</td><td class="ccl-r">No</td></tr>
+<tr><td>OpenSSH AuthorizedKeysCommand</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td class="ccl-r">No</td><td>?</td></tr>
+<tr><td><span title="Can it disable the keys based on types and number of bits?">OpenSSH filter by key type and bits</span></td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td class="ccl-r">No</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td></tr>
+<tr><td><span title="Can it show: type, number of bits, when it was uploaded, when it was first/last used, how many times was used and last command?">Detailed info about the SSH keys</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td><td class="ccl-r">No</td><td class="ccl-r">No</td><td>?</td></tr>
+<tr><td>LDAP user authentication</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td class="ccl-r">No</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td></tr>
+<tr><td>LDAP groups</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td>PAM user authentication</td><td class="ccl-r">No</td><td>?</td><td>?</td><td>?</td><td>?</td><td class="ccl-g">Yes</td></tr>
+<tr><td>Git LFS</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td class="ccl-r">No</td></tr>
+<tr><td>Lock repo with a message</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td>Continuous integration</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td>Code review</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td>Wiki</td><td class="ccl-r">No</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>n/a</td><td>?</td><td>?</td></tr>
+<tr><td><span title="Is it light on CPU/memory/disk?">System resource friendly?</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td><td class="ccl-g">Yes</td><td>?</td><td>?</td></tr>
+<tr><td colspan="7">&nbsp;</td></tr>
+<tr><td colspan="7"><b>Rights</b></td></tr>
+<tr><td><span title="Can it control which files are pushed with some regex?">Path control</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td></tr>
+<tr><td><span title="Can it control with a regex what branches you fetch/push?">Refs control</span></td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td class="ccl-g">Yes</td><td>?</td></tr>
+<tr><td><span title="Can it control from what IPs you can fetch/push?">IP control</span></td><td class="ccl-g">Yes</td><td class="ccl-r">No</td><td>?</td><td>?</td><td class="ccl-g">Yes?</td><td>?</td></tr>
+<tr><td colspan="7">&nbsp;</td></tr>
+<tr><td colspan="7"><b>Product distribution/evaluation</b></td></tr>
+<tr><td>KVM image available?</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td class="ccl-g">not needed</td><td>?</td><td>?</td></tr>
+<tr><td>VirtualBox image available?</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td class="ccl-g">not needed</td><td>?</td><td>?</td></tr>
+<tr><td>VMWare image available?</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td class="ccl-g">not needed</td><td>?</td><td>?</td></tr>
+<tr><td>Docker container available?</td><td class="ccl-g">Yes</td><td class="ccl-g">Yes</td><td>?</td><td>?</td><td>?</td><td>?</td></tr>
+<tr><td colspan="7">&nbsp;</td></tr>
+<tr><td colspan="7"><b>Details</b></td></tr>
+<tr><td>Language</td><td>PHP</td><td>Ruby+Perl</td><td>Ruby</td><td>Perl</td><td>Python</td><td>Go</td></tr>
+<tr><td><span title="JavaScript not included">Number of code lines</span></td><td>38k</td><td>360k</td><td>?</td><td>?</td><td>80k</td><td>520k</td></tr>
+<tr><td>Cache</td><td>Custom</td><td>Redis</td><td>memcache</td><td>n/a</td><td>Redis</td><td>Custom/Redis/memcache</td></tr>
+<tr><td>Database</td><td>PostgreSQL</td><td>My/PostgresSQL</td><td>MySQL</td><td>?</td><td>MySQL/MariaDB/PostgreSQL/SQLite</td><td>PostgreSQL/MySQL/SQLite</td></tr>
+<tr><td>Webserver</td><td>nginx/apache</td><td>apache/nginx</td><td>?</td><td>?</td><td>n/a</td><td>apache/nginx/lighttpd</td></tr>
+<tr><td>Size of the rpm package</td><td class="ccl-g">400KiB</td><td class="ccl-r">287MiB</td><td>?</td><td class="ccl-g">170KiB</td><td>?</td><td>?</td></tr>
+<tr><td>Page speed: Mobile (speed/user experience)</td><td class="ccl-g">90/96</td><td class="ccl-r">32/90</td><td class="ccl-r">67/96</td><td>n/a</td><td class="ccl-r">54/67</td><td class="ccl-r">32/72</td></tr>
+<tr><td>Page speed: Desktop</td><td class="ccl-g">96</td><td>?</td><td class="ccl-g">81</td><td>n/a</td><td class="ccl-r">64</td><td class="ccl-r">26</td></tr>
+<tr><td>CSS size</td><td class="ccl-g">9KiB</td><td class="ccl-r">250KiB</td><td class="ccl-r">560KiB</td><td>n/a</td><td class="ccl-g">130KiB</td><td class="ccl-r">520KiB</td></tr>
+<tr><td>JS size</td><td class="ccl-g">0KiB</td><td class="ccl-r">1170KiB</td><td class="ccl-r">670KiB</td><td>n/a</td><td class="ccl-r">450KiB</td><td class="ccl-r">350KiB</td></tr>
+<tr><td colspan="7">&nbsp;</td></tr>
+<tr><td colspan="7"><b>Notes</b></td></tr>
+<tr><td colspan="7">1) It has a not standard package manager; upgrading distro does not update the git software (pip, gem etc.). Or is a big archive including packages already found in the distribution.</td></tr>
+<tr><td colspan="7">2) Seems is not really secure: if key is leaking, the attacker can push.</td></tr>
+<tr><td colspan="7">3) Repo criteria by GNU: https://www.gnu.org/software/repo-criteria.html</td></tr>
+</table>
changed in both
base 100644 61e6a4704fadd9b6ee45cf542d153913066a3d54 root/themes/default/main.css
our 100644 4528e0c35db6e658ebd9c83875a0e863f8ec5b90 root/themes/default/main.css
their 100644 d19594980951e791041519233bcd8e29012ac26a root/themes/default/main.css
@@ -14,6 +14,7 @@
font-family: Arial, sans-serif;
font-size: 11pt;
line-height: 105%;
+<<<<<<< .our
background-color: #ccc;
height: 100%;
}
@@ -24,6 +25,10 @@

li {
margin-left: 5pt;
+=======
+ background-color: #212121;
+ color: gray;
+>>>>>>> .their
}

table {
@@ -40,7 +45,9 @@
vertical-align: top;
text-align: left;
padding: 3px;
- border: 1px solid #aaa;
+ border: 1px solid #383838;
+ background-color: #212121;
+ color: gray;
}

thead tr {
@@ -56,24 +63,39 @@

a {
text-decoration: none;
+ color: darkgoldenrod;
}

.xcode {
+<<<<<<< .our
border-left: 4px solid #f00;
font-size: 9pt;
+=======
+ border-left: 4px solid #903232;
+ font-size: 10pt;
+>>>>>>> .their
margin: 5px;
padding-left: 5px;
font-family: monospace;
+ color: #bdbdbd;
}

.term {
- background-color: #000;
+ background-color: #121212;
font-family: monospace;
font-size: 9pt;
+<<<<<<< .our
color: #0f0;
border-left: 4px solid #f00;
margin: 5pt 0;
padding: 5pt;
+=======
+ color: #969696;
+ border-left: 4px solid #6e1d1d;
+ margin: 5px 0;
+ padding-left: 5px;
+ padding-right: 5px;
+>>>>>>> .their
white-space: pre-wrap;
}

@@ -84,8 +106,15 @@
form input, form textarea, form select {
border: 1px solid #999;
font-size: 11pt;
+<<<<<<< .our
padding: 3pt;
width: 100%;
+=======
+ padding: 2px;
+ margin: 2px 0px;
+ background-color: #1e2024;
+ color: grey;
+>>>>>>> .their
}
form input[type="checkbox"] {
width: auto;
@@ -94,6 +123,7 @@
width: auto;
}
form input[type="submit"] {
+<<<<<<< .our
color: #f00;
font-size: 12pt;
padding: 7pt;
@@ -107,6 +137,15 @@
}
form .form_short {
width: auto;
+=======
+ color: #fff;
+ font-size: 11pt;
+ padding: 2px 4px 2px 4px;
+ cursor: pointer;
+ border: 1px solid #999;
+ /*! background-image: -moz-linear-gradient(top, #EEE, #DDD); */
+ margin-top: 5pt;
+>>>>>>> .their
}

.buttons {
@@ -126,7 +165,7 @@
font-size: 16pt;
font-weight: bold;
padding: 5px 15px;
- color: yellow;
+ color: #efb527;
font-style: italic;
text-shadow: 0 0 2px #000;
}
@@ -146,9 +185,14 @@
vertical-align: middle;
font-size: 10pt;
font-weight: bold;
+<<<<<<< .our
color: #000;
padding: 1pt;
margin: 4pt;
+=======
+ color: whitesmoke;
+ padding: 6px;
+>>>>>>> .their
}
.main_menu a:hover { color: #f00; }

@@ -180,10 +224,10 @@
padding: 2px 15px;
text-shadow: 0 0 2px #000;
}
-.menu ul li a:hover { color: #f00; }
-.menu ul li.selected a { border-bottom: 2px solid #f00; }
-.menu2 { background-color: #aaa; }
-.menu3 { background-color: #bbb; }
+.menu ul li a:hover { color: #b01b1b; }
+.menu ul li.selected a { border-bottom: 2px solid #921414; }
+.menu2 { background-color: #565656; }
+.menu3 { background-color: #565656; }


.main_title {
@@ -191,7 +235,7 @@
text-shadow: 0 0 2px #000;
font-size: 20pt;
font-weight: bold;
- border-bottom: 2px solid #f00;
+ border-bottom: 2px solid #921414;
}

.junk {}
@@ -204,8 +248,8 @@
border-radius: 4px 4px 4px 4px;
font-size: 10pt;
}
-.branch a { background-color: #a0ffa0; }
-.tag a { background-color: #ffffa0; }
+.branch a { background-color: #86c686; }
+.tag a { background-color: #b9b961; }


#container {
@@ -225,7 +269,12 @@
}

#header {
+<<<<<<< .our
background-color: #bbb;
+=======
+ background-color: #565656;
+ margin-bottom: 6px;
+>>>>>>> .their
display: flex;
flex-flow: row wrap;
justify-content: space-between;
@@ -234,8 +283,13 @@
}

#footer {
+<<<<<<< .our
background-color: #bbb;
margin-top: 7pt;
+=======
+ background-color: #3b3b3b;
+ margin-top: 6px;
+>>>>>>> .their
display: flex;
flex-flow: row wrap;
align-content: space-around;
@@ -248,7 +302,7 @@
width: 190pt;
}
.footer_info {
- color: #000;
+ color: #898989;
padding: 10px;
font-size: 11pt;
vertical-align: top;
@@ -277,7 +331,8 @@
font-weight: bold;
font-size: 13pt;
border: 0;
- border-bottom: 2px solid #f00;
+ border-bottom: 2px solid #a42a2a;
+ color: white;
}


@@ -334,19 +389,28 @@
.cl-r {
font-family: monospace;
font-size: 9pt;
- background-color: #f00;
+ background-color: #4a1d1d;
}

.cl-g {
font-family: monospace;
font-size: 9pt;
- background-color: #0f0;
+ background-color: #194119;
}

.cl-e {
font-family: monospace;
font-size: 9pt;
- background-color: #eee;
+ background-color: #000;
+ color: #b7b7b7;
+}
+
+.ccl-r {
+ background-color: #4a1d1d;
+}
+
+.ccl-g {
+ background-color: #194119;
}

.repo_container {
@@ -363,7 +427,7 @@
color: #c00;
}
.repo_title a {
- color: #777;
+ color: #b5840b;
}

.repo_title_info {
@@ -371,9 +435,15 @@
}

.repo_desc {
+<<<<<<< .our
font-size: 10pt;
color: #333;
+=======
+ font-size: 14pt;
+ color: #888;
+>>>>>>> .their
margin: 3px 0px;
+ font-style: italic;
}

.repo_body {
@@ -393,10 +463,11 @@
border: 1px solid #aaa;
border-radius: 4px 4px 4px 4px;
padding: 3px 3px;
- background-color: #e5e5ff;
+ background-color: #565656;
+ color: white;
}
.url a {
- color: #666;
+ color: #b5840a;
}

.form_error { margin-top: 6pt; color: #f00; }
@@ -418,24 +489,32 @@
background-color: #a0d0ff;
}

+<<<<<<< .our
.searches { }
+=======
+.
+{ padding: 3px 0px; margin: 3px 0px; }
+>>>>>>> .their
.searches ul { list-style-type: none; }
.searches ul li {
display: inline;
padding: 3px 3px;
color: #000;
- border: 1px solid #aaa;
+ border: 1px solid #ccc;
border-radius: 4px 4px 4px 4px;
font-size: 9pt;
- background-color: #a0d0ff;
+ background-color: #6e93b9;
+}
+.searches a {
+ color: white;
}

.hints {
text-align: left;
- background-color: #fff;
+ background-color: #2c2b2b;
padding: 4pt;
border-radius: 4px 4px 4px 4px;
- border: 1px solid #ccc;
+ border: 1px solid #6e6e6e;
font-size: 9pt;
box-shadow: 0px 2px 3px #666;
}
@@ -499,8 +578,8 @@
}

.error {
- background-color: #f00;
- color: #000;
+ background-color: #8a2727;
+ color: #d5d5d5;
}

.warning_text {
@@ -508,15 +587,15 @@
}

.warning {
- background-color: #ccc;
- border: 1px solid #f00;
- color: #f00;
+ background-color: #212121;
+ border: 1px solid #813030;
+ color: #952525;
}

.ok {
- background-color: #8f8;
- border: 1px solid #000;
- color: #000;
+ background-color: #4e784e;
+ border: 1px solid #4e784e;
+ color: #fff;
}

.page_title {
@@ -535,7 +614,7 @@
}

.island, .island_wide {
- border-radius: 4px 4px 4px 4px;
+ /*! border-radius: 4px 4px 4px 4px; */
border: 1px solid #999;
font-size: 13pt;
padding: 5pt;
@@ -549,7 +628,7 @@
}

.island_title {
- color: #f00;
+ color: #ad3b3b;
font-size: 14pt;
font-weight: bold;
padding-bottom: 9px;
@@ -660,6 +739,7 @@
}


+<<<<<<< .our
.compare { }
.compare_intro { margin-top: 7pt; }
.compare_good { background-color: #0f0; }
@@ -700,3 +780,6 @@
margin-top: 8pt;
}

+=======
+.
+>>>>>>> .their
changed in both
base 100644 04b55ca097d92ab4e7b88c691fe26feb316d5dcd root/themes/default/main.html
our 100644 ec812085f2356590b533a6d857e4e664c001216f root/themes/default/main.html
their 100644 e750c80d50cb4de2ad66d381f432e1d5e9037361 root/themes/default/main.html
@@ -1,5 +1,5 @@
<div class="islands">
- <div class="island" style="background-color: #bbb; color: #fff; width: 100%">
+ <div class="island" style="width: 100%">
<div class="island_title island_title_big">Welcome to RocketGit!</div>
<span style="font-weight: bold; font-size: 16pt">
Free (as in speech and as in beer) software