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

2118 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
ffa39719a1
Merge pull request #1689 from ArthurHoaro/fix/bulk-add-html-label 
Fix: bulk add - use unique HTML ID
 2021-01-19 11:48:38 +01:00
ArthurHoaro
31c4be2b60
Merge pull request #1688 from ArthurHoaro/fix/bulk-single-url 2021-01-19 11:48:29 +01:00
ArthurHoaro
2fbdb7d657
Merge pull request #1687 from ArthurHoaro/feature/template-name 
Inject current template name in templates
 2021-01-19 11:48:18 +01:00
ArthurHoaro
8fbc29de02 Fix: bulk add - use unique HTML ID 
Use links loop ID to make ID unique and fix browser labels behaviour.

Fixes #1685
 2021-01-19 11:35:42 +01:00
ArthurHoaro
9e55beebfd Fix: error when using bulk shaare with a single URL 
Make sure that header metadata associated with permalink is only used in linklist template.

Fixes #1686
 2021-01-19 11:18:56 +01:00
ArthurHoaro
ccd1862d5f Inject current template name in templates 
Use either legacy key _PAGE_ or new 'template' one.

Related to https://github.com/kalvn/Shaarli-Material/issues/118
 2021-01-19 10:34:11 +01:00
nodiscc
544bbdaf83
Merge pull request #1675 from yudete/master 
Update Japanese translations
 2021-01-04 17:51:05 +00:00
yudete
bf02f8ba8e Update Japanese translations 2021-01-04 18:55:03 +09:00
yude
e6754f2154
Merge pull request #2 from shaarli/master 
Merge fork source
 2021-01-04 18:51:10 +09:00
ArthurHoaro
ed4ee8f029
Merge pull request #1671 from ArthurHoaro/fix/plugin-colors-update 
Fix default_colors plugin: update CSS file on color change
 2021-01-03 11:43:54 +01:00
ArthurHoaro
20ba77a2dc
Merge pull request #1672 from ArthurHoaro/feature/api-parse-tags-string 2021-01-03 11:43:31 +01:00
ArthurHoaro
0640c1a6db API: POST/PUT Link - properly parse tags string 
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
 2020-12-29 13:01:04 +01:00
ArthurHoaro
035a002edc Fix default_colors plugin: update CSS file on color change 
Last update of this plugin remove the save_plugin_parameters hook.

Fixes #1657
 2020-12-29 11:59:14 +01:00
ArthurHoaro
fe58bdcd9e
Merge pull request #1664 from ArthurHoaro/fix/metadata-sync 
Fix: synchronous metadata retrieval is failing in strict mode
 2020-12-29 11:44:10 +01:00
ArthurHoaro
8ed5fbef8f
Merge pull request #1665 from ArthurHoaro/fix/metadata-regexes-2 
Fix metadata extract regex (2)
 2020-12-29 11:43:39 +01:00
ArthurHoaro
b01b3b83a7
Merge pull request #1666 from ArthurHoaro/feature/daily-rss-cache 
Daily RSS Cache: invalidate cache base on the date
 2020-12-29 11:43:00 +01:00
ArthurHoaro
f2e309b67d
Merge pull request #1669 from leyrer/master 
Typo fix line 76 'Authentication' -> Authorization
 2020-12-29 00:36:22 +01:00
leyrer
151fa1e450 Typo fix line 76 'Authentication' -> Authorization 2020-12-26 13:45:01 +01:00
ArthurHoaro
f00600a283 Daily RSS Cache: invalidate cache base on the date 
Currently the cache is only invalidated when the datastore changes, while it should rely on selected period of time.

Fixes #1659
 2020-12-17 15:48:03 +01:00
ArthurHoaro
88a8e284b2 Fix metadata extract regex (2) 
Reference: https://stackoverflow.com/questions/8055727/negating-a-backreference-in-regular-expressions

Fixes #1656
 2020-12-17 13:56:24 +01:00
ArthurHoaro
ab4c170672
Merge pull request #1644 from ArthurHoaro/fix/daily-rss 
Daily RSS - Remove relative description (today, yesterday)
 2020-12-16 16:04:53 +01:00
ArthurHoaro
bd11879018
Merge pull request #1645 from ArthurHoaro/feature/plugin-register-route 
Plugin system: allow plugins to provide custom routes
 2020-12-16 16:04:15 +01:00
ArthurHoaro
8f423eb11c
Merge pull request #1658 from dougbreaux/master 
newer alpine (for newer PHP) and apk upgrade #1655
 2020-12-16 16:02:14 +01:00
