Commit graph

2228 commits

Author SHA1 Message Date
nodiscc 7ae4b2f8b0
doc: add "formatter" key to example config.json.php
- fixes https://github.com/shaarli/Shaarli/issues/1680
2021-10-10 15:11:38 +02:00
nodiscc df0ca43873
doc: remove duplicate "general" key in example config.php.json
- ref. https://github.com/shaarli/Shaarli/issues/1680
2021-10-10 15:09:57 +02:00
nodiscc 21550cda7d
Merge pull request #1804 from nodiscc/doc-fix-icon
doc: fix homepage title/icon rendering
2021-10-02 11:25:16 +00:00
nodiscc e0f4fd4537
doc: fix homepage title/icon rendering
- fixes https://github.com/shaarli/Shaarli/issues/1774
2021-09-26 21:53:41 +02:00
ArthurHoaro 163cd8ce2d
Merge pull request #1798 from kcaran/or-tag-search 2021-09-23 08:32:40 +02:00
Keith Carangelo d2019d3a09 Fixed issue with suggestions on multiple terms 2021-09-08 20:45:56 -04:00
Keith Carangelo c6f27b1ade Fixed issues after running make code_sniffer 2021-09-08 15:46:51 -04:00
Keith Carangelo 6202038c65 Updated to pass eslint 2021-09-08 15:40:05 -04:00
Keith Carangelo a7d43caccb Added support for OR (~) and optional AND (+) operators for tag searches. 2021-09-08 15:26:58 -04:00
Keith Carangelo 6e0f92acb4 Merge branch 'master' of github.com:Shaarli/Shaarli into upstream 2021-09-07 13:41:59 -04:00
ArthurHoaro 6ca3980812
Merge pull request #1795 from shaarli/dependabot/npm_and_yarn/tar-6.1.11
Bump tar from 6.1.3 to 6.1.11
2021-09-05 10:22:10 +02:00
ArthurHoaro a276e0c4e6
Merge pull request #1786 from yfdyh000/remove_travis.org
remove travis from README.md
2021-09-05 09:28:46 +02:00
ArthurHoaro b1f026b674
Merge pull request #1791 from yfdyh000/plugin_enabled
Intuitive checkbox for Enabled Plugins
2021-09-05 09:27:55 +02:00
dependabot[bot] a908ed6866
Bump tar from 6.1.3 to 6.1.11
Bumps [tar](https://github.com/npm/node-tar) from 6.1.3 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.3...v6.1.11)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-31 16:51:51 +00:00
Keith Carangelo 6ca8ab31b2 Merge branch 'master' of github.com:Shaarli/Shaarli into upstream 2021-08-26 14:17:37 -04:00
YFdyh000 f33af48b59 Intuitive checkbox for Enabled Plugins 2021-08-22 22:34:28 +08:00
YFdyh000 36e16b3d17 remove travis from README.md 2021-08-22 21:44:39 +08:00
ArthurHoaro 3b1818dfa6
Merge pull request #1781 from yfdyh000/zh_CN 2021-08-14 10:52:58 +02:00
ArthurHoaro 9a62827452 UT: bump number of languages 2021-08-14 10:44:40 +02:00
nodiscc dba8975f85
Merge pull request #1784 from shaarli/dependabot/npm_and_yarn/path-parse-1.0.7
Bump path-parse from 1.0.6 to 1.0.7
2021-08-14 00:21:20 +00:00
nodiscc 4dfabbf8a7
Merge pull request #1780 from shaarli/dependabot/npm_and_yarn/tar-6.1.3
Bump tar from 6.1.0 to 6.1.3
2021-08-14 00:21:01 +00:00
dependabot[bot] 65d9afa9b8
Bump path-parse from 1.0.6 to 1.0.7
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-10 22:52:25 +00:00
YFdyh000 142370f0a1 Add Chinese (Simplified) translation 2021-08-10 07:23:42 +08:00
dependabot[bot] a0eed0546b
Bump tar from 6.1.0 to 6.1.3
Bumps [tar](https://github.com/npm/node-tar) from 6.1.0 to 6.1.3.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.0...v6.1.3)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 19:55:31 +00:00
nodiscc ab6a4c9f7b
Merge pull request #1779 from letompouce/doc-rm-markdown-plugin
doc: remove the markdown plugin from the plugins list
2021-08-02 13:52:02 +00:00
ToM 63fe4881cc doc: remove the markdown plugin from the plugins list
The plugin is now part of core since v0.12.0
2021-08-01 16:44:31 +02:00
nodiscc a79707258f
Merge pull request #1768 from nodiscc/doc-proxy-subdirectory
doc: add notice about nginx location directive when shaarli is installed in a subdirectory
2021-07-19 17:02:29 +00:00
nodiscc 1a36e314ba
Merge pull request #1769 from nodiscc/doc-php-ldap
doc: LDAP login support, update php requirements list
2021-07-19 17:02:14 +00:00
nodiscc 4cfaa67e07
Merge pull request #1767 from nodiscc/doc-bookmarklet
doc: bookmarklet is now working on github.com
2021-07-19 17:02:05 +00:00
nodiscc 338648093f
Merge pull request #1765 from nodiscc/github-actions-docker-build
build and push docker images using Github Actions
2021-07-19 16:58:34 +00:00
nodiscc d1fed70609
Merge pull request #1766 from shaarli/dependabot/npm_and_yarn/postcss-7.0.36
Bump postcss from 7.0.35 to 7.0.36
2021-06-18 15:47:38 +00:00
nodiscc 4a63c2bbb4
doc: LDAP login support, update php requirements list
- fixes https://github.com/shaarli/Shaarli/issues/1677
2021-06-17 17:57:07 +02:00
nodiscc f841121a6e
doc: add notice about nginx location directive when shaarli is installed in a subdirectory
- fixes https://github.com/shaarli/Shaarli/issues/1679
2021-06-17 17:50:56 +02:00
nodiscc 2a569f1e93
doc: bookmarklet is now working on github.com
- left generic paragraph about this problem in place, since the problem may still be present on other sites
- closes https://github.com/shaarli/Shaarli/issues/1730
2021-06-17 17:46:00 +02:00
dependabot[bot] bf63992617
Bump postcss from 7.0.35 to 7.0.36
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 20:38:40 +00:00
nodiscc eeaabc05a7
build and push docker images using github actions
- push images to https://hub.docker.com/r/shaarli/shaarli/tags using a personal access token (access tokens are not available for organizations)
- push an image tagged :latest for builds on master
- push an image with the same tag as the git tag for v*.*.* tags, and for the "release" branch
- update documentation (remove references to Travis/Drone CI
- deprecate stable and master Docker tags (ref. https://github.com/shaarli/Shaarli/issues/1453)
- add deprecation notices to CHANGELOG.md
2021-06-15 20:35:36 +02:00
nodiscc 11c6fc418d
Merge pull request #1763 from shaarli/dependabot/npm_and_yarn/trim-newlines-3.0.1
Bump trim-newlines from 3.0.0 to 3.0.1
2021-06-14 12:20:54 +00:00
dependabot[bot] 4f6a4f6107
Bump trim-newlines from 3.0.0 to 3.0.1
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 18:23:13 +00:00
ArthurHoaro a047b62c2b
Merge pull request #1760 from qbi/patch-1
Change Zeichen to Token
2021-05-28 08:19:27 +02:00
nodiscc fbedbd8ee2
Merge pull request #1759 from ArthurHoaro/feat/github-actions
Setup Github Actions for Shaarli
2021-05-25 15:49:56 +00:00
Jens Kubieziel 0b97c4279e
Change Zeichen to Token
I'd recommend to change the German translation. The word "Zeichen" is misleading in this case. It means something like string or character. The word "Token" fits better. In general I'd change the message to "Wrong XSRF token". This makes it more clear what happens here.
2021-05-25 09:58:46 +00:00
ArthurHoaro 8887f9826a
Merge pull request #1752 from oblab/patch-3
Update includes.html
2021-05-23 11:43:24 +02:00
ArthurHoaro 2ce2ef3708 Setup Github Actions for Shaarli
This is kind of a quick & dirty setup in order to fix our non-CI current status.
We can later decide to either improve it or fix Drone CI.

Related to #1754
2021-05-23 11:36:24 +02:00
nodiscc d8fe0e7276
Merge pull request #1741 from nodiscc/drone-ci
switch continuous integration system to Drone CI
2021-05-16 17:32:42 +00:00
Olivier 3d27ecbb37
Update includes.html
change permalink '<meta property="og:url" content="{$index_url}?{$link.shorturl}" />' by '<meta property="og:url" content="{$index_url}shaare/{$link.shorturl}" />'
2021-05-15 10:50:13 +02:00
ArthurHoaro fbb33c723e
Merge pull request #1750 from oblab/patch-1
Update includes.html
2021-05-15 10:47:53 +02:00
ArthurHoaro bbb2dd30ac
Merge pull request #1751 from oblab/patch-2 2021-05-15 10:47:37 +02:00
Olivier 62c9b3a6d9
Update daily.html
Change permalink in daily.html file : <a href="{$base_path}/?{$link.shorturl}" title="{'Permalink'|t}">
by : <a href="{$base_path}/shaare/{$link.shorturl}" title="{'Permalink'|t}">
2021-05-15 10:42:59 +02:00
Olivier bbcb18931c
Update includes.html
Change the permalink in meta property : <meta property="og:url" content="{$index_url}?{$link.shorturl}" />
by : <meta property="og:url" content="{$index_url}shaare/{$link.shorturl}" /> ?
2021-05-15 10:40:29 +02:00
nodiscc d4da270289
doc: update CI documentation
- use cloud.drone.io badges for builds on the master branch
- stable/0.x badges will need to be updated when the next stable/0.x release is published
2021-05-13 14:28:25 +02:00