Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: daledavies/jump
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.4
Choose a base ref
...
head repository: daledavies/jump
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jul 19, 2022

  1. Fix typo in changelog

    daledavies committed Jul 19, 2022
    Copy the full SHA
    5e37d20 View commit details

Commits on Jul 20, 2022

  1. Copy the full SHA
    f651b76 View commit details

Commits on Jul 25, 2022

  1. Copy the full SHA
    c13445a View commit details
  2. Copy the full SHA
    775ff68 View commit details
  3. Copy the full SHA
    6a2b38d View commit details
  4. Copy the full SHA
    1621938 View commit details
  5. Copy the full SHA
    ce06cc3 View commit details
  6. Copy the full SHA
    0cf55c9 View commit details
  7. Copy the full SHA
    7794cc0 View commit details
  8. Copy the full SHA
    9c3cf9a View commit details

Commits on Jul 26, 2022

  1. Copy the full SHA
    651217a View commit details
  2. Copy the full SHA
    5d45d46 View commit details
  3. Copy the full SHA
    5b9fe67 View commit details
  4. Copy the full SHA
    d3dc11f View commit details
  5. Copy the full SHA
    c224b1b View commit details
  6. Copy the full SHA
    e8c74eb View commit details

Commits on Jul 27, 2022

  1. Copy the full SHA
    c14700f View commit details

Commits on Aug 12, 2022

  1. Refactor Status class

    daledavies committed Aug 12, 2022
    Copy the full SHA
    6d4931f View commit details

Commits on Mar 1, 2023

  1. Copy the full SHA
    0d74bd0 View commit details
  2. Upgrade to PHP 8.1

    daledavies committed Mar 1, 2023
    Copy the full SHA
    a58016b View commit details
  3. Copy the full SHA
    9ec81c6 View commit details
  4. Copy the full SHA
    4e7ac32 View commit details

Commits on Mar 3, 2023

  1. Copy the full SHA
    2ef9c12 View commit details
  2. Copy the full SHA
    02e9e91 View commit details
  3. Copy the full SHA
    7333ce2 View commit details
  4. Copy the full SHA
    c260fef View commit details

Commits on Mar 6, 2023

  1. Copy the full SHA
    c878d0f View commit details
  2. Copy the full SHA
    b999d4e View commit details
  3. Copy the full SHA
    fcd3204 View commit details
  4. Copy the full SHA
    29fbf70 View commit details
  5. Copy the full SHA
    d1d6ce8 View commit details
  6. Copy the full SHA
    0760293 View commit details

Commits on Mar 8, 2023

  1. Copy the full SHA
    7d8e883 View commit details
  2. Copy the full SHA
    040f3fe View commit details

Commits on Mar 10, 2023

  1. Copy the full SHA
    8810450 View commit details
  2. Copy the full SHA
    604171c View commit details

Commits on Mar 13, 2023

  1. Copy the full SHA
    f3e108c View commit details
  2. Rebuild bundles

    daledavies committed Mar 13, 2023
    Copy the full SHA
    094430e View commit details

Commits on Mar 15, 2023

  1. Copy the full SHA
    5afe3cc View commit details

Commits on Mar 17, 2023

  1. Copy the full SHA
    da9d357 View commit details
  2. Copy the full SHA
    dad8e8e View commit details
  3. Copy the full SHA
    f0270ae View commit details
  4. Copy the full SHA
    1998d95 View commit details

Commits on Mar 22, 2023

  1. Hash site ID to limit length

    Fixes occasional bug saving status cache where cache file's name is
    too long for filesystem.
    daledavies committed Mar 22, 2023
    Copy the full SHA
    8a5821c View commit details
  2. Copy the full SHA
    ff0cb47 View commit details

Commits on Mar 24, 2023

  1. Copy the full SHA
    6957f2c View commit details
  2. Copy the full SHA
    c0519d9 View commit details

Commits on Mar 27, 2023

  1. Copy the full SHA
    c7dcf65 View commit details

Commits on Apr 4, 2023

  1. Copy the full SHA
    8aad201 View commit details
  2. Copy the full SHA
    260e886 View commit details