ArthurHoaro
b1d78519a8
Merge pull request #1652 from ArthurHoaro/fix/failing-mutex 
Fix: soft fail if the mutex is not working
 2020-12-16 16:01:32 +01:00
ArthurHoaro
3d5f05052f
Merge pull request #1661 from shaarli/dependabot/npm_and_yarn/ini-1.3.7 2020-12-16 16:00:35 +01:00
ArthurHoaro
51dea3b87e
Merge pull request #1660 from e2jk/patch-1 
Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile
 2020-12-16 15:59:46 +01:00
ArthurHoaro
6a3a78d023 Fix: synchronous metadata retrieval is failing in strict mode 
Metadata can now only be string or null.

Fixes #1653
 2020-12-16 14:04:32 +01:00
dependabot[bot]
5b74c67461
Bump ini from 1.3.5 to 1.3.7 
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>
 2020-12-11 03:39:18 +00:00
Doug Breaux
2a20e67f76 remove apk upgrade #1655 2020-12-06 22:02:34 -06:00
Emilien Klein
ee07df357b
Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile 
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.
 2020-12-06 21:02:39 +01:00
Doug Breaux
495545f2f0 newer alpine (for newer PHP) and apk upgrade #1655 2020-12-04 16:12:39 -06:00
ArthurHoaro
8a6b7e96b7 Fix: soft fail if the mutex is not working 
And display the error in server admin page

Fixes #1650
 2020-11-24 13:39:35 +01:00
ArthurHoaro
e4b8330e45
Merge pull request #1648 from nodiscc/fix-ConfigureControllerTest 
ConfigureControllerTest.php: update expected languages number to 6
 2020-11-24 13:39:09 +01:00
ArthurHoaro
05c616f7a0 chmod -x russian translation file 2020-11-24 13:35:37 +01:00
nodiscc
70507b8603
ConfigureControllerTest.php: update expected languages number to 6 
Following the addition of russian translations in #1642
Fixes https://github.com/shaarli/Shaarli/issues/1647
 2020-11-22 11:06:14 +00:00
ArthurHoaro
51580efbff
Merge pull request #1642 from prog-it/master 2020-11-17 13:13:49 +01:00
ArthurHoaro
da950241f3
Merge pull request #1639 from ArthurHoaro/doc/fix-release 
Doc: fix missing merge on Release page
 2020-11-15 12:48:16 +01:00
ArthurHoaro
a6e9c08499 Plugin system: allow plugins to provide custom routes 
- 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
 2020-11-15 12:41:43 +01:00
ArthurHoaro
2883c6d0a7 Daily RSS - Remove relative description (today, yesterday) 
It is not useful for the RSS feed, as every new entry will be 'yesterday', and it requires an update the next day.
 2020-11-15 12:05:08 +01:00
prog-it
1595d0e2b3 Add russian language file 2020-11-15 06:16:55 +05:00
prog-it
150f2a0f24 Add russian language selection 2020-11-14 07:45:10 +05:00
ArthurHoaro
831e974ea5 Doc: fix missing merge on Release page 2020-11-12 13:16:20 +01:00
ArthurHoaro
6f9e0609f4 Update badge versions 2020-11-12 13:05:19 +01:00
ArthurHoaro
a6935feb22
Merge pull request #1638 from ArthurHoaro/changelog/v0.12.1 
CHANGELOG v0.12.1
 2020-11-12 13:00:45 +01:00
ArthurHoaro
5a09b5fffd CHANGELOG v0.12.1 2020-11-12 12:56:22 +01:00
ArthurHoaro
302662797c
Merge pull request #1635 from ArthurHoaro/feature/phpcs 2020-11-10 10:46:04 +01:00
ArthurHoaro
c94c32d1a3
Merge pull request #1637 from ArthurHoaro/fix/server-admin-update-check 
Server admin: do not retrieve latest version without update_check
 2020-11-10 10:45:50 +01:00
ArthurHoaro
39b75ea983
Merge pull request #1636 from ArthurHoaro/fix/vintage-async-metadata 2020-11-10 10:45:22 +01:00
ArthurHoaro
7e78237fc9
Merge pull request #1630 from ArthurHoaro/fix/apache-config 
Reviewed Apache configuration
 2020-11-10 10:45:05 +01:00
ArthurHoaro
325cc8adad
Merge pull request #1634 from ArthurHoaro/fix/docker-compose 
Docker-compose: fix SSL certificate + add parameter for Docker tag
 2020-11-10 10:44:50 +01:00