aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1004 from virtualtam/doc/docker/reverse-proxyVirtualTam2017-10-221-1/+115
|\ | | | | Documentation: add reverse proxy examples for Docker images
| * Documentation: add reverse proxy examples for Docker imagesVirtualTam2017-10-221-1/+115
| | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/888 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #1002 from ArthurHoaro/doc/install-dockerArthurHoaro2017-10-221-3/+11
|\ \ | | | | | | Docs: mention Docker in the download & install page
| * | Doc: mention Docker docs in the download & install pageArthurHoaro2017-10-221-3/+11
| |/
* | Merge pull request #871 from ArthurHoaro/feature/translationArthurHoaro2017-10-2268-280/+2744
|\ \ | | | | | | Shaarli's translation
| * | Translation documentationArthurHoaro2017-10-228-2/+198
| | |
| * | Translations : Working demo example of translation extensionArthurHoaro2017-10-225-35/+86
| | |
| * | Add language selection in the configure page of the default themeArthurHoaro2017-10-2210-222/+382
| | |
| * | Use makefile target to generate MO file and remove it from gitArthurHoaro2017-10-226-65/+102
| | |
| * | JS translationArthurHoaro2017-10-223-6/+20
| | |
| * | Shaarli's translationArthurHoaro2017-10-2251-246/+2252
| |/ | | | | | | | | | | | | | | | | * translation system and unit tests * Translations everywhere Dont use translation merge It is not available with PHP builtin gettext, so it would have lead to inconsistency.
* | Merge pull request #1001 from virtualtam/docker/latestVirtualTam2017-10-223-6/+67
|\ \ | |/ |/| docker: add 'latest' image
| * docker: add 'latest' imageVirtualTam2017-10-213-6/+67
|/ | | | | | | | This implies the following changes: - `shaarli/shaarli:latest` will now point to the `latest` release - `shaarli/shaarli:master` will point to the `master` branch Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #846 from virtualtam/docker/alpineVirtualTam2017-10-2114-53/+73
|\ | | | | Docker: switch to Alpine Linux
| * docker: rename resources for the stable imageVirtualTam2017-10-034-0/+0
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * docker: switch to Alpine Linux for the master imageVirtualTam2017-10-0314-53/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/843 Changed: - switch base image from Debian:Jessie to Alpine:3.6 - switch to PHP 7.1 - switch from supervisord to s6 to manage services See: - https://alpinelinux.org/ - https://wiki.alpinelinux.org/wiki/Nginx_with_PHP - http://www.skarnet.org/software/s6/ - http://www.skarnet.org/software/s6/s6-svscan.html - http://www.skarnet.org/software/s6/s6-svc.html - http://www.skarnet.org/software/s6/s6-svstat.html Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #996 from virtualtam/fix/user-cssVirtualTam2017-10-172-4/+10
|\ \ | | | | | | Fix: enable access to data/user.css (Apache 2.2 & 2.4)
| * | Fix: enable access to data/user.css (Apache 2.2 & 2.4)VirtualTam2017-10-161-3/+9
| | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/872 Relates to https://github.com/shaarli/Shaarli/issues/993 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | EditorConfig: add .htaccess supportVirtualTam2017-10-161-1/+1
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #995 from virtualtam/lint/editorconfigVirtualTam2017-10-162-0/+24
|\ \ | | | | | | Add EditorConfig configuration
| * | Add EditorConfig configurationVirtualTam2017-10-112-0/+24
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | EditorConfig allows specifying indentation, line feed and encoding properties according to the type of file being edited. Most editors support it out-of-the-box, or can benefit from it through a plugin. See: - http://editorconfig.org/ - https://github.com/editorconfig/editorconfig - https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #992 from ArthurHoaro/feature/import-historyVirtualTam2017-10-083-48/+65
|\ \ | | | | | | Don't write History for link import
| * | Don't write History for link importArthurHoaro2017-10-073-48/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With large imports it has a large impact on performances and isn't really useful. Instead, write an IMPORT event, which let client using the history service resync its DB. -> 15k link import done in 6 seconds. Fixes #985
* | | Merge pull request #990 from danieljakots/masterVirtualTam2017-10-081-5/+5
|\ \ \ | |/ / |/| | Fix link in Upgrade-and-migration.md
| * | Fix link in Upgrade-and-migration.mdDaniel Jakots2017-10-071-5/+5
|/ /
* | Badge versionArthurHoaro2017-10-071-1/+1
| |
* | Merge pull request #988 from ArthurHoaro/changelog-0.9.2ArthurHoaro2017-10-073-3/+46
|\ \ | | | | | | Changelog 0.9.2 + AUTHORS
| * | Update AUTHORSArthurHoaro2017-10-072-3/+8
| | | | | | | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
| * | Changelog v0.9.2ArthurHoaro2017-10-071-0/+38
|/ /
* | Merge pull request #987 from ArthurHoaro/hotfix/security-issueArthurHoaro2017-10-072-3/+3
|\ \ | | | | | | Fix security issue reported by @chb9
| * | Fix security issue reported by @chbiArthurHoaro2017-10-072-3/+3
| | | | | | | | | | | | Vulnerability introduced by 6ccd0b218fbd34de750f55b78f3dc43bb3d9fa8e - release with Shaarli v0.9.1.
* | | Merge pull request #979 from ArthurHoaro/feature/assets-cache-versionVirtualTam2017-10-066-15/+35
|\ \ \ | | | | | | | | Add a version hash for asset loading to prevent browser's cache issue
| * | | Rename shaarli_version constant to uppercaseArthurHoaro2017-10-013-5/+5
| | | |
| * | | Add a version hash for asset loading to prevent browser's cache issueArthurHoaro2017-10-014-10/+30
| |/ / | | | | | | | | | | | | | | | The hash is generated using the same salt as the one used for credentials (1 salt per instance) in order to avoid exposing the instance version. Fixes #965
* | | Merge pull request #980 from ArthurHoaro/hotfix/textarea-resize-jumpyVirtualTam2017-10-061-0/+6
|\ \ \ | | | | | | | | Fix jumpy textarea with long content in post edit
| * | | Fix jumpy textarea with long content in post editArthurHoaro2017-10-011-0/+6
| |/ / | | | | | | | | | | | | | | | We manually reset the scroll position, to avoid height = 'auto' jump to the top Fixes #971
* | | Merge pull request #983 from bvberkum/pullrequest/shaarli-docker-quickstartVirtualTam2017-10-062-0/+89
|\ \ \ | |_|/ |/| | Docker quickstart
| * | Minor docker-101 doc updates, typos fixed #983B. van Berkum2017-10-061-11/+9
| | |
| * | Docker quickstart: one more grammar mistake. Made it a bit more terse.B. van Berkum2017-10-031-1/+1
| | |
| * | Docker-101: added working systemd config exampleB. van Berkum2017-10-031-0/+47
| | |
| * | Typo's, unified structure a bit.B. van Berkum2017-10-032-10/+5
| | | | | | | | | | | | | | | | | | - Fixes inevitable typo that crept in. - Removed some blank lines, newlines, to match established whitespace use better. - Minor grammar improvement.
| * | Docker 101: container start and cleanupB. van Berkum2017-10-031-0/+37
| | |
| * | Added docker quickstart example, with user-data volumeB. van Berkum2017-10-031-0/+12
| | |
* | | Merge pull request #981 from mark-gerarts/default-note-titleVirtualTam2017-10-033-1/+3
|\ \ \ | |/ / |/| | Allow setting of a default note title, see #963
| * | Allow setting of a default note title, see #963Mark Gerarts2017-10-013-1/+3
|/ /
* | Merge pull request #976 from ArthurHoaro/hotfix/url-parenthesesArthurHoaro2017-09-302-1/+11
|\ \ | | | | | | Fix parsing for description links with parentheses
| * | Fix parsing for description links with parenthesesArthurHoaro2017-09-292-1/+11
| | | | | | | | | | | | | | | | | | With markdown plugin disabled relates to #966
* | | Merge pull request #975 from virtualtam/robustnessVirtualTam2017-09-303-12/+20
|\ \ \ | |_|/ |/| | Improve robustness for zlib and file operations
| * | Robustness: safer gzinflate/zlib usageVirtualTam2017-09-281-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/pull/846 PHP's `gzinflate()` fails with an error when being passed an empty string See: - https://bugs.php.net/bug.php?id=71395 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | Robustness: safer RainTPL directory handlingVirtualTam2017-09-282-2/+4
| |/ | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/845 Relates to https://github.com/shaarli/Shaarli/issues/846 Relates to https://github.com/shaarli/Shaarli/pull/909 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:52:10 +0000