harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
redmatrix 2015-12-05 12:48:46 -08:00
commit 10db51e6c2
7 changed files with 9865 additions and 9625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Hubzilla_on_OpenShift.bb
View File

@ -8,7 +8,7 @@ Create an account on OpenShift, then use the registration e-mail and password to
[code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password [code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password
[/code] [/code]
Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup. Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup. You MUST change server address from 127.0.0.1 to localhost.
NOTE: PostgreSQL is NOT supported by the deploy script yet, see [zrl=https://zot-mor.rhcloud.com/display/3c7035f2a6febf87057d84ea0ae511223e9b38dc27913177bc0df053edecac7c@zot-mor.rhcloud.com?zid=haakon%40zot-mor.rhcloud.com]this thread[/zrl]. NOTE: PostgreSQL is NOT supported by the deploy script yet, see [zrl=https://zot-mor.rhcloud.com/display/3c7035f2a6febf87057d84ea0ae511223e9b38dc27913177bc0df053edecac7c@zot-mor.rhcloud.com?zid=haakon%40zot-mor.rhcloud.com]this thread[/zrl].

2
include/widgets.php
View File

@ -1148,7 +1148,7 @@ function widget_forums($arr) {
foreach($r1 as $rr) { foreach($r1 as $rr) {
if($unseen && (! intval($rr['unseen']))) if($unseen && (! intval($rr['unseen'])))
continue; continue;
$o .= '<li><span class="pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>'; $o .= '<li><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>';
} }
$o .= '</ul></div>'; $o .= '</ul></div>';
} }

683
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2015-12-03.1235 2015-12-05.1237

4
view/css/mod_mail.css
View File

@ -25,6 +25,10 @@
margin: 15px; margin: 15px;
} }
#prvmail-text {
height: 20.0em;
}
.mail-conv-outside-wrapper { .mail-conv-outside-wrapper {
margin-bottom: 20px; margin-bottom: 20px;
} }

16181
view/nb-no/hmessages.po
View File

File diff suppressed because it is too large Load Diff

2616
view/nb-no/hstrings.php
View File

File diff suppressed because it is too large Load Diff