Showing with 4,724 additions and 1,890 deletions.
  1. +58 −1 CHANGELOG.md
  2. +16 −18 Dockerfile
  3. +18 −20 Dockerfile-xdebug
  4. +182 −50 README.md
  5. +43 −7 docker/entrypoint.sh
  6. +0 −2 docker/nginx.conf
  7. +1 −1 jumpapp/.jump-version
  8. +13 −0 jumpapp/assets/css/debugger.css
  9. +159 −47 jumpapp/assets/css/src/_sites.scss
  10. +18 −8 jumpapp/assets/css/src/index.scss
  11. +0 −1 jumpapp/assets/css/styles.efdc3d1d099422476385.min.css
  12. +1 −0 jumpapp/assets/css/styles.f51cc8100174de08c45e.min.css
  13. +11 −0 jumpapp/assets/images/loading-static.svg
  14. +0 −1 jumpapp/assets/js/index.439e0bc3abc833708655.min.js
  15. +1 −0 jumpapp/assets/js/index.a4572c910e34c2e810b1.min.js
  16. +5 −5 jumpapp/assets/js/src/classes/Greeting.js
  17. +32 −5 jumpapp/assets/js/src/classes/Main.js
  18. +5 −4 jumpapp/assets/js/src/classes/SearchSuggestions.js
  19. +22 −19 jumpapp/assets/js/src/classes/Weather.js
  20. +3 −0 jumpapp/classes/API/AbstractAPI.php
  21. +7 −4 jumpapp/classes/API/Icon.php
  22. +29 −0 jumpapp/classes/API/Status.php
  23. +1 −1 jumpapp/classes/API/Unsplash.php
  24. +4 −3 jumpapp/classes/API/Weather.php
  25. +38 −19 jumpapp/classes/Cache.php
  26. +17 −5 jumpapp/classes/Config.php
  27. +68 −0 jumpapp/classes/Debugger/ErrorLogger.php
  28. +37 −0 jumpapp/classes/Debugger/JumpConfigPanel.php
  29. +28 −0 jumpapp/classes/Debugger/JumpVersionPanel.php
  30. +16 −0 jumpapp/classes/Exceptions/APIException.php
  31. +16 −0 jumpapp/classes/Exceptions/ConfigException.php
  32. +20 −0 jumpapp/classes/Exceptions/SiteNotFoundException.php
  33. +5 −1 jumpapp/classes/Exceptions/TagNotFoundException.php
  34. +85 −0 jumpapp/classes/Language.php
  35. +47 −5 jumpapp/classes/Main.php
  36. +11 −3 jumpapp/classes/Pages/AbstractPage.php
  37. +10 −20 jumpapp/classes/Pages/ErrorPage.php
  38. +20 −6 jumpapp/classes/Pages/HomePage.php
  39. +20 −7 jumpapp/classes/Pages/TagPage.php
  40. +25 −7 jumpapp/classes/SearchEngines.php
  41. +46 −22 jumpapp/classes/Site.php
  42. +149 −19 jumpapp/classes/Sites.php
  43. +112 −0 jumpapp/classes/Status.php
  44. +7 −6 jumpapp/classes/Unsplash.php
  45. +2 −1 jumpapp/cli/cacheunsplash.php
  46. +11 −1 jumpapp/composer.json
  47. +602 −392 jumpapp/composer.lock
  48. +32 −3 jumpapp/config.php
  49. +27 −0 jumpapp/custom-width-css.php
  50. +27 −17 jumpapp/sites/sites.json
  51. +4 −5 jumpapp/templates/errorpage.mustache
  52. +15 −0 jumpapp/templates/errorpage.php
  53. +3 −3 jumpapp/templates/footer.mustache
  54. +11 −5 jumpapp/templates/header.mustache
  55. +1 −1 jumpapp/templates/partials/cssbundle.mustache
  56. +1 −1 jumpapp/templates/partials/jsbundle.mustache
  57. +2 −2 jumpapp/templates/sites.mustache
  58. +18 −0 jumpapp/translations/cs.json
  59. +18 −0 jumpapp/translations/de.json
  60. +18 −0 jumpapp/translations/en-gb.json
  61. +18 −0 jumpapp/translations/es.json
  62. +18 −0 jumpapp/translations/lt.json
  63. +18 −0 jumpapp/translations/nl.js
  64. +18 −0 jumpapp/translations/pt.json
  65. +18 −0 jumpapp/translations/ru.json
  66. +18 −0 jumpapp/translations/ua.json
  67. +2,406 −1,133 package-lock.json
  68. +9 −9 package.json
  69. BIN screenshot.png
  70. +3 −0 screenshots/ffmpeg.txt
  71. BIN screenshots/screenshot-demo.gif
  72. BIN screenshots/screenshot-demo.webp
  73. BIN screenshots/screenshot-search.png
  74. BIN screenshots/screenshot-tagpage.png
  75. BIN screenshots/screenshot-tagselection.png
59 changes: 58 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,14 +4,71 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.4.1] - 2024-04-16
### Fixed
- Issue #113: Fix incorrectly parsed debug setting.
- Remove need for application cache directory after changes to icon cache

