From: Zach Copley Date: Wed, 26 Jan 2011 18:50:05 +0000 (-0800) Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c0bb1a57984266024e8e5a968c0f3a3b54befff6;hp=621a7cb36df9e3962aac7b473478c634e97e70e1;p=quix0rs-gnu-social.git Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x * '0.9.x' of gitorious.org:statusnet/mainline: (102 commits) Fix for ticket #3010: blocks are now applied against the original poster of repeats. Fix XML API output for several profile update methods that returned a entry but didn't set namespaces, causing XML parse failures. Fix for ticket #3007: .bmp avatar uploads weren't being properly converted to PNG in all cases Bookmark saving robustness fixes remove boilerplate from NewMenuPlugin Localisation updates from http://translatewiki.net. L10n consistency updates in wording and punctuation. Translator documentation added/updated. Superfluous whitespace removed. Add translator documentation Fix L10n issues Remove superfluous whitespace Add correct punctuation for client exceptions. Add correct punctuation for client exception. Add correct punctuation for client exception. Add email field to Twitter registration form; needed when RequireValidatedEmail plugin is present. Add email field on openid registration; needed to register if RequireValidatedEmail plugin is also present. Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms) Event hook points needed to run Recaptcha on Twitter registration Fix inconsistent use of 'name' vs 'fullname' in tw_fields member variable Add Start/EndRegistrationData event hooks in finishopenidlogin: allows recaptcha to add its captcha display to the form (checked since addition of StartRegistrationTry) Ticket #2999: RequireValidatedEmail plugin now also prevents group creation by unvalidated users. Localisation updates from http://translatewiki.net. Translator comments added L10n updates Remove superfluous whitespace Number parameters in message when two or more are used ClientException and ServerException should end with a period ... --- diff --git a/db/notice_source.sql b/db/notice_source.sql index b13cfb3e3b..dec8080a01 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -24,6 +24,7 @@ VALUES ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()), + ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),