Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cdujeu committed Jan 12, 2016
2 parents 54a4c15 + f639eab commit 474d78a
Show file tree
Hide file tree
Showing 27 changed files with 1,517 additions and 740 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
@@ -1,9 +1,10 @@
language: php

php:
- 5.3
- 5.4
- 5.5

- 5.6
- 7.0

script:
- dist/scripts/tests/syntax.sh
2 changes: 1 addition & 1 deletion core/src/core/tests/test.PHP_OB.php
Expand Up @@ -22,7 +22,7 @@
require_once('../classes/class.AbstractTest.php');

/**
* Check that DOMXml is enabled
* Check that output buffering is enabled
* @package AjaXplorer
* @subpackage Tests
*/
Expand Down
50 changes: 50 additions & 0 deletions core/src/core/tests/test.PHP_file_uploads.php
@@ -0,0 +1,50 @@
<?php
/*
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
* This file is part of Pydio.
*
* Pydio is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Pydio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
*
* The latest code can be found at <http://pyd.io/>.
*/
defined('AJXP_EXEC') or die( 'Access not allowed');
require_once('../classes/class.AbstractTest.php');

/**
* Check that file uploads is enabled
* @package AjaXplorer
* @subpackage Tests
*/
class PHP_file_uploads extends AbstractTest
{
protected static $testKey = 'PHP File Uploads enabled';

public function __construct() { parent::__construct(self::$testKey, "You should enable php file_uploads parameter for uploading files with Pydio."); }
public function doTest()
{
$this->failedLevel = "warning";
$v = @ini_get("file_uploads");
if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
$this->failedInfo = "PHP File Uploads is enabled";
$this->testedParams[self::$testKey] = "Yes";
return TRUE;
} else if (!isSet($v)) {
$this->failedInfo = "Unable to detect the file_uploads value, please make sure that it is disabled (Off) in your php.ini or your virtual host.";
return FALSE;
}
$this->failedInfo = "PHP File Uploads is disabled";
$this->testedParams[self::$testKey] = "Yes";
return false;
}
}
87 changes: 87 additions & 0 deletions core/src/plugins/access.ajxp_home/i18n/ca.php
@@ -0,0 +1,87 @@
<?php
/*
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
* This file is part of Pydio.
*
* Pydio is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Pydio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
*
* The latest code can be found at <http://pyd.io/>.
*/
// catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015


