Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1959 commits 8 branches 1 tag 12 MiB
Commit graph

1959 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
e2dff28b44
Merge pull request #1547 from ArthurHoaro/fix/daily-visibility 
Fix visibility issue on daily page
 2020-09-06 14:16:08 +02:00
ArthurHoaro
949a095310
Merge pull request #1538 from ArthurHoaro/feature/plugins-bookmark-service 
Inject BookmarkServiceInterface in plugins data
 2020-09-06 14:13:16 +02:00
ArthurHoaro
27ddfec3c3 Fix visibility issue on daily page 
This filter (links by day) didn't apply any visibility parameter.

Fixes #1543
 2020-09-06 14:11:02 +02:00
ArthurHoaro
a5dd7d58d2
Merge pull request #1546 from immanuelfodor/patch-2 
Fix broken css/js files on individual shaare pages
 2020-09-06 13:38:31 +02:00
Immánuel!
707a1d237a
Fix broken css/js files on individual shaare pages 2020-09-06 13:29:38 +02:00
ArthurHoaro
a3cb851d0c
Merge pull request #1542 from shaarli/dependabot/npm_and_yarn/node-sass-4.13.1 
Bump node-sass from 4.12.0 to 4.13.1
 2020-09-06 13:24:09 +02:00
dependabot[bot]
7b05dd71f3
Bump node-sass from 4.12.0 to 4.13.1 
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>
 2020-09-04 09:54:32 +00:00
Keith Carangelo
e2a2441d3b Merge branch 'links_per_page' 2020-09-03 15:39:31 -04:00
ArthurHoaro
2ba51040c7
Merge pull request #1541 from ArthurHoaro/fix/legacy-login-encoding 2020-09-03 18:54:45 +02:00
ArthurHoaro
d33cffdb2e Fix: encoding in legacy route login redirection to post bookmark 
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.
 2020-09-03 18:46:10 +02:00
ArthurHoaro
80b708a878 Inject BookmarkServiceInterface in plugins data 
Related discussion: ilesinge/shaarli-related#7
 2020-09-03 15:08:08 +02:00
ArthurHoaro
46d3f8162b
Merge pull request #1537 from ArthurHoaro/fix/back-compatible-targets 2020-09-03 14:57:24 +02:00
ArthurHoaro
0386a84d82 Fix feed target in UT 2020-09-03 10:18:04 +02:00
ArthurHoaro
ce7918386a Improve backward compatibility for LegacyRouter 
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
 2020-09-03 10:09:36 +02:00
ArthurHoaro
21163a3329
Merge pull request #1519 from ArthurHoaro/fix/mobile-pin-link 
Default template: display pin button in mobile view
 2020-09-03 08:49:20 +02:00
ArthurHoaro
865f0a0e01
Merge pull request #1523 from ArthurHoaro/fix/default-colors-generation 
Default colors plugin: generate CSS file during initialization
 2020-09-03 08:48:51 +02:00
ArthurHoaro
9e6371a6fd
Merge pull request #1520 from ArthurHoaro/fix/jp-language 2020-09-03 08:46:47 +02:00
ArthurHoaro
0a286f6946
Merge pull request #1526 from kcaran/links_per_page 2020-09-03 08:45:48 +02:00
ArthurHoaro
2835ac7cbe
Merge pull request #1524 from ArthurHoaro/fix/rss-sticky 
Fixed: Pinned bookmarks are displayed first in ATOM/RSS feeds
 2020-09-03 08:45:12 +02:00
ArthurHoaro
ca636b898c
Merge pull request #1536 from ArthurHoaro/fix/login-private-shaarli 
Fix login loop for private instances
 2020-09-03 08:35:18 +02:00
ArthurHoaro
d95624add4
Merge pull request #1534 from ArthurHoaro/fix/legacy-route-post 2020-09-03 08:35:05 +02:00
ArthurHoaro
43582975dc
Merge pull request #1535 from ArthurHoaro/fix/export-token 
Export: refresh CRSF token after submit
 2020-09-03 08:34:57 +02:00
Keith Carangelo
82fcace8fc Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_page 2020-09-02 11:38:56 -04:00
ArthurHoaro
14fcfb5213 Fix login loop for private instances 
GET /login and POST /login have 2 distinct route name.

Fixes #1533
 2020-09-01 11:26:24 +02:00
ArthurHoaro
cd10bc23e7 Export: refresh CRSF token after submit 
This allow users to submit the form multiple times, because there is no actual browser redirection to the page.

