aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-18 22:46:21 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-18 22:46:21 -0700
commit74827133b29138b9209131a0ec192cd00aff4b19 (patch)
treefae66745f0614cb913d2d85d117722987137a6d6
parent43251ed8ce8a59472686321b8faa2b352928d239 (diff)
parent7c8706757db1df0195edc64f35ca1554d04eb414 (diff)
downloadvolse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.tar.gz
volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.tar.bz2
volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: util/messages.po
-rwxr-xr-xboot.php2
-rw-r--r--install/update.php6
-rw-r--r--library/readmore.js/readmore.js2
-rw-r--r--version.inc2
-rw-r--r--view/css/conversation.css11
-rw-r--r--view/es/messages.po6
-rw-r--r--view/es/strings.php4
-rw-r--r--view/js/main.js2
8 files changed, 21 insertions, 14 deletions
diff --git a/boot.php b/boot.php
index bc8baf818..ac2a26380 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1152 );
+define ( 'DB_UPDATE_VERSION', 1153 );
/**
* @brief Constant with a HTML line break.
diff --git a/install/update.php b/install/update.php
index 339d0cb25..b84890ab2 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1152 );
+define( 'UPDATE_VERSION' , 1153 );
/**
*
@@ -1804,3 +1804,7 @@ function update_r1151() {
return UPDATE_SUCCESS;
}
+
+function update_r1152() {
+ return UPDATE_SUCCESS;
+}
diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js
index e790ceb76..d4c1cf723 100644
--- a/library/readmore.js/readmore.js
+++ b/library/readmore.js/readmore.js
@@ -62,7 +62,7 @@
function setBoxHeights(element) {
var el = element,
- expandedHeight = el.outerHeight(),
+ expandedHeight = el.outerHeight(true),
cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10),
defaultHeight = element.data('defaultHeight');
diff --git a/version.inc b/version.inc
index e008faecc..2d7153d51 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-16.1157
+2015-09-18.1159
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 7d4930aac..e409cf4cf 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -122,12 +122,15 @@ a.wall-item-name-link {
overflow: auto;
}
-.wall-item-content h1, .wall-item-content h2 {
- font-size: 1.319em;
+.wall-item-content h1,
+.wall-item-content h2 {
+ font-size: 1.319em;
}
-.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
- font-size: 1.112em;
+.wall-item-title h3,
+.wall-item-content h3,
+.wall-item-content h4 {
+ font-size: 1.112em;
}
.wall-item-content img {
diff --git a/view/es/messages.po b/view/es/messages.po
index 0272811eb..bb0ba9839 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-11 00:05-0700\n"
-"PO-Revision-Date: 2015-09-14 11:47+0000\n"
+"PO-Revision-Date: 2015-09-14 18:21+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
"Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -2507,7 +2507,7 @@ msgstr "Privado"
#: ../../include/permissions.php:894
msgid "Community Forum"
-msgstr "Foro de la comunidad"
+msgstr "Foro de discusión"
#: ../../include/permissions.php:895
msgid "Feed Republish"
@@ -8604,7 +8604,7 @@ msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
msgid ""
"Please choose a channel type (such as social networking or community forum) "
"and privacy requirements so we can select the best permissions for you"
-msgstr "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
+msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
#: ../../mod/new_channel.php:119
msgid "Channel Type"
diff --git a/view/es/strings.php b/view/es/strings.php
index 749562004..1d91ed820 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -579,7 +579,7 @@ $a->strings["Social Networking"] = "Redes sociales";
$a->strings["Mostly Public"] = "Público en su mayor parte";
$a->strings["Restricted"] = "Restringido";
$a->strings["Private"] = "Privado";
-$a->strings["Community Forum"] = "Foro de la comunidad";
+$a->strings["Community Forum"] = "Foro de discusión";
$a->strings["Feed Republish"] = "Republicar un \"feed\"";
$a->strings["Special Purpose"] = "Propósito especial";
$a->strings["Celebrity/Soapbox"] = "Página para fans";
@@ -2031,7 +2031,7 @@ $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"A
$a->strings["Choose a short nickname"] = "Elija un alias corto";
$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros.";
$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "O <a href=\"import\">importar un canal existente</a> de otro lugar";
-$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
+$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
$a->strings["Channel Type"] = "Tipo de canal";
$a->strings["Read more about roles"] = "Leer más sobre los roles";
$a->strings["App installed."] = "Aplicación instalada.";
diff --git a/view/js/main.js b/view/js/main.js
index 77184465d..d3c7175d0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -615,7 +615,7 @@ function updateConvItems(mode,data) {
function collapseHeight() {
- $(".wall-item-body, .directory-collapse").each(function() {
+ $(".wall-item-content, .directory-collapse").each(function() {
var orgHeight = $(this).height();
if(orgHeight > divmore_height + 10) {
if(! $(this).hasClass('divmore')) {