From dd38fad9ee2fae3a072ce9b3043f10149f2aaef4 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 30 Sep 2017 09:44:40 -0400 Subject: [PATCH 1/4] Update administrator_guide.md --- doc/admin/administrator_guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md index e3b6190cb..2fa52c7c6 100644 --- a/doc/admin/administrator_guide.md +++ b/doc/admin/administrator_guide.md @@ -246,7 +246,7 @@ a _standard_ and _premium_ class using the following lines: App::$config['system']['default_service_class']='standard'; // this is the default service class that is attached to every new account - // configuration for parent service class + // configuration for standard service class App::$config['service_class']['standard'] = array('photo_upload_limit'=>2097152, // total photo storage limit per channel (here 2MB) 'total_identities' =>1, // number of channels an account can create @@ -256,7 +256,7 @@ a _standard_ and _premium_ class using the following lines: 'attach_upload_limit' =>2097152, // total attachment storage limit per channel (here 2MB) 'chatters_inroom' =>20); - // configuration for teacher service class + // configuration for premium service class App::$config['service_class']['premium'] = array('photo_upload_limit'=>20000000000, // total photo storage limit per channel (here 20GB) 'total_identities' =>20, // number of channels an account can create From 89457c8390fdfad1a9d687ade1c1685ab3e1c614 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Oct 2017 10:24:33 +0200 Subject: [PATCH 2/4] fix profile edit dropdown for multiple profiles --- view/tpl/profile_vcard.tpl | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index f51f0719c..0f30e5816 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -7,17 +7,15 @@ {{/if}} {{if ! $zcard}} {{if $editmenu.multi}} -
- - +
+ +
{{elseif $editmenu}} From 16b57a2b289a21fc4c59f7a96681402d7eab846f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sun, 1 Oct 2017 13:12:09 +0200 Subject: [PATCH 3/4] Fixed the Spanish translation --- view/es-es/hmessages.po | 12 ++++++------ view/es-es/hstrings.php | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 3f95bb6a7..c3a44756c 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-01 12:13+0200\n" -"PO-Revision-Date: 2017-08-02 06:49+0000\n" +"PO-Revision-Date: 2017-10-01 10:52+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -2662,7 +2662,7 @@ msgstr "Experto: puedo escribir código informático" #: ../../Zotlabs/Module/Admin/Site.php:261 msgid "Wizard - I probably know more than you do" -msgstr "Asistente: probablemente sé más que tú" +msgstr "Colaborador: probablemente sé más que tú" #: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" @@ -3238,7 +3238,7 @@ msgstr "Utilice este formulario para crear reglas de permiso para varias clases #: ../../Zotlabs/Module/Settings/Permcats.php:94 msgid "Permission Categories" -msgstr "Categorías de autorización" +msgstr "Tipos de permisos" #: ../../Zotlabs/Module/Settings/Permcats.php:102 msgid "Permission Name" @@ -3485,7 +3485,7 @@ msgstr "Categoría de los permisos del canal:" #: ../../Zotlabs/Module/Settings/Channel.php:522 msgid "Default Permissions Group" -msgstr "Grupo de permisos predeterminado" +msgstr "Grupo de permisos predeterminados" #: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Maximum private messages per day from unknown people:" @@ -4316,7 +4316,7 @@ msgstr "Ocultas" #: ../../Zotlabs/Module/Connections.php:69 #: ../../Zotlabs/Module/Connections.php:170 msgid "Archived/Unreachable" -msgstr "Archivada o inaccesible" +msgstr "Archivado o inaccesible" #: ../../Zotlabs/Module/Connections.php:74 #: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 @@ -4352,7 +4352,7 @@ msgstr "Mostrar solo conexiones ignoradas" #: ../../Zotlabs/Module/Connections.php:173 msgid "Only show archived/unreachable connections" -msgstr "Mostrar solo las conexiones archivadas o inaccesibles" +msgstr "Mostrar solo las conexiones archivadas o no localizables" #: ../../Zotlabs/Module/Connections.php:180 msgid "Only show hidden connections" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index ca809cb74..c61251da8 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -525,7 +525,7 @@ App::$strings["Novice - not skilled but willing to learn"] = "Novato: no cualifi App::$strings["Intermediate - somewhat comfortable"] = "Intermedio: bastante cómodo"; App::$strings["Advanced - very comfortable"] = "Avanzado: muy cómodo"; App::$strings["Expert - I can write computer code"] = "Experto: puedo escribir código informático"; -App::$strings["Wizard - I probably know more than you do"] = "Asistente: probablemente sé más que tú"; +App::$strings["Wizard - I probably know more than you do"] = "Colaborador: probablemente sé más que tú"; App::$strings["Site"] = "Sitio"; App::$strings["Registration"] = "Registro"; App::$strings["File upload"] = "Subir fichero"; @@ -650,7 +650,7 @@ App::$strings["Comment approved"] = "El comentario ha sido aprobado"; App::$strings["Comment deleted"] = "Se ha eliminado el comentario"; App::$strings["Permission category saved."] = "Se ha guardado la categoría del permiso."; App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones."; -App::$strings["Permission Categories"] = "Categorías de autorización"; +App::$strings["Permission Categories"] = "Tipos de permisos"; App::$strings["Permission Name"] = "Nombre de la autorización"; App::$strings["My Settings"] = "Mis ajustes"; App::$strings["inherited"] = "heredado"; @@ -703,7 +703,7 @@ App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spa App::$strings["Default Access Control List (ACL)"] = "Lista de control de acceso (ACL) por defecto"; App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"; App::$strings["Channel permissions category:"] = "Categoría de los permisos del canal:"; -App::$strings["Default Permissions Group"] = "Grupo de permisos predeterminado"; +App::$strings["Default Permissions Group"] = "Grupo de permisos predeterminados"; App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:"; App::$strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado"; App::$strings["Notification Settings"] = "Configuración de las notificaciones"; @@ -891,7 +891,7 @@ App::$strings["Connections"] = "Conexiones"; App::$strings["Blocked"] = "Bloqueadas"; App::$strings["Ignored"] = "Ignoradas"; App::$strings["Hidden"] = "Ocultas"; -App::$strings["Archived/Unreachable"] = "Archivada o inaccesible"; +App::$strings["Archived/Unreachable"] = "Archivado o inaccesible"; App::$strings["New"] = "Nuevas"; App::$strings["All"] = "Todos/as"; App::$strings["New Connections"] = "Nuevas conexiones"; @@ -899,7 +899,7 @@ App::$strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) p App::$strings["Show all connections"] = "Mostrar todas las conexiones"; App::$strings["Only show blocked connections"] = "Mostrar solo las conexiones bloqueadas"; App::$strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas"; -App::$strings["Only show archived/unreachable connections"] = "Mostrar solo las conexiones archivadas o inaccesibles"; +App::$strings["Only show archived/unreachable connections"] = "Mostrar solo las conexiones archivadas o no localizables"; App::$strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas"; App::$strings["Pending approval"] = "Pendiente de aprobación"; App::$strings["Archived"] = "Archivadas"; From 7c845aafa20ed483d29aa9d71b23922d8850824e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Oct 2017 22:46:35 +0200 Subject: [PATCH 4/4] card_edit: fix lockstate and current permissions not handed over to editor --- Zotlabs/Module/Card_edit.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php index 6927c0b6f..7cc563fd2 100644 --- a/Zotlabs/Module/Card_edit.php +++ b/Zotlabs/Module/Card_edit.php @@ -105,6 +105,8 @@ class Card_edit extends \Zotlabs\Web\Controller { 'hide_expire' => false, 'showacl' => true, 'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')), + 'permissions' => $itm[0], + 'lockstate' => (($itm[0]['allow_cid'] || $itm[0]['allow_gid'] || $itm[0]['deny_cid'] || $itm[0]['deny_gid']) ? 'lock' : 'unlock'), 'ptyp' => $itm[0]['type'], 'mimeselect' => false, 'mimetype' => $itm[0]['mimetype'],