Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

install.php

@@ -865,6 +865,19 @@ function registerInitialUser($nickname, $password, $email)
     $user->grantRole('owner');
     $user->grantRole('moderator');
     $user->grantRole('administrator');
+    
+    // Attempt to do a remote subscribe to update@status.net
+    // Will fail if instance is on a private network.
+
+    if (class_exists('Ostatus_profile')) {
+        try {
+            $oprofile = Ostatus_profile::ensureProfile('http://update.status.net/');
+            Subscription::start($user->getProfile(), $oprofile->localProfile());
+            updateStatus("Set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
+        } catch (Exception $e) {
+            updateStatus("Could not set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
+        }
+    }
 
     return true;
 }

lib/common.php

@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.0beta6+bugfix1');
+define('STATUSNET_VERSION', '0.9.0');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Stand');

plugins/OStatus/theme/base/css/ostatus.css

@@ -46,6 +46,7 @@ position:relative;
 
 .section .entity_actions {
 margin-bottom:0;
+margin-right:7px;
 }
 
 #entity_remote_subscribe .dialogbox {
@@ -70,5 +71,4 @@ background-color:transparent;
 background-position:0 -1183px;
 padding:0 0 0 23px;
 border:0;
-
 }

theme/base/css/display.css

@@ -364,15 +364,11 @@ width:100%;
 }
 
 body[id$=adminpanel] #site_nav_local_views {
-float:right;
-margin-right:18.9%;
-
-margin-right:189px;
 position:relative;
-width:14.01%;
-
-width:141px;
 z-index:9;
+float:right;
+margin-right:10.65%;
+width:22.25%;
 }
 body[id$=adminpanel] #site_nav_local_views li {
 width:100%;
@@ -381,7 +377,9 @@ margin-bottom:7px;
 }
 body[id$=adminpanel] #site_nav_local_views a {
 display:block;
-width:100%;
+width:80%;
+padding-right:10%;
+padding-left:10%;
 border-radius-toprleft:0;
 -moz-border-radius-topleft:0;
 -webkit-border-top-left-radius:0;

theme/base/css/ie.css

@@ -47,3 +47,7 @@ z-index:9999;
 .notice .thumbnail img {
 z-index:9999;
 }
+
+.form_settings fieldset fieldset legend {
+line-height:auto;
+}