## [1.4.0] - 2024-04-15
### Added
- Support for auto-discovery of sites from docker.
- Language/translation support and several translations.
- Integration of Dasboard Icons support (https://github.com/walkxcode/dashboard-icons).
- Detailed debug option and much improved error handling.
- Discussion #81: Add meta tags for mobile compatibility.
- Discussion #78: Add option for custom greeting message.
- Universal caching for all site icon types, removes previous favicon cache mechanism.

### Fixed
- Issue #82: Ampersand in url in sites.json breaks icon.
- Issue #110: Fix styling of site name when using alt layout.
- Make sites list scrollable if large number of sites.
- Fix broken forward caching of Unspash images, images were not rotating.
- Fix double logging of PHP error by nginx in docker container.
- Fix potential XSS issue from unsplash data.
- Fix broken site image in search results.
- Remove unnecessary console.log() in Weather.js.

## [1.3.2] - 2023-03-17
### Fixed
- Issue #59: Show content on weather API error.
- Issue #67: Remove animated SVG background image from icons.
- Update outdated NPM packages.
- Several other minor bugfixes.

## [1.3.1] - 2023-03-06
### Added
- Issue #55: Add CUSTOMWIDTH option.
- Issue #58: Add config option to disable IPv6 support in nginx.
- Issue #68: Add per-site options for flexibility in checking status.
- Issue #69: Add option to disable SSL cert verification for site status check.
- Issue #74: Implement scrollable mobile site view.

### Fixed
- Issue #66: Allow for background blur of 0.
- Fix incorrect order of arguments in Cache::save().
- A few other minor code improvements.

## [1.3.0] - 2022-07-26
### Added
- Real-time status monitoring for each site. Jump can now ping your sites and report on their
availability (e.g. online, offline, error).

### Fixed
- Close session early to avoid session lock blocking API calls.
- Updated composer packages, addresses several security alerts for older version of Guzzle.
- Updated NPM packes, addresses vulverabilities in Terser and EJS.
- Fix incorrect reference to CSS file in error page.
- Various minor code improvements.

## [1.2.4] - 2022-07-19
### Added
- Issue #41: Add support for a custom favicon.
- Add new default favicon.

### Fixed
- Refactor API implementation.
- Farious other code improvements.
- Various other code improvements.

## [1.2.3] - 2022-07-07
### Added
34 changes: 16 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -37,35 +37,33 @@ RUN apk add --no-cache \
bash \
curl \
nginx \
php8 \
php8-curl \
php8-dom \
php8-fileinfo \
php8-fpm \
php8-json \
php8-opcache \
php8-openssl \
php8-session \
php8-xml \
php8-zlib
php81 \
php81-curl \
php81-dom \
php81-fileinfo \
php81-fpm \
php81-json \
php81-opcache \
php81-openssl \
php81-session \
php81-xml \
php81-zlib

# Create symlink for anything expecting to use "php".
RUN ln -s -f /usr/bin/php8 /usr/bin/php
RUN ln -s -f /usr/bin/php81 /usr/bin/php

# Nginx config.
COPY docker/nginx.conf /etc/nginx/nginx.conf

# PHP/FPM config.
COPY docker/fpm-pool.conf /etc/php8/php-fpm.d/www.conf
COPY docker/php.ini /etc/php8/conf.d/custom.ini
COPY docker/fpm-pool.conf /etc/php81/php-fpm.d/www.conf
COPY docker/php.ini /etc/php81/conf.d/custom.ini

COPY docker/entrypoint.sh /usr/local/bin/

# Create the cache directories and change owner of everything we need.
RUN mkdir -p /var/www/cache/application \
&& mkdir -p /var/www/cache/icons \
&& chown -R jumpapp:jumpapp /var/www/html /var/www/cache/icons \
/var/www/cache/application \
RUN mkdir /var/www/cache \
&& chown -R jumpapp:jumpapp /var/www/html /var/www/cache \
&& chmod +x /usr/local/bin/entrypoint.sh

# Expose the port we configured for nginx.
38 changes: 18 additions & 20 deletions Dockerfile-xdebug
Original file line number Diff line number Diff line change
@@ -29,37 +29,35 @@ RUN apk add --no-cache \
bash \
curl \
nginx \
php8 \
php8-curl \
php8-dom \
php8-fileinfo \
php8-fpm \
php8-json \
php8-opcache \
php8-openssl \
php8-session \
php8-xml \
php8-zlib \
php8-xdebug
php81 \
php81-curl \
php81-dom \
php81-fileinfo \
php81-fpm \
php81-json \
php81-opcache \
php81-openssl \
php81-session \
php81-xml \
php81-zlib \
php81-xdebug

# Create symlink for anything expecting to use "php".
RUN ln -s /usr/bin/php8 /usr/bin/php
RUN ln -s -f /usr/bin/php81 /usr/bin/php

# Nginx config.
COPY docker/nginx.conf /etc/nginx/nginx.conf

# PHP/FPM config.
COPY docker/fpm-pool.conf /etc/php8/php-fpm.d/www.conf
COPY docker/php.ini /etc/php8/conf.d/custom.ini
COPY docker/xdebug.ini /etc/php8/conf.d/50_xdebug.ini
COPY docker/fpm-pool.conf /etc/php81/php-fpm.d/www.conf
COPY docker/php.ini /etc/php81/conf.d/custom.ini
COPY docker/xdebug.ini /etc/php81/conf.d/50_xdebug.ini

COPY docker/entrypoint.sh /usr/local/bin/

# Create the cache directories and change owner of everything we need.
RUN mkdir -p /var/www/cache/application \
&& mkdir -p /var/www/cache/icons \
&& chown -R jumpapp:jumpapp /var/www/html /var/www/cache/icons \
/var/www/cache/application \
RUN mkdir /var/www/cache \
&& chown -R jumpapp:jumpapp /var/www/html /var/www/cache \
&& chmod +x /usr/local/bin/entrypoint.sh

RUN mkdir -p /tmp/xdebug \
Loading