$mess=array(
"title"=> "Inici",
"desc" => "Pàgina de benvinguda",
"39"=> "Seleccioneu un repositori",
"40"=> "Benvingut/da, %s",
"41"=> "Utilitza aquest repositori per defecte",
"42"=> "Entrar",
"43"=> "El meu perfil",
"43t"=> "Totes les meves dades personals",
"44"=> "El meu compte",
"45"=> "Dades personals",
"46"=> "Llibreta d'adreces",
"47"=> "Usuaris i equips que ha creat",
"48"=> "Els meus usuaris",
"49"=> "Usuaris externs que ha creat",
"50"=> "Els meus equips",
"51"=> "Equips d'usuaris, emprats com accessos directes a compartir",
"52"=> "Esteu segur que voleu suprimir aquest equip? Aquesta acció no eliminarà cap usuari.",
"53"=> "Començant",
"54"=> "Comenceu amb APPLICATION_TITLE seguint aquests vídeos How-to",
"55"=> "Necessita ajuda per <a> començar? </a>",
"56"=> "Primeres passes amb APPLICATION_TITLE? Aquí té alguns vídeos!",
"57"=> "Descarregar APPLICATION_TITLE per...",
"58"=> "Dispositiu Android",
"59"=> "iPhone/iPad",
"60"=>"Mac OS (Beta)",
"61"=>"Windows (Beta)",
"62"=>"<h2>Començant</h2>
Aquest vídeo és una introducció a l'aplicació web APPLICATION_TITLE :
<ul>
<li>Quadre de comandaments de l'usuari</li>
<li>Descripció de la interfície gràfica</li>
<li>Administrar fitxers i carpetes</li>
<li>Previsualitzant i editant fitxers</li>
<li>Accés ràpid mitjançant marcadors i motor de cerca</li>
<li>Cistella de selecció</li>
</ul>",
"63"=>"<h2>Compartint fitxers usant APPLICATION_TITLE</h2>
En aquest tutorial anem a cobrir els punts bàsics per a l'intercanvi de fitxers amb APPLICATION_TITLE:
<ul>
<li>Crear enllaços web</li>
<li>Enviar-los a usuaris interns o externs</li>
<li>Obtenir notificacions quan un enllaç ha estat descarregat</li>
<li>Crear un enllaç amb protecció per contrasenya</li>
<li>Crear més d'un enllaç per a un sol fitxer</li>
<li>Aturar completament la compartició d'un fitxer</li>
</ul>",
"64"=>"<h2>Compartint carpetes usant APPLICATION_TITLE</h2>
Aquest vídeo mostra les diverses maneres de compartir carpetes a APPLICATION_TITLE
<ul>
<li>Compartir com un nou repositori</li>
<li>Compartir com un minilloc públic</li>
</ul>",
"65"=> "Descobreix més al canal de APPLICATION_TITLE!",
"66"=>"<h2>Usar APPLICATION_TITLE a dispositius iOS</h2>
Aquest vídeo mostra com utilitzar l'aplicació APPLICATION TITLE (disponible a l'App Store). El procés és bastant similar a Android.
<ul><li>Configurar la connexió al servidor</li>
<li>Navegar a través dels fitxers</li>
<li>Mantenir els arxius fora de línia i la interacció amb aplicacions externes</li>
<li>Protegint l'aplicació mitjançant un codi PIN</li>
<li>Usant marcadors i el motor de cerca</li></ul>",
"67"=> "No sou %s? %logout",

);
116 changes: 59 additions & 57 deletions core/src/plugins/access.ajxp_home/i18n/es.php
Expand Up @@ -20,67 +20,69 @@
*/
// spanish translation: Ion Rey Bakaikoa <ionrei@gmail.com>, 2010
// spanish corrections: Cristóbal Sabroe Yde <cristyde at gmail.com>, 2010
// spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2015
$mess=array(
"title"=> "Home",
"desc" => "Welcome page",
"39"=> "Select a workspace",
"40"=> "Welcome, %s",
"41"=> "Use this workspace as default",
"42"=> "Enter",
"43"=> "My Profile",
"43t"=> "All my personal data",
"44"=> "My Account",
"45"=> "Personal data",
"46"=> "Address Book",
"47"=> "Users and teams that you created",
"48"=> "My Users",
"49"=> "External users that you created",
"50"=> "My Teams",
"51"=> "Teams of users, used as shortcuts when sharing",
"52"=> "Are you sure you want to delete this team? This will not remove any users.",
"53"=> "Getting Started",
"54"=> "Get started with APPLICATION_TITLE by following How-to videos",
"55"=> "Do you need help <a>to get started?</a>",
"56"=> "Getting started with APPLICATION_TITLE? Here are some videos for you!",
"57"=> "Download APPLICATION_TITLE for...",
"58"=> "Android device",
"title"=> "Inicio",
"desc" => "Página de bienvenida",
"39"=> "Seleccione un repositorio",
"40"=> "Bienvenido/a, %s",
"41"=> "Usar este repositorio por defecto",
"42"=> "Entrar",
"43"=> "Mi perfil",
"43t"=> "Todos mis datos personales",
"44"=> "Mi cuenta",
"45"=> "Datos personales",
"46"=> "Libreta de direcciones",
"47"=> "Usuarios y equipos que ha creado",
"48"=> "Mis usuarios",
"49"=> "Usuarios externos que ha creado",
"50"=> "Mis equipos",
"51"=> "Equipos de usuarios, usados como accesos directos al compartir",
"52"=> "¿Está seguro de que desea eliminar este equipo? Esta acción no eliminará ningún usuario.",
"53"=> "Empezando",
"54"=> "Comience con APPLICATION_TITLE siguiendo estos videos How-to",
"55"=> "¿Necesita ayuda para <a>empezar?</a>",
"56"=> "¿Primeros pasos con APPLICATION_TITLE? ¡Aquí tiene algunos videos!",
"57"=> "Descargar APPLICATION_TITLE para...",
"58"=> "Dispositivo Android",
"59"=> "iPhone/iPad",
"60"=>"Mac OS",
"61"=>"Windows",
"62"=>"<h2>Getting started</h2>
This video is an introduction to APPLICATION_TITLE web application:
"60"=>"Mac OS (Beta)",
"61"=>"Windows (Beta)",
"62"=>"<h2>Empezando</h2>
Este video es una introducción a la aplicación web APPLICATION_TITLE :
<ul>
<li>User Dashboard</li>
<li>GUI Overview</li>
<li>Managing files and folders</li>
<li>Previewing and editing files</li>
<li>Quick access through bookmarks and search engine</li>
<li>Selection cart</li>
<li>Cuadro de mandos del usuario</li>
<li>Descripción del interfaz gráfico</li>
<li>Administrando ficheros y carpetas</li>
<li>Previsualizando y editando ficheros</li>
<li>Acceso rápido mediante marcadores y motor de búsqueda</li>
<li>Cesta de selección</li>
</ul>",
"63"=>"<h2>Sharing files with APPLICATION_TITLE</h2>
In this tutorial, we will cover the basics of file sharing with APPLICATION_TITLE:
<ul>
<li>Create web links</li>
<li>Send them to internal or external users</li>
<li>Get notified that a link was downloaded</li>
<li>Create a password-protected link</li>
<li>Create many links on one file</li>
<li>Stop sharing a file totally</li>
</ul>",
"64"=>"<h2>Sharing folders with APPLICATION_TITLE</h2>
This video covers the various options to share folders in APPLICATION_TITLE
<ul>
<li>Share as new workspace</li>
<li>Share as a public minisite</li>
"63"=>"<h2>Compartiendo ficheros usando APPLICATION_TITLE</h2>
En este tutorial vamos a cubrir los puntos básicos para el intercambio de ficheros con APPLICATION_TITLE:
<ul>
<li>Crear enlaces web</li>
<li>Enviarlos a usuarios internos o externos</li>
<li>Obtener notificaciones cuando un enlace ha sido descargado</li>
<li>Crear un enlace con protección por contraseña</li>
<li>Crear más de un enlace para un solo archivo</li>
<li>Detener completamente la compartición de un fichero</li>
</ul>",
"64"=>"<h2>Compartiendo carpetas usando APPLICATION_TITLE</h2>
Este video muestra las diversas maneras de compartir carpetas en APPLICATION_TITLE
<ul>
<li>Compartir como un nuevo repositorio</li>
<li>Compartir como un minisitio público</li>
</ul>",
"65"=> "Discover more on the APPLICATION_TITLE channel!",
"66"=>"<h2>Using APPLICATION_TITLE on iOS device</h2>
This video explains how to use the APPLICATION_TITLE application (available on the App Store). Process is quite similar on Android as well.
<ul><li>Setup the server connection</li>
<li>Navigating through the files</li>
<li>Keeping files offline and interacting with external applications</li>
<li>Protecting the app with a PIN-code</li>
<li>Using bookmarks and search engine</li></ul>",
"67"=> "You are not %s, %logout",
"65"=> "¡Descubre más en el canal de APPLICATION_TITLE!",
"66"=>"<h2>Usar APPLICATION_TITLE en dispositivos iOS</h2>
Este video muestra como usar la aplicación APPLICATION_TITLE (disponible en el App Store). El proceso es bastante similar en Android.
<ul>
<li>Configurar la conexión del servidor</li>
<li>Navegar a través de los ficheros</li>
<li>Mantener los archivos fuera de línea y la interacción con aplicaciones externas</li>
<li>Protegiendo la aplicación mediante un código PIN</li>
<li>Usando marcadores y el motor de búsqueda</li></ul>",
"67"=> "¿No eres %s? %logout",

);
56 changes: 56 additions & 0 deletions core/src/plugins/access.ajxp_shared/i18n/ca.php
@@ -0,0 +1,56 @@
<?php
/*
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
* This file is part of Pydio.
*
* Pydio is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Pydio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
*
* The latest code can be found at <http://pyd.io/>.
*/
// catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
$mess=array(
"1" => "Usuaris compartits",
"2" => "Repositoris compartits",
"3" => "Arxius públics",
"4" => "Ruta de l'arxiu",
"5" => "Repositori",
"6" => "Contrasenya",
"7" => "Caduca",
"8" => "Elements",
"9" => "Usuaris associats",
"10"=> "Repositoris associats",
"11"=> "Està segur de que desitja esborrar els elements seleccionats?",
"12"=> "No té permís per esborrar aquest element.",
"13"=> "S'ha esborrat l'arxiu públic.",
"14"=> "Integritat",
"15"=> "Ok",
"16"=> "Trencat",
"17"=> "Descarrega l'URL",
"18"=> "Copia l'URL",
"19"=> "Copia l'URL per enviar correu electrònic.",
"20"=> "Descàrregues",
"21"=> "Si",
"22"=> "No",
"23"=> "S'han esborrat %s arxius.",
"24"=> "Res per esborrar.",
"25"=> "Netejar caducats",
"26"=> "Esborra arxius caducats.",
"27"=> "Propietari",
"28"=> "Arxius compartits per descàrregues directes, amb o sense contrasenya.",
"29"=> "Repositoris delegats creats per usuaris.",
"30"=> "Usuaris creats per accedir a repositoris delegats.",
"31"=> "Descripció",
"32"=> "Resetejar",
"33"=> "Resetejar el comptador de descàrregues",
);
24 changes: 24 additions & 0 deletions core/src/plugins/access.ajxp_shared/i18n/conf/cs.php
@@ -0,0 +1,24 @@
<?php
/*
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
* This file is part of Pydio.
*
* Pydio is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Pydio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
*
* The latest code can be found at <http://pyd.io/>.
*/
$mess=array(
"Shared Elements (deprecated)" => "Sdílené položky (zastaralé)",
"Browse user shared elements. Replaced by User Dashboard" => "Procházet položky sdílené uživatelem. Nahrazeno dashboardem uživatele",
);

0 comments on commit 474d78a

Please sign in to comment.