From 6afda46402694e42b0c2e6dfbcfcb2a17a60b2b0 Mon Sep 17 00:00:00 2001 From: CiaranG Date: Thu, 9 Apr 2009 18:29:31 +0100 Subject: [PATCH 1/4] Corrected error in README relating to ['newuser']['welcome'] --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index f18d9c7c16..09d9d301c5 100644 --- a/README +++ b/README @@ -1125,7 +1125,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. From 6cdc2ff444b8c76a3cdc5b8c6e9e7e7539d9b6cc Mon Sep 17 00:00:00 2001 From: Meitar Moscovitz Date: Thu, 9 Apr 2009 13:52:39 -0400 Subject: [PATCH 2/4] Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS. --- actions/subscriptions.php | 2 +- theme/base/css/display.css | 4 ++-- theme/base/css/print.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actions/subscriptions.php b/actions/subscriptions.php index b0c0a9b8df..e6f3c54db8 100644 --- 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/theme/base/css/display.css b/theme/base/css/display.css index 8ea2befb4c..3b4a2a4b30 100644 --- 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 2da3e5e444..d76dd608c4 100644 --- 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; } From 08c08d02aa48e492eb40ad3790e4fb05c2b86a91 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 10 Apr 2009 10:47:53 -0400 Subject: [PATCH 3/4] Added maisha to notice_source --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index 52d555dbfe..76aadc6733 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -18,6 +18,7 @@ VALUES ('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()), From fba02499327aa18083b590cf38ee6e144be06a6f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 10 Apr 2009 11:36:46 -0400 Subject: [PATCH 4/4] add cliqset --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index 76aadc6733..ac23f14aa1 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -14,6 +14,7 @@ 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()),