Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
p3x-robot sunday release 7/1/2018, 8:03:45 PM
Browse files Browse the repository at this point in the history
@p3x-robot
p3x-robot committed Jul 1, 2018
1 parent 1c65db5 commit 1c7df3f
Showing 18 changed files with 163 additions and 87 deletions.
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ UrlToolkit {

---

[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.46-847
[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.52-855

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

13 changes: 10 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@



# 🤖 P3X Gitlist v2.8.46-847
# 🤖 P3X Gitlist v2.8.52-855

This is an open-source project. Star this repository if you like it, or even donate! Thank you so much! :)

@@ -103,7 +103,14 @@ The following versions are not using `Babel`!!!! Yikes!
https://github.com/klaussilveira/gitlist

### Last merge from `klaussilveira`
May 21, 2018

#### Gitlist
https://github.com/klaussilveira/gitlist/commits/master
Jun 22, 2018

#### Gitter
https://github.com/klaussilveira/gitter/commits/master
Jun 1, 2018

# Live demo

@@ -164,7 +171,7 @@ npm run watch

---

[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.46-847
[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.52-855

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

2 changes: 1 addition & 1 deletion artifacts/php-7.2-ubuntu.md
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ sudo apt upgrade -y

---

[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.46-847
[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.52-855

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

2 changes: 1 addition & 1 deletion changelog.md
View file
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ require('codemirror/mode/yaml/yaml');

---

[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.46-847
[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.52-855

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

1 change: 1 addition & 0 deletions config.example.ini
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ repositories[] = '/var/git/' ; Path to your repositories
; hidden[] = '/home/git/repositories/BetaTest'

[app]
title = P3X GitList
debug = false
cache = true

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "p3x-gitlist",
"version": "2.8.47-848",
"version": "2.8.52-855",
"corifeus": {
"prod-dir": "prod",
"postfix": "8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73",
"postfix": "20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6",
"prefix": "p3x-",
"publish": false,
"type": "p3x",
@@ -73,4 +73,4 @@
"snackbarjs": "^1.1.0",
"twemoji": "^11.0.0"
}
}
}
Binary file modified public/img/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/img/gitlist.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/GitList/Controller/CommitController.php
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ public function connect(Application $app)
$categorized[$date][] = $commit;
}

$template = $app['request_stack']->getCurrentRequest()->isXmlHttpRequest() ? 'commits-list.twig' : 'commits.twig';
$template = $app['request_stack']->getCurrentRequest()->isXmlHttpRequest() ? 'commits-list.js' : 'commits.twig';

return $app['twig']->render($template, array(
'page' => 'commits',
10 changes: 3 additions & 7 deletions src/Gitter/Client.php
View file
Original file line number Diff line number Diff line change
@@ -245,7 +245,7 @@ public function getRepositories($paths)
return $allRepositories;
}

private function recurseDirectory($path, $topLevel = true)
private function recurseDirectory($path, $appendPath = '')
{
$dir = new \DirectoryIterator($path);

@@ -285,11 +285,7 @@ private function recurseDirectory($path, $topLevel = true)
$description = null;
}

if (!$topLevel) {
$repoName = $file->getPathInfo()->getFilename() . '/' . $file->getFilename();
} else {
$repoName = $file->getFilename();
}
$repoName = $appendPath . $file->getFilename();

if (is_array($this->getProjects()) && !in_array($repoName, $this->getProjects())) {
continue;
@@ -303,7 +299,7 @@ private function recurseDirectory($path, $topLevel = true)

continue;
} else {
$repositories = array_merge($repositories, $this->recurseDirectory($file->getPathname(), false));
$repositories = array_merge($repositories, $this->recurseDirectory($file->getPathname(), $appendPath . $file->getFilename() . '/'));
}
}
}
1 change: 1 addition & 0 deletions src/browser/bundle.js
View file
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ require('./js/index.js')
require('./js/file')
require('./js/theme-switcher.js')
require('./js/commit')
require('./js/commits-list')
require('./js/global')
require('./js/angular/bootstrap');

10 changes: 10 additions & 0 deletions src/browser/js/commits-list.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
$(() => {

const commitList = $('#p3x-gitlist-commits-list');

if (commitList.length > 0) {
const twemojiSettings = require('./settings').twemoji;
commitList.html(twemoji.parse(commitList.html(), twemojiSettings));
}

})
36 changes: 18 additions & 18 deletions src/browser/js/themes.js
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

const themes = {
"bootstrap-default": "prod/css/bootstrap-default.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-solar": "prod/css/bootstrap-solar.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-cerulean": "prod/css/bootstrap-cerulean.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-cosmo": "prod/css/bootstrap-cosmo.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-cyborg": "prod/css/bootstrap-cyborg.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-darkly": "prod/css/bootstrap-darkly.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-flatly": "prod/css/bootstrap-flatly.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-journal": "prod/css/bootstrap-journal.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-lumen": "prod/css/bootstrap-lumen.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-paper": "prod/css/bootstrap-paper.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-readable": "prod/css/bootstrap-readable.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-sandstone": "prod/css/bootstrap-sandstone.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-simplex": "prod/css/bootstrap-simplex.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-slate": "prod/css/bootstrap-slate.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-spacelab": "prod/css/bootstrap-spacelab.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-superhero": "prod/css/bootstrap-superhero.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-united": "prod/css/bootstrap-united.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css",
"bootstrap-yeti": "prod/css/bootstrap-yeti.8b5e3a4adea77d341db75b103d5b6a2b786da21f1fcc9598e2dc67a82b3bee73.css"
"bootstrap-default": "prod/css/bootstrap-default.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-solar": "prod/css/bootstrap-solar.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-cerulean": "prod/css/bootstrap-cerulean.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-cosmo": "prod/css/bootstrap-cosmo.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-cyborg": "prod/css/bootstrap-cyborg.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-darkly": "prod/css/bootstrap-darkly.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-flatly": "prod/css/bootstrap-flatly.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-journal": "prod/css/bootstrap-journal.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-lumen": "prod/css/bootstrap-lumen.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-paper": "prod/css/bootstrap-paper.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-readable": "prod/css/bootstrap-readable.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-sandstone": "prod/css/bootstrap-sandstone.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-simplex": "prod/css/bootstrap-simplex.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-slate": "prod/css/bootstrap-slate.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-spacelab": "prod/css/bootstrap-spacelab.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-superhero": "prod/css/bootstrap-superhero.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-united": "prod/css/bootstrap-united.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css",
"bootstrap-yeti": "prod/css/bootstrap-yeti.20a700444a281ab649b240e9237215c11a7bfb9e2c3c800d2de262b8a5a6acc6.css"
};
module.exports = themes;
1 change: 1 addition & 0 deletions src/browser/less/default.less
View file
Original file line number Diff line number Diff line change
@@ -113,3 +113,4 @@ img.emoji {
@import "codemirror";
@import "commit";
@import "tree";
@import "navigation";
22 changes: 22 additions & 0 deletions src/browser/less/navigation.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.p3x-gitlist-navigation-brand-icon {

}


#p3x-gitlist-navigation-brand-icon-pure {
height: @navbar-height - 16px;
width: auto;
top: 8px;
position: absolute;
}

#p3x-gitlist-navigation-brand-icon {
height: @navbar-height - @navbar-margin-bottom - 2px;
width: auto;
display: inline-block;
}

#p3x-gitlist-navigation-brand-icon-title {
display: inline-block;
margin-left: 36px;
}
102 changes: 54 additions & 48 deletions src/twig/commits-list.twig
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,55 @@
{% if commits %}
{% for date, commit in commits %}
<table class="table table-striped">
<thead>
<tr>
<th>{{ date | date("F j, Y") }}</th>
</tr>
</thead>
<tbody>
{% for item in commit %}
<tr>
<td>
{% for date, commit in commits %}
<table class="table table-striped" id="p3x-gitlist-commits-list">
<thead>
<tr>
<th>{{ date | date("F j, Y") }}</th>
</tr>
</thead>
<tbody>
{% for item in commit %}
<tr>
<td>

<div class="pull-right" style="text-align: right;">
<a class="btn btn-primary btn-sm" href="{{ path('branch', {repo: repo, branch: item.hash}) }}" title="Browse code at this point in history"><span class="fa fa-list-alt"></span>&nbsp;Browse</a>
<div class="pull-right" style="text-align: right;">
<a class="btn btn-primary btn-sm"
href="{{ path('branch', {repo: repo, branch: item.hash}) }}"
title="Browse code at this point in history"><span class="fa fa-list-alt"></span>&nbsp;Browse</a>

<a class="btn btn-primary default btn-sm" href="{{ path('commit', {repo: repo, commit: item.hash}) }}"><i class="far fa-chart-bar"></i>&nbsp;Changes</a>
<div style="margin-top: 5px;">
<span class="hidden-xs">{{ item.hash }}</span>
<span class="hidden-sm hidden-md hidden-lg">{{ item.shortHash }}</span>
</div>
</div>
<a class="btn btn-primary default btn-sm"
href="{{ path('commit', {repo: repo, commit: item.hash}) }}"><i
class="far fa-chart-bar"></i>&nbsp;Changes</a>
<div style="margin-top: 5px; opacity: 0.5;">
<span class="hidden-xs">{{ item.hash }}</span>
<span class="hidden-sm hidden-md hidden-lg">{{ item.shortHash }}</span>
</div>
</div>

<div class="media">
<div class="media-left">
<a>
<img class="media-object" src="{{ avatar(item.author.email, 40) }}" />
</a>
</div>
<div class="media-body">
<h4 class="media-heading">
{{ item.message }}
</h4>
<a href="mailto:{{ item.author.email }}">{{ item.author.name }}</a> authored on {{ item.date | format_date }}
{% if item.author.email != item.commiter.email %}
&bull; <a href="mailto:{{ item.commiter.email }}">{{ item.commiter.name }}</a> committed on {{ item.commiterDate | format_date }}
{% endif %}
<div class="media">
<div class="media-left">
<a>
<img class="media-object" src="{{ avatar(item.author.email, 40) }}"/>
</a>
</div>
<div class="media-body">
<h4 class="media-heading">
{{ item.message }}
</h4>
<a href="mailto:{{ item.author.email }}">{{ item.author.name }}</a> authored
on {{ item.date | format_date }}
{% if item.author.email != item.commiter.email %}
&bull; <a
href="mailto:{{ item.commiter.email }}">{{ item.commiter.name }}</a> committed on {{ item.commiterDate | format_date }}
{% endif %}

</div>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endfor %}
</div>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endfor %}
{% else %}

