aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into v0.9ArthurHoaro2017-10-0748-229/+832
|\
| * 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>
| * | Merge pull request #947 from thewilli/wildcardsearchArthurHoaro2017-09-292-47/+167
| |\ \ | | |/ | |/| wildcard tag search support
| | * wildcard tag search supportWilli Eggeling2017-08-302-47/+167
| | | | | | | | | | | | | | | | | | | | | - when searching for tags you can now include '*' as wildcard placeholder - new search reduces overall overhead when filtering for tags - fixed combination with description tag search ('#' prefix) - tests added
| * | Merge pull request #972 from virtualtam/travis/trustyVirtualTam2017-09-194-25/+20
| |\ \ | | | | | | | | Travis: switch to Ubuntu Trusty build environment
| | * | Tests: update localization testsVirtualTam2017-09-194-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rely on `mag_IN` (Magahi - INDIA) being unavailable when running localization test suites, instead of `pt_BR` that is now available from Travis build images. Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| | * | Travis: switch to Ubuntu Trusty build environmentVirtualTam2017-09-191-7/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/970 Relates to https://github.com/shaarli/Shaarli/pull/912 See: - https://docs.travis-ci.com/user/reference/trusty/ - https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming Added: - print available locales before running tests Removed: - do not install extra language packs Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | Merge pull request #909 from virtualtam/docker/test-environmentsVirtualTam2017-09-197-0/+208
| |\ \ | | | | | | | | docker: add alpine,debian,ubuntu test images
| | * | docker: add alpine,debian,ubuntu test imagesVirtualTam2017-09-187-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/843 Added: - Makefile target to run commands in a Docker test context - Docker images to run Shaarli test suites: - Alpine 3.6 - Debian 8 - Debian 9 - Ubuntu 16.04 - Documentation Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | Merge pull request #961 from thewilli/private-shaarli-login-redirectVirtualTam2017-09-183-0/+20
| |\ \ \ | | |/ / | |/| | added option to redirect all anonymous users to login page
| | * | added option to redirect all anonymous users to login pageWilli Eggeling2017-09-033-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | - new setting *force_login* added and documented - if both, *force_login* and *hide_public_links* are set to true, all requests (except for the feeds) are redirected to the login page
| * | | visited links color: same hue as unvisited links, darkenednodiscc2017-09-041-1/+1
| |/ / | | | | | | | | | | | | Related to https://github.com/shaarli/Shaarli/issues/877 Plain grey links would lead to think that the link is somehow disabled/inaccessible/private This slightly improves clarity/usability
| * | Merge pull request #939 from ArthurHoaro/hotfix/firefox-social-titleArthurHoaro2017-09-024-4/+69
| |\ \ | | | | | | | | Firefox Social title: Use document.title instead of RainTPL variable
| | * | Firefox Social title: Use document.title instead of RainTPL variableArthurHoaro2017-09-021-1/+2
| | | | | | | | | | | | | | | | Fixes #929
| | * | Make work behind a reverse proxyArthurHoaro2017-09-023-3/+67
| | | | | | | | | | | | | | | | Without HTTP_X_FORWARDED_PORT check, might be set to false even though the user is using HTTPS, thus disabling Firefox Social block display
| * | | Merge pull request #956 from virtualtam/fix/make-authorsVirtualTam2017-09-022-10/+10
| |\ \ \ | | | | | | | | | | Documentation+Makefile: update AUTHORS generation
| | * | | Documentation+Makefile: update AUTHORS generationVirtualTam2017-08-292-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/935 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | | Merge pull request #950 from thewilli/delete-fixArthurHoaro2017-09-012-6/+13
| |\ \ \ \ | | | | | | | | | | | | fixed link deletion
| | * | | | fixed link deletionWilli Eggeling2017-08-302-6/+13
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting links, the js of the default theme separated ids by an escaped space ('+'). There was a trailing '+' after the ids which led to the php code detecting multiple values even for single values. In combination with the id '0' this could led to no id found at all and a resulting php error. this commit fixes the behavior and adds an additional error handling and trimming to the php code.
| * | | | Merge pull request #951 from thewilli/fix-dailyArthurHoaro2017-09-011-23/+31
| |\ \ \ \ | | |_|/ / | |/| | | fixed daily links if there are no links
| | * | | fixed daily links if there are no linksWilli Eggeling2017-08-301-23/+31
| | |/ / | | | | | | | | | | | | | | | | | | | | - the previous code tried to use links from a previous day if there are no one for the current one - the new code skips this part if there are no entries (i.e. days) at all - modified showDaily() to fit PSR-1 and PSR-2
| * | | Merge pull request #944 from thewilli/configure-remembermeVirtualTam2017-08-275-3/+13
| |\ \ \ | | |/ / | |/| | new setting: default value for 'remember me' checkbox
| | * | new setting: default value for 'remember me' checkboxWilli Eggeling2017-08-275-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | - the default state for the login page's 'remember me' checkbox can now be configured - adapted the default and vintage theme to consider the new setting - added documentation for the new setting
| * | | Merge pull request #940 from ArthurHoaro/hotfix/empty-urlsVirtualTam2017-08-271-0/+3
| |\ \ \ | | | | | | | | | | Generates a permalink URL if the URL is set to blank
| | * | | Generates a permalinks URL if the URL is set to blankArthurHoaro2017-08-251-0/+3
| | | |/ | | |/| | | | | | | | | Fixes #926
| * | | Merge pull request #942 from thewilli/fix-wiki-linksVirtualTam2017-08-2710-14/+14
| |\ \ \ | | | | | | | | | | migrated Github wiki links to readthedocs
| | * | | migrated Github wiki links to readthedocsWilli Eggeling2017-08-2610-14/+14
| | | |/ | | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 08:55:37 +0000