Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Shaarli/Shaarli into upstream

Browse source
This commit is contained in:
Keith Carangelo 2021-09-07 13:41:59 -04:00
commit 6e0f92acb4
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -7,10 +7,8 @@ _Shaarli is a minimalist link sharing service that you can install on your own s
_It is designed to be personal (single-user), fast and handy._
[![](https://img.shields.io/badge/stable-v0.11.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.11.1)
[![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli)
•
[![](https://img.shields.io/badge/latest-v0.12.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.12.1)
[![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli)
•
[![](https://img.shields.io/badge/master-v0.12.x-blue.svg)](https://github.com/shaarli/Shaarli)
[![](https://github.com/shaarli/Shaarli/actions/workflows/ci.yml/badge.svg)](https://github.com/shaarli/Shaarli/actions)

8
tpl/default/pluginsadmin.html
View file

@ -32,7 +32,7 @@
<table id="plugin_table">
<thead>
<tr>
<th class="center">{'Disable'|t}</th>
<th class="center">{'Enabled'|t}</th>
<th>{'Name'|t}</th>
<th><div class="pure-u-0 pure-u-lg-visible">{'Description'|t}</div></th>
<th class="center">{'Order'|t}</th>
@ -61,7 +61,7 @@
</tbody>
<tfoot>
<tr>
<th class="center">{'Disable'|t}</th>
<th class="center">{'Enabled'|t}</th>
<th>{'Name'|t}</th>
<th><div class="pure-u-0 pure-u-lg-visible">{'Description'|t}</div></th>
<th class="center">{'Order'|t}</th>
@ -82,7 +82,7 @@
<table>
<thead>
<tr>
<th class="center">{'Enable'|t}</th>
<th class="center">{'Enabled'|t}</th>
<th>{'Name'|t}</th>
<th><div class="pure-u-0 pure-u-lg-visible">{'Description'|t}</div></th>
</tr>
@ -105,7 +105,7 @@
</tbody>
<tfoot>
<tr>
<th class="center">{'Enable'|t}</th>
<th class="center">{'Enabled'|t}</th>
<th>{'Name'|t}</th>
<th><div class="pure-u-0 pure-u-lg-visible">{'Description'|t}</div></th>
</tr>

4
tpl/vintage/pluginsadmin.html
View file

@ -27,7 +27,7 @@
<table id="plugin_table">
<thead>
<tr>
<th class="center">Disable</th>
<th class="center">Enabled</th>
<th class="center">Order</th>
<th>Name</th>
<th>Description</th>
@ -67,7 +67,7 @@
{else}
<table>
<tr>
<th class="center">Enable</th>
<th class="center">Enabled</th>
<th>Name</th>
<th>Description</th>
</tr>

6
yarn.lock
View file

@ -5513,9 +5513,9 @@ tapable@^1.0.0, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
version "6.1.3"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.3.tgz#e44b97ee7d6cc7a4c574e8b01174614538291825"
integrity sha512-3rUqwucgVZXTeyJyL2jqtUau8/8r54SioM1xj3AmTX3HnWQdj2AydfJ2qYYayPyIIznSplcvU9mhBb7dR2XF3w==
version "6.1.11"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"