diff --git a/INSTALL.md b/INSTALL.md index 957afabd..2ed6a821 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -116,7 +116,7 @@ UrlToolkit { --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/README.md b/README.md index bf5289ef..ef8a138c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ -# 🤖 P3X Gitlist - A decorated enhanced elegant, feature rich and modern private git ui repository viewer v2019.4.22 +# 🤖 P3X Gitlist - A decorated enhanced elegant, feature rich and modern private git ui repository viewer v2019.4.102 🙏 This is an open-source project. Star this repository, if you like it, or even donate to maintain the servers and the development. Thank you so much! @@ -160,7 +160,7 @@ April 20, 2019 --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/artifacts/php-7.2-ubuntu.md b/artifacts/php-7.2-ubuntu.md index 0a601730..2e64521d 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 v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/artifacts/screenshots.md b/artifacts/screenshots.md index 4d45d69d..d62b2e05 100644 --- a/artifacts/screenshots.md +++ b/artifacts/screenshots.md @@ -25,7 +25,7 @@ --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/change-break.md b/change-break.md index b2d23cf0..33f4011a 100644 --- a/change-break.md +++ b/change-break.md @@ -50,7 +50,7 @@ The following versions are not using `Babel`!!!! Yikes! --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/changelog.md b/changelog.md index 05bd31f1..2419b677 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,9 @@ [//]: #@corifeus-header:end +## v2019.4.102 +* BUGFIX: Latin ( ISO-8859-1) CSV files tries to convert to UTF-8. + ## v2019.4.22 * FEATURE: if the blob view is a commit (instead of branch), the delete and edit buttons are hidden * FEATURE: default code editor default is increased from 300px to 600px @@ -260,7 +263,7 @@ require('codemirror/mode/yaml/yaml'); --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) diff --git a/package.json b/package.json index a405bcd9..f762b8b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p3x-gitlist", - "version": "2019.4.23", + "version": "2019.4.102", "corifeus": { "prod-dir": "prod", "css-postfix": "2e1c8bb44f00d2afc4499c0f0e18f332c4c8cd82ddd019d6d80943ed6963aa9c", @@ -29,12 +29,12 @@ "devDependencies": { "bootswatch": "^3.4.1", "concurrently": "^4.1.0", - "corifeus-builder": "^2019.4.12", + "corifeus-builder": "^2019.4.101", "corifeus-utils": "^2019.4.13", "css-loader": "^2.1.1", "extract-text-webpack-plugin": "^4.0.0-beta.0", "file-loader": "^3.0.1", - "fs-extra": "^7.0.1", + "fs-extra": "^8.0.1", "glob": "^7.1.4", "grunt": "^1.0.4", "grunt-contrib-less": "^2.0.0", @@ -45,9 +45,9 @@ "optimize-css-assets-webpack-plugin": "^5.0.1", "postcss-safe-parser": "^4.0.1", "style-loader": "^0.23.1", - "terser-webpack-plugin": "^1.2.3", + "terser-webpack-plugin": "^1.2.4", "url-loader": "^1.1.2", - "webpack": "^4.31.0", + "webpack": "^4.32.1", "webpack-cli": "^3.3.2", "worker-loader": "^2.0.0" }, @@ -58,7 +58,7 @@ "dependencies": { "@fortawesome/fontawesome-free": "^5.8.2", "bootstrap": "^3.4.1", - "codemirror": "^5.46.0", + "codemirror": "^5.47.0", "highlight.js": "^9.15.6", "is-string-int": "^1.0.1", "jquery": "^3.4.1", @@ -74,4 +74,4 @@ "snackbarjs": "^1.1.0", "twemoji": "^12.0.1" } -} \ No newline at end of file +} diff --git a/scripts/init.sh b/scripts/init.sh index 4959172b..e33526d6 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -11,7 +11,7 @@ mkdir -p ./git-test/ pushd ./git-test -for repo in "https://github.com/patrikx3/angular-compile" "https://github.com/patrikx3/onenote" "https://github.com/patrikx3/aes-folder" "https://github.com/patrikx3/ramdisk" "https://github.com/patrikx3/openwrt-insomnia" "https://github.com/patrikx3/gitlist" "https://github.com/patrikx3/gitlist-workspace" "https://github.com/patrikx3/resume-web" "https://github.com/patrikx3/service-manager-tray-for-windows" "https://github.com/patrikx3/docker-debian-testing-mongodb-stable" "https://github.com/patrikx3/play-ai-server.git" "https://github.com/patrikx3/play-ai-ui.git" "https://github.com/patrikx3/play.git" +for repo in "https://github.com/patrikx3/angular-compile" "https://github.com/patrikx3/onenote" "https://github.com/patrikx3/ramdisk" "https://github.com/patrikx3/openwrt-insomnia" "https://github.com/patrikx3/gitlist" "https://github.com/patrikx3/gitlist-workspace" "https://github.com/patrikx3/resume-web" "https://github.com/patrikx3/service-manager-tray-for-windows" "https://github.com/patrikx3/docker-debian-testing-mongodb-stable" "https://github.com/patrikx3/play.git" do git clone --bare $repo done diff --git a/src/GitList/Controller/BlobController.php b/src/GitList/Controller/BlobController.php index be5f5a17..9dafa1a1 100644 --- a/src/GitList/Controller/BlobController.php +++ b/src/GitList/Controller/BlobController.php @@ -53,7 +53,7 @@ public function connect(Application $app) 'extension' => $extension, 'file' => $file, 'fileType' => $fileType, - 'blob' => $output, + 'blob' => utf8_encode($output), 'repo' => $repo, 'breadcrumbs' => $breadcrumbs, 'branch' => $branch, diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php index d4bf4f21..5900083b 100644 --- a/src/GitList/Controller/CommitController.php +++ b/src/GitList/Controller/CommitController.php @@ -5,6 +5,7 @@ use Silex\Application; use Silex\Api\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\JsonResponse; class CommitController implements ControllerProviderInterface { @@ -110,12 +111,15 @@ public function connect(Application $app) $diffs = []; foreach($diffsInstance as $diffInstance) { $lines = []; + foreach ($diffInstance->getLines() as $lineInstance) { $lines[] = (object)[ 'type' => $lineInstance->getType(), 'num-old' => $lineInstance->getNumOld(), 'num-new' => $lineInstance->getNumNew(), - 'line' => $lineInstance->getLine(), + 'line' => utf8_encode($lineInstance->getLine()), + //'line' => iconv('latin2', 'utf-8', $lineInstance->getLine()), + //'line' => mb_convert_encoding( $lineInstance->getLine(), 'ISO-8859-2', 'utf-8'), ]; } $diffs[] = (object)[ @@ -127,7 +131,8 @@ public function connect(Application $app) 'lines' => $lines, ]; } - return $app->json($diffs); + return new JsonResponse($diffs, 200, array('Content-Type'=>'application/json; charset=utf-8' )); + //return $app->json($diffs); }; if (isset($_GET['delete-branch'])) { diff --git a/todo.md b/todo.md index 25ddf270..fa62ca42 100644 --- a/todo.md +++ b/todo.md @@ -32,7 +32,7 @@ --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.22 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2019.4.102 [![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) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software)