Merge branch '1.0.x' into testing

actions/apitimelinementions.php

@@ -193,10 +193,18 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
     {
         $notices = array();
 
-        $notice = $this->user->getReplies(
+        if (empty($this->auth_user)) {
-            ($this->page - 1) * $this->count, $this->count,
+            $profile = null; 
-            $this->since_id, $this->max_id
+        } else {
-        );
+            $profile = $this->auth_user->getProfile();
+        }
+
+        $stream = new ReplyNoticeStream($this->user->id, $profile);
+
+        $notice = $stream->getNotices(($this->page - 1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
 
         while ($notice->fetch()) {
             $notices[] = clone($notice);

actions/replies.php

@@ -85,8 +85,11 @@ class RepliesAction extends OwnerDesignAction
 
         common_set_returnto($this->selfUrl());
 
-        $this->notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE,
+        $stream = new ReplyNoticeStream($this->user->id,
-             NOTICES_PER_PAGE + 1);
+                                        Profile::current());
+
+        $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE,
+                                            NOTICES_PER_PAGE + 1);
 
         if($this->page > 1 && $this->notice->N == 0){
             // TRANS: Server error when page not found (404)

plugins/MobileProfile/MobileProfilePlugin.php

@@ -339,6 +339,7 @@ class MobileProfilePlugin extends WAP20Plugin
                           $("#navtoggle").text(
                           text == "Show Navigation" ? "Hide Navigation" : "Show Navigation");
                 });
+        	    $(".checkbox-wrapper").unbind("click");
             });'
         );
     }

theme/neo/css/mp-screen.css

@@ -120,6 +120,10 @@ address img + .fn {
     color: #333;
     font-size: 1em;
     margin-bottom: 0px;
+    background: none;
+    text-transform: none;
+    letter-spacing: 0;
+    padding-bottom: 0;
 }
 
 #site_nav_local_views li {
@@ -240,6 +244,12 @@ address img + .fn {
     left: 270px;
 }
 
+.form_notice .error,
+.form_notice .success,
+.form_notice .notice-status {
+    width: 285px; 
+}
+
 
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
@@ -254,6 +264,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
     clear: left;
     float: left;
     width: 200px;
+    z-index: 2;
 }
 
 .form_notice .checkbox-wrapper {
@@ -262,7 +273,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 }
 
 .checkbox-wrapper label.checkbox {
-    display: none;
+    display: none !important;
 }
 
 .checkbox-wrapper #notice_private {
@@ -283,6 +294,10 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
     width: 300px;
 }
 
+.input_form .form_settings label {
+    display: inline;
+}
+
 .input_form .form_settings li input {
     width: 292px;
 }
@@ -295,6 +310,11 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
     display: none;
 }
 
+#event-startdate, #event-starttime, #event-enddate, #event-endtime {
+    width: 120px;
+    margin-right: 12px;
+}
+
 .input_form .form_settings .submit {
     font-size: 1em;
     margin: 10px 0;
@@ -305,7 +325,8 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice #notice_action-submit {
     text-align: center;
     left: 0px;
-    top: 192px;
+    top: 100%;
+    margin-top: -45px;
     width: 80px;
     font-size: 1em;
 }
@@ -406,8 +427,8 @@ margin-left:0 !important;
     content: '\003E';
 }
 
-.notice .addressees:empty:before {
+.notice .addressees:empty {
-    content: none;
+    display: none;
 }
 
 .user_in .notice div.entry-content {
@@ -426,6 +447,10 @@ ul.qna-dummy {
     width: 220px;
 }
 
+.threaded-replies #answer-form fieldset {
+    width: 220px;
+}
+
 .threaded-replies #qna-answer-submit {
     float: left;
     clear: left;