diff --git a/INSTALL.md b/INSTALL.md index 2cce66f3..c8541ec1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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) diff --git a/README.md b/README.md index 214228dc..c98d1212 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/artifacts/php-7.2-ubuntu.md b/artifacts/php-7.2-ubuntu.md index 95b1d4e4..564a79d6 100644 --- a/artifacts/php-7.2-ubuntu.md +++ b/artifacts/php-7.2-ubuntu.md @@ -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) diff --git a/changelog.md b/changelog.md index 75bc534c..8cfbce92 100644 --- a/changelog.md +++ b/changelog.md @@ -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) diff --git a/config.example.ini b/config.example.ini index a7c8c7ce..dcde5e25 100644 --- a/config.example.ini +++ b/config.example.ini @@ -12,6 +12,7 @@ repositories[] = '/var/git/' ; Path to your repositories ; hidden[] = '/home/git/repositories/BetaTest' [app] +title = P3X GitList debug = false cache = true diff --git a/package.json b/package.json index af22edf8..1814fcd8 100644 --- a/package.json +++ b/package.json @@ -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" } -} +} \ No newline at end of file diff --git a/public/img/favicon.png b/public/img/favicon.png index 8fe5ce5e..e2f3b744 100644 Binary files a/public/img/favicon.png and b/public/img/favicon.png differ diff --git a/public/img/gitlist.svg b/public/img/gitlist.svg new file mode 100644 index 00000000..6589a4a5 --- /dev/null +++ b/public/img/gitlist.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php index 8da3f8e2..613bb4cf 100644 --- a/src/GitList/Controller/CommitController.php +++ b/src/GitList/Controller/CommitController.php @@ -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', diff --git a/src/Gitter/Client.php b/src/Gitter/Client.php index adc0b58a..cdb45388 100644 --- a/src/Gitter/Client.php +++ b/src/Gitter/Client.php @@ -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() . '/')); } } } diff --git a/src/browser/bundle.js b/src/browser/bundle.js index 3f73e769..6a7ec41e 100644 --- a/src/browser/bundle.js +++ b/src/browser/bundle.js @@ -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'); diff --git a/src/browser/js/commits-list.js b/src/browser/js/commits-list.js new file mode 100644 index 00000000..8f15bf6d --- /dev/null +++ b/src/browser/js/commits-list.js @@ -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)); + } + +}) \ No newline at end of file diff --git a/src/browser/js/themes.js b/src/browser/js/themes.js index b56cd67b..83b21bdc 100644 --- a/src/browser/js/themes.js +++ b/src/browser/js/themes.js @@ -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; diff --git a/src/browser/less/default.less b/src/browser/less/default.less index 882b69e4..89f0528a 100644 --- a/src/browser/less/default.less +++ b/src/browser/less/default.less @@ -113,3 +113,4 @@ img.emoji { @import "codemirror"; @import "commit"; @import "tree"; +@import "navigation"; diff --git a/src/browser/less/navigation.less b/src/browser/less/navigation.less new file mode 100644 index 00000000..a8f4b28e --- /dev/null +++ b/src/browser/less/navigation.less @@ -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; +} \ No newline at end of file diff --git a/src/twig/commits-list.twig b/src/twig/commits-list.twig index 3b0a04fc..a75b736e 100644 --- a/src/twig/commits-list.twig +++ b/src/twig/commits-list.twig @@ -1,49 +1,55 @@ {% if commits %} -{% for date, commit in commits %} - - - - - - - - {% for item in commit %} - - + + {% endfor %} + +
{{ date | date("F j, Y") }}
+ {% for date, commit in commits %} + + + + + + + + {% for item in commit %} + + - - {% endfor %} - -
{{ date | date("F j, Y") }}
-
-  Browse +
+  Browse -  Changes -
- - -
-
+  Changes +
+ + +
+
-
-
- - - -
-
-

- {{ item.message }} -

- {{ item.author.name }} authored on {{ item.date | format_date }} - {% if item.author.email != item.commiter.email %} - • {{ item.commiter.name }} committed on {{ item.commiterDate | format_date }} - {% endif %} +
+
+ + + +
+
+

+ {{ item.message }} +

+ {{ item.author.name }} authored + on {{ item.date | format_date }} + {% if item.author.email != item.commiter.email %} + • {{ item.commiter.name }} committed on {{ item.commiterDate | format_date }} + {% endif %} -
-
-
-{% endfor %} + + +
+ {% endfor %} {% else %}

@@ -53,13 +59,13 @@ {% endif %} {% if page != 'searchcommits' %} - + {% endif %}