diff --git a/boot.php b/boot.php index c604e4f77..bc6f77dc6 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1194' ); +define ( 'FRIENDICA_VERSION', '2.3.1195' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1111 ); diff --git a/js/main.js b/js/main.js index 65d05e58a..071acb777 100644 --- a/js/main.js +++ b/js/main.js @@ -257,11 +257,13 @@ $('.wall-item-outside-wrapper',data).each(function() { var ident = $(this).attr('id'); // If not on page 1, only add new conversation items to existing conversations on this page - if($('#' + ident).length == 0 && (profile_page == 1 || prev != 'live-' + src)) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - $('#' + prev).after($(this)); + if($('#' + ident).length == 0) { + if(profile_page == 1 || prev != 'live-' + src) { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); + }); + $('#' + prev).after($(this)); + } } else { $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); diff --git a/mod/admin.php b/mod/admin.php index 8ca89900c..e44404097 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1,7 +1,7 @@ logoFriendika'; + $banner = 'logoFriendica'; $banner = htmlspecialchars($banner); //echo "
"; var_dump($lang_choices); die("
"); @@ -325,7 +325,7 @@ function admin_page_site(&$a) { '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."), '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."), - '$dfrn_only' => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), @@ -657,7 +657,7 @@ function admin_page_logs(&$a){ // name, label, value, help string, extra data... '$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendika index.php.")), + '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), )); } diff --git a/mod/newmember.php b/mod/newmember.php index fc53e7112..60ca49757 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -3,7 +3,7 @@ function newmember_content(&$a) { - $o = '

' . t('Welcome to Friendika') . '

'; + $o = '

' . t('Welcome to Friendica') . '

'; $o .= '

' . t('New Member Checklist') . '

'; @@ -25,13 +25,13 @@ function newmember_content(&$a) { $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); if(! $mail_disabled) - $o .= '
  • ' . '' . t('Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '
    • ' . EOL; + $o .= '
  • ' . '' . t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '
    • ' . EOL; $o .= '
  • ' . '' . t('Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '
    • ' . EOL; $o .= '
  • ' . '' . t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.') . '
    • ' . EOL; - $o .= '
  • ' . '' . t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Connect dialog.') . '
    • ' . EOL; + $o .= '
  • ' . '' . t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog.') . '
    • ' . EOL; $o .= '
  • ' . '' . t('The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested.') . '
    • ' . EOL;