Merge branch '1.0.x' into testing

Conflicts:
	plugins/Event/RSVP.php

diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 65ff9ae59a8cf2637a01ddecc7aeed51bf12ec31..51c3df1b2f7e128cc8ee7d2f8bfe647f16288c7a 100644 (file)
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -89,7 +89,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
         $taguribase = TagURI::base();
         $id         = "tag:$taguribase:Groups";
         $link       = common_local_url('groups');
-        // TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
+        // TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.
         $subtitle   = sprintf(_("groups on %s"), $sitename);
 
         switch($this->format) {

diff --git a/lib/framework.php b/lib/framework.php
index d85b99f5c87282a08acba33c028358d213818b60..ab163db06db3c02810f5b4024dea4b96f2faafc0 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -20,7 +20,7 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('STATUSNET_BASE_VERSION', '1.0.0');
-define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
 
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility

diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php
index 8803c0118b89ff20d12d27aac6af9b6203dfb8d3..a08d837993df35e3746c60cd670bc86213d0bc5c 100644 (file)
--- a/plugins/OStatus/scripts/resub-feed.php
+++ b/plugins/OStatus/scripts/resub-feed.php
@@ -20,11 +20,17 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
+$longoptions = array('unsub');
+$shortoptions = 'u';
+
 $helptext = <<<END_OF_HELP
 resub-feed.php [options] http://example.com/atom-feed-url
 Reinitialize the PuSH subscription for the given feed. This may help get
 things restarted if we and the hub have gotten our states out of sync.
 
+Options:
+
+   -u --unsub  Unsubscribe instead of subscribing.
 
 END_OF_HELP;
 
@@ -48,8 +54,14 @@ print "Old state:\n";
 showSub($sub);
 
 print "\n";
-print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
-$ok = $sub->subscribe();
+
+if (have_option('u') || have_option('--unsub')) {
+    print "Pinging hub $sub->huburi with unsubscription for $sub->uri\n";
+    $ok = $sub->unsubscribe();
+} else {
+    print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
+    $ok = $sub->subscribe();
+}
 
 if ($ok) {
     print "ok\n";