wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.7.x' into 0.8.x

Browse Source
This commit is contained in:
Sarven Capadisli 2009-04-10 17:39:56 +00:00
commit c9c5ec0e4b
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -1129,7 +1129,7 @@ default: nickname of a user account to automatically subscribe new
service updates or announcements. Users are able to unsub service updates or announcements. Users are able to unsub
if they want. Default is null; no auto subscribe. if they want. Default is null; no auto subscribe.
welcome: nickname of a user account that sends welcome messages to new 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 busy servers it may be a good idea to keep that one just for
'urgent' messages. Default is null; no message. 'urgent' messages. Default is null; no message.

2
actions/subscriptions.php
View File

@ -139,7 +139,7 @@ class SubscriptionsList extends ProfileList
$this->out->elementStart('form', array('id' => 'subedit-' . $profile->id, $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id,
'method' => 'post', 'method' => 'post',
'class' => 'form_subcription_edit', 'class' => 'form_subscription_edit',
'action' => common_local_url('subedit'))); 'action' => common_local_url('subedit')));
$this->out->hidden('token', common_session_token()); $this->out->hidden('token', common_session_token());
$this->out->hidden('profile', $profile->id); $this->out->hidden('profile', $profile->id);

2
db/notice_source.sql
View File

@ -14,10 +14,12 @@ VALUES
('Updating.Me','Updating.Me','http://updating.me/', now()), ('Updating.Me','Updating.Me','http://updating.me/', now()),
('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()), ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
('bti','bti','http://gregkh.github.com/bti/', 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()), ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
('identichat','identichat','http://identichat.prosody.im/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', 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()), ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()), ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()),
('moconica','Moconica','http://moconica.com/', now()), ('moconica','Moconica','http://moconica.com/', now()),

4
theme/base/css/display.css
View File

@ -689,7 +689,7 @@ float:none;
.profile .entity_profile .entity_note, .profile .entity_profile .entity_note,
.profile .entity_profile .entity_url, .profile .entity_profile .entity_url,
.profile .entity_profile .entity_tags, .profile .entity_profile .entity_tags,
.profile .entity_profile .form_subcription_edit { .profile .entity_profile .form_subscription_edit {
margin-left:59px; margin-left:59px;
clear:none; clear:none;
display:block; 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; font-weight:normal;
margin-right:11px; margin-right:11px;
} }

2
theme/base/css/print.css
View File

@ -21,7 +21,7 @@ p { orphans: 2; widows: 1; }
.entity_actions, .entity_actions,
.notice-options, .notice-options,
#aside_primary, #aside_primary,
.form_subcription_edit .submit { .form_subscription_edit .submit {
display:none; display:none;
} }