aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Added PATCH to the allowed Apache request methods.Keith Carangelo2020-09-141-17/+1
* Merge branch 'links_per_page'Keith Carangelo2020-09-030-0/+0
|\
| * Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_pageKeith Carangelo2020-09-025-42/+49
| |\
* | \ Merge pull request #1541 from ArthurHoaro/fix/legacy-login-encodingArthurHoaro2020-09-031-1/+11
|\ \ \
| * | | Fix: encoding in legacy route login redirection to post bookmarkArthurHoaro2020-09-031-1/+11
* | | | Merge pull request #1537 from ArthurHoaro/fix/back-compatible-targetsArthurHoaro2020-09-034-646/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Fix feed target in UTArthurHoaro2020-09-031-3/+3
| * | | Improve backward compatibility for LegacyRouterArthurHoaro2020-09-033-643/+7
| | |/ | |/|
* | | Merge pull request #1519 from ArthurHoaro/fix/mobile-pin-linkArthurHoaro2020-09-031-1/+11
|\ \ \
| * | | Default template: display pin button in mobile viewArthurHoaro2020-08-271-1/+11
* | | | Merge pull request #1523 from ArthurHoaro/fix/default-colors-generationArthurHoaro2020-09-032-34/+41
|\ \ \ \
| * | | | Default colors plugin: generate CSS file during initializationArthurHoaro2020-08-292-34/+41
| |/ / /
* | | | Merge pull request #1520 from ArthurHoaro/fix/jp-languageArthurHoaro2020-09-033-2/+3
|\ \ \ \
| * | | | Fix UTArthurHoaro2020-08-271-1/+1
| * | | | Japanese translation: add language to admin configuration pageArthurHoaro2020-08-272-1/+2
| |/ / /
* | | | Merge pull request #1526 from kcaran/links_per_pageArthurHoaro2020-09-033-4/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Avoid using global variablesKeith Carangelo2020-08-311-1/+1
| * | | Moved definition of a.selected to pass sasslint testKeith Carangelo2020-08-301-4/+4
| * | | Added $links_per_page variable to template and display on defaultKeith Carangelo2020-08-293-4/+16
| |/ /
* | | Merge pull request #1524 from ArthurHoaro/fix/rss-stickyArthurHoaro2020-09-035-14/+31
|\ \ \
| * | | Fixed: Pinned bookmarks are displayed first in ATOM/RSS feedsArthurHoaro2020-08-295-14/+31
| |/ /
* | | Merge pull request #1536 from ArthurHoaro/fix/login-private-shaarliArthurHoaro2020-09-031-1/+1
|\ \ \
| * | | Fix login loop for private instancesArthurHoaro2020-09-011-1/+1
| | |/ | |/|
* | | Merge pull request #1534 from ArthurHoaro/fix/legacy-route-postArthurHoaro2020-09-032-8/+32
|\ \ \
| * | | Support redirection of legacy route 'do=configure'ArthurHoaro2020-09-012-0/+19
| * | | Fix legacy redirection when Shaarli instance is under a subfolderArthurHoaro2020-09-012-9/+12
| * | | Fix support for legacy route login redirectionArthurHoaro2020-09-012-6/+8
| | |/ | |/|
* | | Merge pull request #1535 from ArthurHoaro/fix/export-tokenArthurHoaro2020-09-031-3/+16
|\ \ \ | |_|/ |/| |
| * | Export: refresh CRSF token after submitArthurHoaro2020-09-011-3/+16
| |/
* | Merge pull request #1530 from ArthurHoaro/fix/untagged-only-brokenArthurHoaro2020-09-014-29/+31
|\ \
| * | Fix broken route to filter not tagged bookmarksArthurHoaro2020-08-314-29/+31
| |/
* | Merge pull request #1512 from shaarli/dependabot/npm_and_yarn/elliptic-6.5.3ArthurHoaro2020-08-311-10/+15
|\ \
| * | Bump elliptic from 6.4.1 to 6.5.3dependabot[bot]2020-07-301-10/+15
* | | Merge pull request #1505 from shaarli/dependabot/npm_and_yarn/lodash-4.17.19ArthurHoaro2020-08-311-3/+3
|\ \ \ | |_|/ |/| |
| * | Bump lodash from 4.17.15 to 4.17.19dependabot[bot]2020-07-161-3/+3
* | | Merge pull request #1518 from ArthurHoaro/authors/v0.12.0-betaArthurHoaro2020-08-272-8/+23
|\ \ \
| * | | Update authors for v0.12.0-betaArthurHoaro2020-08-272-8/+23
* | | | Merge pull request #1517 from ArthurHoaro/changelog/v0.12.0-betaArthurHoaro2020-08-271-0/+60
|\| | |
| * | | Changelog for v0.12.0-betaArthurHoaro2020-08-271-0/+60
* | | | Merge pull request #1516 from ArthurHoaro/feature/plugin-incompatibilityArthurHoaro2020-08-278-50/+90
|\ \ \ \ | |/ / / |/| | |
| * | | Better handling of plugin incompatibilityArthurHoaro2020-08-278-50/+90
|/ / /
* | | Merge pull request #1511 from ArthurHoaro/wip-slim-routingArthurHoaro2020-08-27225-4010/+12738
|\ \ \ | |_|/ |/| |
| * | Move error handling to dedicated controller instead of middlewareArthurHoaro2020-08-215-40/+135
| * | Move all admin controller into a dedicated groupArthurHoaro2020-08-1317-124/+241
| * | Bookmark's thumbnails PHPDoc improvementArthurHoaro2020-08-011-3/+3
| * | Remove anonymous permission and initialize bookmarks on loginArthurHoaro2020-08-018-57/+42
| * | Fix basePath in unit tests reference DBArthurHoaro2020-07-289-28/+27
| * | Include empty basePath in formattingArthurHoaro2020-07-281-3/+3
| * | Better support for notes permalinkArthurHoaro2020-07-2816-29/+49
| * | Fix links per page controller pathArthurHoaro2020-07-271-1/+1