<h4>
@@ -53,13 +59,13 @@
{% endif %}

{% if page != 'searchcommits' %}
<ul class="pager">
{% if pager.current != pager.last %}
<li class="next" id="p3x-gitlist-commit-list-next">
<a href="?page={{ pager.next }}">Older / Next &rarr;</a>
</li>
{% endif %}
</ul>
<ul class="pager">
{% if pager.current != pager.last %}
<li class="next" id="p3x-gitlist-commit-list-next">
<a href="?page={{ pager.next }}">Older / Next &rarr;</a>
</li>
{% endif %}
</ul>
{% endif %}

<script type="text/javascript">
13 changes: 10 additions & 3 deletions src/twig/navigation.twig
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,16 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand hidden-xs" href="{{ path('homepage') }}">{{ app.title }}</a>
<a class="navbar-brand hidden-sm hidden-md hidden-lg" href="{{ path('homepage') }}"data-toggle="tooltip" data-placement="bottom" title="{{ app.title }}">
<i class="fab fa-git-square fa-fw" style="transform: scale(1.75)"></i>
<a class="navbar-brand hidden-xs" href="{{ path('homepage') }}" id="p3x-gitlist-navigation-brand-header" class="p3x-gitlist-navigation-brand">
<img src="img/gitlist.svg" id="p3x-gitlist-navigation-brand-icon" class="p3x-gitlist-navigation-brand-icon"/>
<span id="p3x-gitlist-navigation-brand-title">
{{ app.title }}
</span>

</a>
<a class="navbar-brand hidden-sm hidden-md hidden-lg" style="position: relative;" href="{{ path('homepage') }}">
<!-- <i class="fab fa-git-square fa-fw" style="transform: scale(1.75)"></i> -->
<img src="img/gitlist.svg" id="p3x-gitlist-navigation-brand-icon-pure" class="p3x-gitlist-navigation-brand" data-toggle="tooltip" data-placement="bottom" title="{{ app.title }}"/>
</a>
</div>
<div class="navbar-collapse collapse" id="p3x-gitlist-navigation-theme">
2 changes: 1 addition & 1 deletion todo.md
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@

---

[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.46-847
[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.8.52-855

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

0 comments on commit 1c7df3f

Please sign in to comment.