Merge branch '0.7.x' into 0.8.x

diff --git a/README b/README
index dcd5f6a953efc748769822d1b15d0ee64e4ab907..29a1e157ad044730a2e5b674f1c41c4b4a2fa984 100644 (file)
--- a/README
+++ b/README
@@ -1129,7 +1129,7 @@ default: nickname of a user account to automatically subscribe new
          service updates or announcements. Users are able to unsub
          if they want. Default is null; no auto subscribe.
 welcome: nickname of a user account that sends welcome messages to new
-         users. Can be the same as 'subscribe' account, although on
+         users. Can be the same as 'default' account, although on
          busy servers it may be a good idea to keep that one just for
          'urgent' messages. Default is null; no message.
 

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index b0c0a9b8dff39ecacaa7da246b4b79128bfb2670..e6f3c54db8c83c67820e8898875c4f7cd18de71d 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -139,7 +139,7 @@ class SubscriptionsList extends ProfileList
 
         $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id,
                                           'method' => 'post',
-                                          'class' => 'form_subcription_edit',
+                                          'class' => 'form_subscription_edit',
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $profile->id);

diff --git a/db/notice_source.sql b/db/notice_source.sql
index 52d555dbfe1cdc2f69c35b86fcf9382429d236d2..ac23f14aa1adc90c4f9ce3ee61d95ac93d21d45f 100644 (file)
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -14,10 +14,12 @@ VALUES
     ('Updating.Me','Updating.Me','http://updating.me/', now()),
     ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
     ('bti','bti','http://gregkh.github.com/bti/', now()),
+    ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+    ('maisha', 'Maisha', 'http://maisha.grango.org/', now()),
     ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
     ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()),
     ('moconica','Moconica','http://moconica.com/', now()),

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8ea2befb4c2bbe45f0e543269f04381d5139598a..3b4a2a4b302e39169cc63d0be72c5985003461aa 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -689,7 +689,7 @@ float:none;
 .profile .entity_profile .entity_note,
 .profile .entity_profile .entity_url,
 .profile .entity_profile .entity_tags,
-.profile .entity_profile .form_subcription_edit {
+.profile .entity_profile .form_subscription_edit {
 margin-left:59px;
 clear:none;
 display:block;
@@ -701,7 +701,7 @@ margin-right:11px;
 }
 
 
-.profile .entity_profile .form_subcription_edit label {
+.profile .entity_profile .form_subscription_edit label {
 font-weight:normal;
 margin-right:11px;
 }

diff --git a/theme/base/css/print.css b/theme/base/css/print.css
index 2da3e5e444f621bfde272bda12d74007aa95345e..d76dd608c49cebfb720834b01bc2f5d6f16f3386 100644 (file)
--- a/theme/base/css/print.css
+++ b/theme/base/css/print.css
@@ -21,7 +21,7 @@ p { orphans: 2; widows: 1; }
 .entity_actions,
 .notice-options,
 #aside_primary,
-.form_subcription_edit .submit {
+.form_subscription_edit .submit {
 display:none;
 }