aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1658 from dougbreaux/masterArthurHoaro2020-12-161-1/+1
|\ | | | | newer alpine (for newer PHP) and apk upgrade #1655
| * remove apk upgrade #1655Doug Breaux2020-12-061-2/+1
| |
| * newer alpine (for newer PHP) and apk upgrade #1655Doug Breaux2020-12-041-2/+3
| |
* | Merge pull request #1652 from ArthurHoaro/fix/failing-mutexArthurHoaro2020-12-165-93/+145
|\ \ | | | | | | Fix: soft fail if the mutex is not working
| * | Fix: soft fail if the mutex is not workingArthurHoaro2020-11-245-93/+145
| |/ | | | | | | | | | | And display the error in server admin page Fixes #1650
* | Merge pull request #1661 from shaarli/dependabot/npm_and_yarn/ini-1.3.7ArthurHoaro2020-12-161-3/+3
|\ \
| * | Bump ini from 1.3.5 to 1.3.7dependabot[bot]2020-12-111-3/+3
| |/ | | | | | | | | | | | | Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #1660 from e2jk/patch-1ArthurHoaro2020-12-161-4/+4
|\ \ | |/ |/| Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile
| * Upgrade alpine from 3.8 to 3.10 in armhf DockerfileEmilien Klein2020-12-061-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Docker for armhf doesn't build anymore on Alpine 3.8, upgrading to 3.10. Building works fine on a Rapsberry Pi 4 running Raspbian GNU/Linux 10 (buster) This is the error with 3.8: ``` [2/4] Fetching packages... error css-loader@4.3.0: The engine "node" is incompatible with this module. Expected version ">= 10.13.0". error Found incompatible module info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. The command '/bin/sh -c apk --update --no-cache add yarn nodejs-current python2 build-base && cd /shaarli && yarn install && yarn run build && rm -rf node_modules' returned a non-zero code: 1 ``` Not upgrading to 3.11, due to this error: ``` 2/4] Fetching packages... error browserslist@4.14.3: The engine "node" is incompatible with this module. Expected version "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7". Got "13.1.0" error Found incompatible module. info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. The command '/bin/sh -c apk --update --no-cache add yarn nodejs-current python2 build-base && cd /shaarli && yarn install && yarn run build && rm -rf node_modules' returned a non-zero code: 1 ``` Not upgrading to 3.12 either, due to this error: ``` ERROR: unsatisfiable constraints: py2-pip (missing): required by: world[py2-pip] The command '/bin/sh -c apk --update --no-cache add py2-pip && cd /usr/src/app/shaarli && pip install --no-cache-dir mkdocs && mkdocs build --clean' returned a non-zero code: 1 ``` There's probably a way to have Python2 pip installed on 3.12, but I suppose other issues would arise (such as the one happening with 3.11), so only proposing to upgrade to 3.10 now. This would probably be looked at more in detail when merging the amd64 and arm/v7 Docker builds, see #1496.
* Merge pull request #1648 from nodiscc/fix-ConfigureControllerTestArthurHoaro2020-11-242-1/+1
|\ | | | | ConfigureControllerTest.php: update expected languages number to 6
| * chmod -x russian translation fileArthurHoaro2020-11-241-0/+0
| |
| * ConfigureControllerTest.php: update expected languages number to 6nodiscc2020-11-221-1/+1
|/ | | | Following the addition of russian translations in #1642 Fixes https://github.com/shaarli/Shaarli/issues/1647
* Merge pull request #1642 from prog-it/masterArthurHoaro2020-11-172-0/+1945
|\
| * Add russian language fileprog-it2020-11-151-0/+1944
| |
| * Add russian language selectionprog-it2020-11-141-0/+1
| |
* | Merge pull request #1639 from ArthurHoaro/doc/fix-releaseArthurHoaro2020-11-151-0/+8
|\ \ | |/ |/| Doc: fix missing merge on Release page
| * Doc: fix missing merge on Release pageArthurHoaro2020-11-121-0/+8
|/
* Update badge versionsArthurHoaro2020-11-121-1/+1
|
* Merge pull request #1638 from ArthurHoaro/changelog/v0.12.1ArthurHoaro2020-11-122-2/+53
|\ | | | | CHANGELOG v0.12.1
| * CHANGELOG v0.12.1ArthurHoaro2020-11-122-2/+53
|/
* Merge pull request #1635 from ArthurHoaro/feature/phpcsArthurHoaro2020-11-1095-386/+480
|\
| * Update Static Analysis documentationArthurHoaro2020-11-091-5/+7
| |
| * Run PHPCS during Travis CI checks + disable xdebugArthurHoaro2020-11-091-0/+5
| |
| * Manually fix remaining PHPCS errorsArthurHoaro2020-11-0918-42/+61
| |
| * Apply PHP Code Beautifier on source code for linter automatic fixesArthurHoaro2020-11-0987-336/+408
| |
| * Coding style: switch PHPCS to PSR12ArthurHoaro2020-11-082-7/+3
| | | | | | | | | | | | | | | | Also temporarily ignore test code (one step at a time). Reference: https://www.php-fig.org/psr/psr-12/ Related to #95
* | Merge pull request #1637 from ArthurHoaro/fix/server-admin-update-checkArthurHoaro2020-11-103-44/+88
|\ \ | | | | | | Server admin: do not retrieve latest version without update_check
| * | Server admin: do not retrieve latest version without update_checkArthurHoaro2020-11-093-44/+88
| |/ | | | | | | | | | | | | | | | | If the setting 'updates.check_updates' is disabled, do not retrieve the latest version on server administration page. Additionally, updated default values for - updates.check_updates from false to true - updates.check_updates_branch from stable to latest
* | Merge pull request #1636 from ArthurHoaro/fix/vintage-async-metadataArthurHoaro2020-11-104-11/+114
|\ \
| * | Vintage theme: fix routes in daily pageArthurHoaro2020-11-091-4/+4
| | |
| * | Vintage theme: display global messagesArthurHoaro2020-11-092-0/+34
| | |
| * | Vintage theme: support async metadata retrievalArthurHoaro2020-11-092-7/+76
| |/
* | Merge pull request #1630 from ArthurHoaro/fix/apache-configArthurHoaro2020-11-102-8/+13
|\ \ | | | | | | Reviewed Apache configuration
| * | Reviewed Apache configurationArthurHoaro2020-11-082-8/+13
| | | | | | | | | | | | | | | | | | | | | (in documentation) For security purpose, block access to any static file not matching the list of allowed extensions. It allows us to remove the specific retriction on dotfiles, and fix Apache part of #1608.
* | | Merge pull request #1634 from ArthurHoaro/fix/docker-composeArthurHoaro2020-11-102-6/+10
|\ \ \ | | | | | | | | Docker-compose: fix SSL certificate + add parameter for Docker tag
| * | | Docker-compose: fix SSL certificate + add parameter for Docker tagArthurHoaro2020-11-092-6/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | Use envvar SHAARLI_VIRTUAL_HOST for Traefik's docker.domain parameter instead of localhost (I'm not sure if did work at some point). Add an environment variable to choose which Docker tag to use instead of using master by default. Fixes #1632
* | | Merge pull request #1628 from ArthurHoaro/fix/nginx-configArthurHoaro2020-11-103-51/+26
|\ \ \ | |/ / |/| | Reviewed nginx configuration
| * | Reviewed nginx configurationArthurHoaro2020-11-073-51/+26
| |/ | | | | | | | | | | | | | | | | | | | | Both in documentation and Docker image. For security purpose, it no longer allow to access static files through the main nginx *location*. Static files are served if their extension matches the whitelist. As a side effect, we no longer need specific restrictions, and therefore it fixes the nginx part of #1608.
* | Merge pull request #1621 from ArthurHoaro/feature/tag-separatorsArthurHoaro2020-11-0844-169/+655
|\ \
| * | ESLintArthurHoaro2020-11-052-5/+8
| | |
| * | Tags separator: vintage theme compatibilityArthurHoaro2020-11-055-25/+34
| | |
| * | Bump shaarli/netscape-bookmark-parser dependency versionArthurHoaro2020-11-052-32/+35
| | |
| * | Feature: support any tag separatorArthurHoaro2020-11-0538-114/+585
| | | | | | | | | | | | | | | | | | | | | | | | So it allows to have multiple words tags. Breaking change: commas ',' are no longer a default separator. Fixes #594
* | | Merge pull request #1629 from ArthurHoaro/fix/demo-vimeoArthurHoaro2020-11-081-2/+2
|\ \ \ | | | | | | | | Replace vimeo link in demo bookmarks due to IP ban on the demo instance
| * | | Replace vimeo link in demo bookmarks due to IP ban on the demo instanceArthurHoaro2020-11-081-2/+2
| | |/ | |/| | | | | | | Fixes #1148
* | | Merge pull request #1631 from ArthurHoaro/fix/html-extract-quote-fixArthurHoaro2020-11-082-4/+34
|\ \ \ | |/ / |/| | Fix an issue truncating extracted metadata content
| * | Fix an issue truncating extracted metadata contentArthurHoaro2020-11-082-4/+34
|/ / | | | | | | Previous regex forced the selection to stop at either the first single or double quote found, regardless of the opening quote. Using '\1', we're sure to wait for the proper quote before stopping the capture.
* | Merge pull request #1627 from ArthurHoaro/fix/unexpected-errorArthurHoaro2020-11-065-10/+58
|\ \ | |/ |/| Display error details even with dev.debug set to false
| * Display error details even with dev.debug set to falseArthurHoaro2020-11-055-10/+58
|/ | | | | | | It makes more sense to display the error even if it's unexpected. Only for logged in users. Fixes #1606
* Merge pull request #1626 from ArthurHoaro/fix/vintage-webpackArthurHoaro2020-11-051-1/+2
|\ | | | | Webpack: fix vintage theme images include
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 19:40:34 +0000