wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into nightly

Browse Source 
Some merge requests that were aimed at master
This commit is contained in:
Mikael Nordfeldth 2015-11-05 16:07:05 +01:00
commit c950f18546
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UPGRADE
View File

@ -27,13 +27,13 @@ and follow this procedure:
The upgrade script will likely take a long time because it will The upgrade script will likely take a long time because it will
upgrade the tables to another character encoding and make other upgrade the tables to another character encoding and make other
automated upgrades. Make sure it ends without errors. If you get automated upgrades. Make sure it ends without errors. If you get
errors, create a new task on https://bugz.foocorp.net/ errors, create a new task on https://git.gnu.io/gnu/gnu-social/issues
4. Start your queue daemons again (you can run this command even if you 4. Start your queue daemons again (you can run this command even if you
do not use the queue daemons): do not use the queue daemons):
$ bash scripts/startdaemons.sh $ bash scripts/startdaemons.sh
5. Report any issues at https://bugz.foocorp.net/ (tag GNU social) 5. Report any issues at https://git.gnu.io/gnu/gnu-social/issues
If you are using ssh keys to log in to your server, you can make this If you are using ssh keys to log in to your server, you can make this
procedure pretty painless (assuming you have automated backups already). procedure pretty painless (assuming you have automated backups already).
@ -69,7 +69,7 @@ variant of this command (you will be prompted for the database password):
2. Unpack your GNU social code to a fresh directory. You can do this 2. Unpack your GNU social code to a fresh directory. You can do this
by cloning our git repository: by cloning our git repository:
$ git clone https://gitorious.org/social/mainline.git gnusocial $ git clone https://git.gnu.io/gnu/gnu-social.git gnusocial
3. Synchronize your local files to the GNU social directory. These 3. Synchronize your local files to the GNU social directory. These
will be the local files such as avatars, config and files: will be the local files such as avatars, config and files:
@ -91,8 +91,8 @@ variant of this command (you will be prompted for the database password):
The upgrade script will likely take a long time because it will The upgrade script will likely take a long time because it will
upgrade the tables to another character encoding and make other upgrade the tables to another character encoding and make other
automated upgrades. Make sure it ends without errors. If you get automated upgrades. Make sure it ends without errors. If you get
errors, create a new task on https://bugz.foocorp.net/ errors, create a new task on https://git.gnu.io/gnu/gnu-social/issues
6. Start your queue daemons: 'bash scripts/startdaemons.sh' 6. Start your queue daemons: 'bash scripts/startdaemons.sh'
7. Report any issues at https://bugz.foocorp.net/ (tag GNU social) 7. Report any issues at https://git.gnu.io/gnu/gnu-social/issues

2
lib/activityobject.php
View File

@ -298,7 +298,7 @@ class ActivityObject
if (!empty($guidEl)) { if (!empty($guidEl)) {
$this->id = $guidEl->textContent; $this->id = $guidEl->textContent;
if ($guidEl->hasAttribute('isPermaLink')) { if ($guidEl->hasAttribute('isPermaLink') && $guidEl->getAttribute('isPermaLink') != 'false') {
// overwrites <link> // overwrites <link>
$this->link = $this->id; $this->link = $this->id;
} }

3
lib/noticelistitem.php
View File

@ -235,8 +235,9 @@ class NoticeListItem extends Widget
function showAuthor() function showAuthor()
{ {
$attrs = array('href' => $this->profile->profileurl, $attrs = array('href' => $this->profile->profileurl,
'class' => 'h-card p-author', 'class' => 'h-card',
'title' => $this->profile->getNickname()); 'title' => $this->profile->getNickname());
if(empty($this->repeat)) { $attrs['class'] .= ' p-author'; }
if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) { if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) {
$this->out->elementStart('a', $attrs); $this->out->elementStart('a', $attrs);

2
plugins/OStatus/classes/FeedSub.php
View File

@ -355,7 +355,7 @@ class FeedSub extends Managed_DataObject
$response = $client->post($hub, $headers, $post); $response = $client->post($hub, $headers, $post);
$status = $response->getStatus(); $status = $response->getStatus();
// PuSH specificed response status code // PuSH specificed response status code
if ($status == 202) { if ($status == 202 || $status == 204) {
common_log(LOG_INFO, __METHOD__ . ': sub req ok, awaiting verification callback'); common_log(LOG_INFO, __METHOD__ . ': sub req ok, awaiting verification callback');
return; return;
} else if ($status >= 200 && $status < 300) { } else if ($status >= 200 && $status < 300) {

4
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -828,11 +828,13 @@ class Ostatus_profile extends Managed_DataObject
} }
} }
$obj = ActivityUtils::getFeedAuthor($feedEl);
// @todo FIXME: We should check whether this feed has elements // @todo FIXME: We should check whether this feed has elements
// with different <author> or <dc:creator> elements, and... I dunno. // with different <author> or <dc:creator> elements, and... I dunno.
// Do something about that. // Do something about that.
$obj = ActivityObject::fromRssChannel($feedEl); if(empty($obj)) { $obj = ActivityObject::fromRssChannel($feedEl); }
return self::ensureActivityObjectProfile($obj, $hints); return self::ensureActivityObjectProfile($obj, $hints);
} }

2
plugins/Share/SharePlugin.php
View File

@ -199,7 +199,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
'class' => 'h-card p-author', 'class' => 'h-card p-author',
'title' => $repeater->getFancyName()); 'title' => $repeater->getFancyName());
$nli->out->elementStart('span', 'repeat h-entry'); $nli->out->elementStart('span', 'repeat');
// TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname. // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
$nli->out->raw(_('Repeated by').' '); $nli->out->raw(_('Repeated by').' ');