aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1538 from ArthurHoaro/feature/plugins-bookmark-serviceArthurHoaro2020-09-064-37/+63
|\ | | | | Inject BookmarkServiceInterface in plugins data
| * Inject BookmarkServiceInterface in plugins dataArthurHoaro2020-09-034-37/+63
| | | | | | | | Related discussion: ilesinge/shaarli-related#7
* | Merge pull request #1546 from immanuelfodor/patch-2ArthurHoaro2020-09-061-2/+2
|\ \ | | | | | | Fix broken css/js files on individual shaare pages
| * | Fix broken css/js files on individual shaare pagesImmánuel!2020-09-061-2/+2
|/ /
* | Merge pull request #1542 from shaarli/dependabot/npm_and_yarn/node-sass-4.13.1ArthurHoaro2020-09-062-10/+10
|\ \ | | | | | | Bump node-sass from 4.12.0 to 4.13.1
| * | Bump node-sass from 4.12.0 to 4.13.1dependabot[bot]2020-09-042-10/+10
|/ / | | | | | | | | | | | | | | Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.1. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.12.0...v4.13.1) Signed-off-by: dependabot[bot] <support@github.com>
* | 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
| | | | | | | | | | | | | | | When a bookmark is post from a logged out user, he is first redirected to the login page with 'returnurl' containing the link, then redirected again when the login is processed. We need to reencode the posted URL, otherwise the browser does not handle the fragment as a part of the posted parameter.
* | | 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
| |/ | | | | | | | | | | | | LegacyRouter is no longer used for routing, only in existing plugins to match the _PAGE_ parameter. So we change a few of its values there, to match the new ones defined in TemplatePage. @see discussion in shaarli/Shaarli#1537
* | Merge pull request #1519 from ArthurHoaro/fix/mobile-pin-linkArthurHoaro2020-09-031-1/+11
|\ \ | | | | | | Default template: display pin button in mobile view
| * | Default template: display pin button in mobile viewArthurHoaro2020-08-271-1/+11
| | | | | | | | | | | | Fixes #1347
* | | Merge pull request #1523 from ArthurHoaro/fix/default-colors-generationArthurHoaro2020-09-032-34/+41
|\ \ \ | | | | | | | | Default colors plugin: generate CSS file during initialization
| * | | Default colors plugin: generate CSS file during initializationArthurHoaro2020-08-292-34/+41
| |/ / | | | | | | | | | | | | Current behaviour only generate the custom CSS file when the plugin settings are saved, which can be annoying if the file is deleted but the settings are set. Most common use case is Docker deployment, because the plugin directory is not mounted as a volume.
* | | 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
| |/ / | | | | | | | | | Also use ISO country code (JP) instead of JA.
* | | Merge pull request #1526 from kcaran/links_per_pageArthurHoaro2020-09-033-4/+16
|\ \ \
| * | | Avoid using global variablesKeith Carangelo2020-08-311-1/+1
| | | | | | | | | | | | Co-authored-by: ArthurHoaro <arthur@hoa.ro>
| * | | 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 feeds
| * | | Fixed: Pinned bookmarks are displayed first in ATOM/RSS feedsArthurHoaro2020-08-295-14/+31
| |/ / | | | | | | | | | Fixes #1485
* | | Merge pull request #1536 from ArthurHoaro/fix/login-private-shaarliArthurHoaro2020-09-031-1/+1
|\ \ \ | | | | | | | | Fix login loop for private instances
| * | | Fix login loop for private instancesArthurHoaro2020-09-011-1/+1
| | |/ | |/| | | | | | | | | | | | | GET /login and POST /login have 2 distinct route name. Fixes #1533
* | | 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
| | |/ | |/| | | | | | | Makes sure that the user is properly redirected to the bookmark form after login, even with legacy routes
* | | Merge pull request #1535 from ArthurHoaro/fix/export-tokenArthurHoaro2020-09-031-3/+16
|\ \ \ | |_|/ |/| | Export: refresh CRSF token after submit
| * | Export: refresh CRSF token after submitArthurHoaro2020-09-011-3/+16
| |/ | | | | | | | | | | This allow users to submit the form multiple times, because there is no actual browser redirection to the page. Fixes #1532
* | Merge pull request #1530 from ArthurHoaro/fix/untagged-only-brokenArthurHoaro2020-09-014-29/+31
|\ \ | | | | | | Fix broken route to filter not tagged bookmarks
| * | Fix broken route to filter not tagged bookmarksArthurHoaro2020-08-314-29/+31
| |/ | | | | | | | | | | Also display the filter for visitors. Fixes #1529
* | 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.3
| * | Bump elliptic from 6.4.1 to 6.5.3dependabot[bot]2020-07-301-10/+15
| | | | | | | | | | | | | | | | | | | | | Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3) Signed-off-by: dependabot[bot] <support@github.com>
* | | 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.19
| * | Bump lodash from 4.17.15 to 4.17.19dependabot[bot]2020-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #1518 from ArthurHoaro/authors/v0.12.0-betaArthurHoaro2020-08-272-8/+23
|\ \ \ | | | | | | | | Update authors for v0.12.0-beta
| * | | 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-beta
| * | | 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 incompatibility
| * | | Better handling of plugin incompatibilityArthurHoaro2020-08-278-50/+90
|/ / / | | | | | | | | | | | | If a PHP is raised while executing plugin hook, Shaarli will display an error instead of rendering the error page (or just ending in fatal error for default hooks). Also added phpErrorHandler which is handled differently that regular errorHandler by Slim.:
* | | 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
| | | | | | | | | | | | Also handle authentication check in a new middleware for the admin group.
| * | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 10:21:53 +0000