aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1697 from ArthurHoaro/feature/paginationArthurHoaro2021-02-0420-149/+420
|\ | | | | Handle pagination through BookmarkService
| * Handle pagination through BookmarkServiceArthurHoaro2021-01-2020-149/+420
| | | | | | | | | | | | | | Handle all search results through SearchResult object. This is a required step toward implementing a BookmarkService based on SQL database. Related to #953
* | Merge pull request #1696 from ArthurHoaro/fix/search-highlight-urlArthurHoaro2021-02-0410-14/+214
|\ \
| * | ShaarliParsedown: add PHPDoc/commentsArthurHoaro2021-02-043-2/+43
| | |
| * | Support search highlights when matching URL contentArthurHoaro2021-01-1910-14/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DefaultFormatter: - format 'a' tag content and not href attribute - format hashtags properly Markdown(Extra)Formatter: - Extend Parsedown to format highlight properly: https://github.com/erusev/parsedown/wiki/Tutorial:-Create-Extensions Fixes #1681
* | | Merge pull request #1694 from ArthurHoaro/fix/bulk-add-redirect-tokenArthurHoaro2021-01-261-1/+1
|\ \ \ | | | | | | | | Fix: bulk add redirection with ending slash
| * | | Fix: bulk add redirection with ending slashArthurHoaro2021-01-191-1/+1
| |/ / | | | | | | | | | | | | | | | Otherwise cookie may not be store under the right subfolder, thus generating tokens in the wrong session file. Fixes #1690
* | | Merge pull request #1699 from bschwede/masterArthurHoaro2021-01-262-556/+1264
|\ \ \ | |_|/ |/| | Update German translations, added new strings to server.html
| * | Update German translations, added new strings to server.htmlbschwede2021-01-252-556/+1264
|/ /
* | Merge pull request #1695 from ArthurHoaro/fix/ut-curlArthurHoaro2021-01-202-1/+2
|\ \
| * | format_date: include timezone in IntlDateFormatter objectArthurHoaro2021-01-191-0/+1
| | | | | | | | | | | | | | | | | | @see https://www.php.net/manual/en/intldateformatter.format.php > If a DateTime or an IntlCalendar object is passed, its timezone is not considered. The object will be formatted using the formaterʼs configured timezone. If one wants to use the timezone of the object to be formatted, IntlDateFormatter::setTimeZone() must be called before with the objectʼs timezone.
| * | curl usage: support HTTP/2 response code headerArthurHoaro2021-01-191-1/+1
| |/
* | Merge pull request #1693 from ArthurHoaro/fix/bulk-add-deleteArthurHoaro2021-01-193-3/+50
|\ \ | | | | | | Fix: bulk add - delete existing link
| * | Fix: bulk add - delete existing linkArthurHoaro2021-01-193-3/+50
| |/ | | | | | | | | | | Do not send redirect response in bookmark delete controller if the request comes from bulk creation page. Fixes #1683
* | Merge pull request #1691 from ArthurHoaro/fix/bulk-add-js-checkboxesArthurHoaro2021-01-191-1/+5
|\ \ | |/ |/| Fix: bulk add - private status
| * Fix: bulk add - private statusArthurHoaro2021-01-191-1/+5
|/ | | | | | Use 'checked' attribute instead of 'value' for checkboxes. 'value' always returns 'on'. Fixes #1684
* Merge pull request #1689 from ArthurHoaro/fix/bulk-add-html-labelArthurHoaro2021-01-192-11/+13
|\ | | | | Fix: bulk add - use unique HTML ID
| * Fix: bulk add - use unique HTML IDArthurHoaro2021-01-192-11/+13
| | | | | | | | | | | | Use links loop ID to make ID unique and fix browser labels behaviour. Fixes #1685
* | Merge pull request #1688 from ArthurHoaro/fix/bulk-single-urlArthurHoaro2021-01-192-2/+2
|\ \
| * | Fix: error when using bulk shaare with a single URLArthurHoaro2021-01-192-2/+2
| | | | | | | | | | | | | | | | | | Make sure that header metadata associated with permalink is only used in linklist template. Fixes #1686
* | | Merge pull request #1687 from ArthurHoaro/feature/template-nameArthurHoaro2021-01-192-0/+7
|\| | | |/ |/| Inject current template name in templates
| * Inject current template name in templatesArthurHoaro2021-01-192-0/+7
|/ | | | | | Use either legacy key _PAGE_ or new 'template' one. Related to https://github.com/kalvn/Shaarli-Material/issues/118
* Merge pull request #1675 from yudete/masternodiscc2021-01-041-12/+7
|\ | | | | Update Japanese translations
| * Update Japanese translationsyudete2021-01-041-12/+7
| |
| * Merge pull request #2 from shaarli/masteryude2021-01-04208-1991/+8969
| |\ | |/ |/| Merge fork source
* | Merge pull request #1671 from ArthurHoaro/fix/plugin-colors-updateArthurHoaro2021-01-032-0/+37
|\ \ | | | | | | Fix default_colors plugin: update CSS file on color change
| * | Fix default_colors plugin: update CSS file on color changeArthurHoaro2020-12-292-0/+37
| | | | | | | | | | | | | | | | | | Last update of this plugin remove the save_plugin_parameters hook. Fixes #1657
* | | Merge pull request #1672 from ArthurHoaro/feature/api-parse-tags-stringArthurHoaro2021-01-034-6/+123
|\ \ \
| * | | API: POST/PUT Link - properly parse tags stringArthurHoaro2020-12-294-6/+123
|/ / / | | | | | | | | | | | | | | | Even though the documentation specify that tags should be passed as an array, tags string is actually allowed. So this adds a proper parsing with configured separator. Related to #1651
* | | Merge pull request #1664 from ArthurHoaro/fix/metadata-syncArthurHoaro2020-12-293-4/+9
|\ \ \ | | | | | | | | Fix: synchronous metadata retrieval is failing in strict mode
| * | | Fix: synchronous metadata retrieval is failing in strict modeArthurHoaro2020-12-163-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Metadata can now only be string or null. Fixes #1653
* | | | Merge pull request #1665 from ArthurHoaro/fix/metadata-regexes-2ArthurHoaro2020-12-292-2/+14
|\ \ \ \ | | | | | | | | | | Fix metadata extract regex (2)
| * | | | Fix metadata extract regex (2)ArthurHoaro2020-12-172-2/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | Reference: https://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions Fixes #1656
* | | | Merge pull request #1666 from ArthurHoaro/feature/daily-rss-cacheArthurHoaro2020-12-296-68/+213
|\ \ \ \ | |_|/ / |/| | | Daily RSS Cache: invalidate cache base on the date
| * | | Daily RSS Cache: invalidate cache base on the dateArthurHoaro2020-12-176-68/+213
| | | | | | | | | | | | | | | | | | | | | | | | Currently the cache is only invalidated when the datastore changes, while it should rely on selected period of time. Fixes #1659
* | | | Merge pull request #1669 from leyrer/masterArthurHoaro2020-12-291-1/+1
|\ \ \ \ | |/ / / |/| | | Typo fix line 76 'Authentication' -> Authorization
| * | | Typo fix line 76 'Authentication' -> Authorizationleyrer2020-12-261-1/+1
|/ / /
* | | Merge pull request #1644 from ArthurHoaro/fix/daily-rssArthurHoaro2020-12-163-8/+39
|\ \ \ | | | | | | | | Daily RSS - Remove relative description (today, yesterday)
| * | | Daily RSS - Remove relative description (today, yesterday)ArthurHoaro2020-11-153-8/+39
| | | | | | | | | | | | | | | | It is not useful for the RSS feed, as every new entry will be 'yesterday', and it requires an update the next day.
* | | | Merge pull request #1645 from ArthurHoaro/feature/plugin-register-routeArthurHoaro2020-12-1613-13/+270
|\ \ \ \ | | | | | | | | | | Plugin system: allow plugins to provide custom routes
| * | | | Plugin system: allow plugins to provide custom routesArthurHoaro2020-11-1513-13/+270
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - each route will be prefixed by `/plugin/<plugin_name>` - add a new template for plugins rendering - add a live example in the demo_plugin Check out the "Plugin System" documentation for more detail. Related to #143
* | | | Merge pull request #1658 from dougbreaux/masterArthurHoaro2020-12-161-1/+1
|\ \ \ \ | | | | | | | | | | newer alpine (for newer PHP) and apk upgrade #1655
| * | | | remove apk upgrade #1655Doug Breaux2020-12-061-2/+1
| | | | |
| * | | | newer alpine (for newer PHP) and apk upgrade #1655Doug Breaux2020-12-041-2/+3
| | |/ / | |/| |
* | | | Merge pull request #1652 from ArthurHoaro/fix/failing-mutexArthurHoaro2020-12-165-93/+145
|\ \ \ \ | | | | | | | | | | Fix: soft fail if the mutex is not working
| * | | | Fix: soft fail if the mutex is not workingArthurHoaro2020-11-245-93/+145
| |/ / / | | | | | | | | | | | | | | | | | | | | And display the error in server admin page Fixes #1650
* | | | Merge pull request #1661 from shaarli/dependabot/npm_and_yarn/ini-1.3.7ArthurHoaro2020-12-161-3/+3
|\ \ \ \
| * | | | Bump ini from 1.3.5 to 1.3.7dependabot[bot]2020-12-111-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #1660 from e2jk/patch-1ArthurHoaro2020-12-161-4/+4
|\ \ \ \ | |/ / / |/| | | Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile
| * | | Upgrade alpine from 3.8 to 3.10 in armhf DockerfileEmilien Klein2020-12-061-4/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Docker for armhf doesn't build anymore on Alpine 3.8, upgrading to 3.10. Building works fine on a Rapsberry Pi 4 running Raspbian GNU/Linux 10 (buster) This is the error with 3.8: ``` [2/4] Fetching packages... error css-loader@4.3.0: The engine "node" is incompatible with this module. Expected version ">= 10.13.0". error Found incompatible module info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. The command '/bin/sh -c apk --update --no-cache add yarn nodejs-current python2 build-base && cd /shaarli && yarn install && yarn run build && rm -rf node_modules' returned a non-zero code: 1 ``` Not upgrading to 3.11, due to this error: ``` 2/4] Fetching packages... error browserslist@4.14.3: The engine "node" is incompatible with this module. Expected version "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7". Got "13.1.0" error Found incompatible module. info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. The command '/bin/sh -c apk --update --no-cache add yarn nodejs-current python2 build-base && cd /shaarli && yarn install && yarn run build && rm -rf node_modules' returned a non-zero code: 1 ``` Not upgrading to 3.12 either, due to this error: ``` ERROR: unsatisfiable constraints: py2-pip (missing): required by: world[py2-pip] The command '/bin/sh -c apk --update --no-cache add py2-pip && cd /usr/src/app/shaarli && pip install --no-cache-dir mkdocs && mkdocs build --clean' returned a non-zero code: 1 ``` There's probably a way to have Python2 pip installed on 3.12, but I suppose other issues would arise (such as the one happening with 3.11), so only proposing to upgrade to 3.10 now. This would probably be looked at more in detail when merging the amd64 and arm/v7 Docker builds, see #1496.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:29:05 +0000