Fixes #1532
 2020-09-01 11:01:21 +02:00
ArthurHoaro
11aa4a7a29 Support redirection of legacy route 'do=configure' 2020-09-01 10:40:35 +02:00
ArthurHoaro
9e2d47e519 Fix legacy redirection when Shaarli instance is under a subfolder 2020-09-01 10:40:18 +02:00
ArthurHoaro
aca995e09c Fix support for legacy route login redirection 
Makes sure that the user is properly redirected to the bookmark form after login, even with legacy routes
 2020-09-01 10:12:54 +02:00
ArthurHoaro
0e60b7f174
Merge pull request #1530 from ArthurHoaro/fix/untagged-only-broken 
Fix broken route to filter not tagged bookmarks
 2020-09-01 09:37:01 +02:00
Keith Carangelo
4479aff18f
Avoid using global variables 
Co-authored-by: ArthurHoaro <arthur@hoa.ro>
 2020-08-31 09:20:03 -04:00
ArthurHoaro
63b0059ed5 Fix broken route to filter not tagged bookmarks 
Also display the filter for visitors.

Fixes #1529
 2020-08-31 14:09:27 +02:00
ArthurHoaro
06f05c923a
Merge pull request #1512 from shaarli/dependabot/npm_and_yarn/elliptic-6.5.3 
Bump elliptic from 6.4.1 to 6.5.3
 2020-08-31 14:06:32 +02:00
ArthurHoaro
a975d97a8d
Merge pull request #1505 from shaarli/dependabot/npm_and_yarn/lodash-4.17.19 
Bump lodash from 4.17.15 to 4.17.19
 2020-08-31 14:03:58 +02:00
Keith Carangelo
e813934ae1 Moved definition of a.selected to pass sasslint test 2020-08-30 07:26:21 -04:00
Keith Carangelo
816ffba74b Added $links_per_page variable to template and display on default 2020-08-29 11:02:59 -04:00
ArthurHoaro
a8e210faa6 Fixed: Pinned bookmarks are displayed first in ATOM/RSS feeds 
Fixes #1485
 2020-08-29 10:06:40 +02:00
ArthurHoaro
972daa4513 Default colors plugin: generate CSS file during initialization 
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.
 2020-08-29 09:38:30 +02:00
ArthurHoaro
8af1d2da60 Fix UT 2020-08-27 15:26:52 +02:00
ArthurHoaro
ebc027ec0a Japanese translation: add language to admin configuration page 
Also use ISO country code (JP) instead of JA.
 2020-08-27 15:00:48 +02:00
ArthurHoaro
3eba6bd318 Default template: display pin button in mobile view 
Fixes #1347
 2020-08-27 14:48:07 +02:00
ArthurHoaro
bea062149e
Merge pull request #1518 from ArthurHoaro/authors/v0.12.0-beta 
Update authors for v0.12.0-beta
 2020-08-27 13:56:36 +02:00
ArthurHoaro
2d8a0a71a8 Update authors for v0.12.0-beta 2020-08-27 13:52:18 +02:00
ArthurHoaro
46237c9788
Merge pull request #1517 from ArthurHoaro/changelog/v0.12.0-beta 
Changelog for v0.12.0-beta
 2020-08-27 13:44:18 +02:00
ArthurHoaro
6152a26790 Changelog for v0.12.0-beta 2020-08-27 13:39:49 +02:00
ArthurHoaro
109ebf318f
Merge pull request #1516 from ArthurHoaro/feature/plugin-incompatibility 
Better handling of plugin incompatibility
 2020-08-27 12:10:16 +02:00
ArthurHoaro
7e3dc0ba98 Better handling of plugin incompatibility 
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.:
 2020-08-27 12:04:36 +02:00
ArthurHoaro
af41d5ab5d
Merge pull request #1511 from ArthurHoaro/wip-slim-routing 2020-08-27 10:27:34 +02:00
ArthurHoaro
0c6fdbe12b Move error handling to dedicated controller instead of middleware 2020-08-21 10:50:44 +02:00
ArthurHoaro
bedbb845ee Move all admin controller into a dedicated group 
Also handle authentication check in a new middleware for the admin group.
 2020-08-13 11:08:13 +02:00
ArthurHoaro
1a68ae5a29 Bookmark's thumbnails PHPDoc improvement 2020-08-01 11:14:03 +02:00