Merge branch 'unstable' into stretch-unstable

Conflicts:
	debian/changelog

README.md

@@ -10,7 +10,7 @@ A simple LDAP SSO for nginx, written in Lua
 Issues
 ------
 
-- [Please report issues on YunoHost bugtracker](https://dev.yunohost.org/projects/yunohost/issues) (no registration needed).
+- [Please report issues on YunoHost bugtracker](https://github.com/YunoHost/issues).
 
 Requirements
 ------------

debian/changelog

@@ -3,6 +3,19 @@ ssowat (3.0.0~beta1) testing; urgency=low
   Beta release for Stretch
 
  -- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 03 May 2018 03:04:45 +0000
+ssowat (2.7.14) stable; urgency=low
+
+  * Make tile dragging work on mobile devices
+  * Improve Occitan and Portuguese translations
+  * Releasing as stable
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 17 Jun 2018 01:53:11 +0000
+
+ssowat (2.7.12) stable; urgency=low
+
+  * Bumping version number for stable release
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 06 May 2018 16:53:24 +0000
 
 ssowat (2.7.11) testing; urgency=low
 

portal/assets/js/ynhpanel.js

@@ -122,33 +122,53 @@ var dragg = function(id) {
   this.x_pos = 0, this.y_pos = 0, // Stores x & y coordinates of the mouse pointer
   this.x_elem = 0, this.y_elem = 0; // Stores top, left values (edge) of the element
 
-  // Start dragging
+  var _initDrag = function(e){
-  window.addEvent(elem, 'mousedown', function(e){
     // Prevent firefox native D'n'D behavior
     window.eventPreventDefault(e);
 
+    if (e.type === "touchstart"){
+      x_pos = e.touches[0].clientX;
+      y_pos = e.touches[0].clientY;
+    }
+
     selected = elem;
     x_elem = x_pos - selected.offsetLeft;
     y_elem = y_pos - selected.offsetTop;
-  });
+  };
 
-  // Will be called when user dragging an element
+  var _shutDrag = function(e){
-  window.addEvent(window, 'mousemove', function(e){
+      selected = null;
+  };
+
+  var _onMove = function(e){
     // Get position
-    x_pos = document.all ? window.event.clientX : e.pageX;
+    x_pos = document.all ? window.event: e.pageX;
-    y_pos = document.all ? window.event.clientY : e.pageY;
+    y_pos = document.all ? window.event : e.pageY;
+
+    if (e.type === "touchmove"){
+        x_pos = e.touches[0].clientX;
+        y_pos = e.touches[0].clientY;
+    }
 
     if (selected !== null) {
       dragged = true;
       selected.style.left = (x_pos - x_elem) + 'px';
       selected.style.top = (y_pos - y_elem) + 'px';
     }
-  });
+  };
+
+  // Start dragging
+  window.addEvent(elem, 'mousedown', _initDrag);
+  window.addEvent(elem, 'touchstart', _initDrag);
+
+  // Will be called when user dragging an element
+  window.addEvent(window, 'mousemove', _onMove);
+  window.addEvent(window, 'touchmove', _onMove);
 
   // Destroy the object when we are done
-  window.addEvent(window, 'mouseup', function(e){
+  window.addEvent(window, 'mouseup', _shutDrag);
-      selected = null;
+  window.addEvent(window, 'touchend', _shutDrag);
-  });
+  window.addEvent(window, 'touchcancel', _shutDrag);
 
   // Handle click event
   window.addEvent(elem, 'click', function(e){

portal/locales/oc.json

@@ -0,0 +1,43 @@
+{
+    "portal": "Portal YunoHost",
+    "information": "Vòstras informacions",
+    "username": "Nom d’utilizaire",
+    "password": "Senhal",
+    "fullname": "Nom complèt",
+    "mail_addresses": "Adreça de corrièl",
+    "mail_forward": "Adreças de transferiment",
+    "new_mail": "novela_adreça@domeni.org",
+    "new_forward": "novel_transferiment@domenialonhat.org",
+    "add_mail": "Ajustar una adreça de corrièl",
+    "add_forward": "Ajustar una adreça de transferiment",
+    "ok": "OK",
+    "cancel": "Anullar",
+    "change_password": "Cambiar lo senhal",
+    "edit": "Editar",
+    "current_password": "Senhal actual",
+    "new_password": "Nòu senhal",
+    "confirm": "Confirmar",
+    "login": "Connexion",
+    "logout": "Desconnexion",
+    "password_changed": "Senhal modificat",
+    "password_changed_error": "Una error s’es producha en cambiar lo senhal",
+    "password_not_match": "Los nòus senhals correspondon pas",
+    "wrong_current_password": "Lo senhal actual es incorrècte",
+    "invalid_mail": "Adreça de corrièl invalida",
+    "invalid_domain": "Nom de domeni invalid dins",
+    "invalid_mailforward": "Adreça de transferiment invalida",
+    "mail_already_used": "Adreça ja utilizada :",
+    "information_updated": "Informacions actualizadas",
+    "user_saving_fail": "Una error s’es producha en enregistrar los cambiaments",
+    "missing_required_fields": "Camps requesits mancants",
+    "wrong_username_password": "Nom d’utilizaire o senhal incorrècte",
+    "logged_out": "Desconnectat",
+    "please_login": "Mercé de vos identificar per accedir a la pagina",
+    "please_login_from_portal": "Mercés de vos identificar dins del portal",
+    "redirection_error_invalid_url": "Error de redireccion : url invalida",
+    "redirection_error_unmanaged_domain": "Error de redireccion : domeni pas gerit",
+    "footerlink_edit": "Editar lo perfil",
+    "footerlink_documentation": "Documentacion",
+    "footerlink_support": "Assisténcia",
+    "footerlink_administration": "Administracion"
+}

portal/locales/pt.json

@@ -11,7 +11,7 @@
     "footerlink_edit": "Editar o meu perfil",
     "footerlink_support": "Suporte",
     "fullname": "Nome completo",
-    "information": "Informação pessoal",
+    "information": "Suas informações",
     "information_updated": "Informação atualizada",
     "invalid_domain": "Domínio inválido em",
     "invalid_mail": "Endereço de correio inválido",
@@ -37,5 +37,7 @@
     "user_saving_fail": "Um erro ocorreu ao guardar as modificações do utilizador",
     "username": "Nome de utilizador",
     "wrong_current_password": "Senha atual está errada",
-    "wrong_username_password": "Nome de utilizador e senha errados"
+    "wrong_username_password": "Nome de utilizador e senha errados",
+    "redirection_error_invalid_url": "Erro de redirecionamento: url inválida",
+    "redirection_error_unmanaged_domain": "Erro de redirecionamento: Dominio não gerenciado"
 }