Merge branch 'stretch-stable' into stretch-unstable

This commit is contained in:
Alexandre Aubin 2020-04-09 19:10:44 +02:00
commit 9c968622a1
4 changed files with 27 additions and 1 deletions

22
debian/changelog vendored
View file

@ -1,3 +1,25 @@
yunohost-admin (3.7.1) stable; urgency=low
- [fix] Misc fixes for action / config panel (#289, #282)
- [enh] Add a note about some apps that need to be exposed to visitors for external client to work
-- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 9 April 2020 16:09:00 +0000
yunohost-admin (3.7.0.4) stable; urgency=low
- [enh] Adding easter egg for April first ;)
-- Alexandre Aubin <alex.aubin@mailoo.org> Web, 01 Apr 2020 00:55:00 +0000
yunohost-admin (3.7.0.3) stable; urgency=low
- [enh] Friendlier / more rewarding messages when everything is up to date
- [i18n] Improve translations for Bengali, Catalan, Chinese, Dutch, Esperanto, French, German, Greek, Hindi, Hungarian, Nepali, Occitan, Polish, Portuguese, Spanish, Turkish
Thanks to all contributors <3 ! (Abdulkadir F. Ş., Aeris One, amirale qt, Armando F., Gustavo M., Hem S., Jeroen F., Juan, Patrick B., Quentí, xaloc33, Yifei D.)
-- Alexandre Aubin <alex.aubin@mailoo.org> Fri, 27 Mar 2020 21:15:00 +0000
yunohost-admin (3.7.0.2) stable; urgency=low
- [fix] Disabling security.rss for now

2
debian/control vendored
View file

@ -12,7 +12,7 @@ Architecture: all
Conflicts: yunohost-apps-admin
Replaces: yunohost-apps-admin
Depends: ${misc:Depends}
, yunohost (>= 2.7.6)
, yunohost (>= 3.7)
Description: web administration interface for yunohost
YunoHost aims to make self-hosting accessible to everyone. It configures
an email, Web and IM server alongside a LDAP base. It also provides

View file

@ -130,6 +130,7 @@
"group_new": "New group",
"group_explain_all_users": "This is a special group containing all users accounts on the server",
"group_explain_visitors": "This is a special group representing anonymous visitors",
"group_explain_visitors_needed_for_external_client": "Be careful that you need to keep some applications allowed to visitors if you intend to use them with external clients. For example, this is the case for Nextcloud if you want intend to use a synchronization client on your smartphone or desktop computer.",
"group_specific_permissions": "User specific permissions",
"groups": "Groups",
"groups_and_permissions": "Groups and permissions",

View file

@ -69,6 +69,9 @@
<div class="col-sm-10">
{{#if special}}
<div style="font-style:italic"><span class="fa-info-circle"></span> {{t (concat 'group_explain_' @key)}}</div>
{{#if (eq @key 'visitors')}}
<div style="font-style:italic">{{t 'group_explain_visitors_needed_for_external_client'}}</div>
{{/if}}
{{else}}
{{> labelsLine display=../displayUser icon="user" type="member" items=members inv=membersInv group=@key}}
{{/if}}