Evan Prodromou a7c85bebd5 Merge branch 'master' of /var/www/mublog ...

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

2009-01-23 08:58:31 +01:00

..

Avatar.php

Some fixups of patches not already migrated to trunk to bring inline with PEAR coding stds

2008-12-25 09:46:01 -05:00

Channel.php

Direct message XHR response fix for IE and minor tweaks

2008-12-16 02:18:18 -05:00

Command.php

move opening brace of class declaration to next line

2008-12-23 14:49:23 -05:00

CommandInterpreter.php

Merge branch 'master' into devel

2009-01-06 17:09:39 -05:00

Confirm_address.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Consumer.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Fave.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Foreign_link.php

trac750 configurable sync flags for Facebook app (noticesync, replysync)

2009-01-04 23:02:12 -05:00

Foreign_service.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Foreign_subscription.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Foreign_user.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Group_inbox.php

Remove require_once for Memcached_DBObject from new classes

2009-01-23 02:54:38 +00:00

Group_member.php

Remove require_once for Memcached_DBObject from new classes

2009-01-23 02:54:38 +00:00

Invitation.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

laconica.ini

Generate new DB_DataObject classes for group tables

2009-01-13 00:35:41 -05:00

laconica.links.ini

move DB_DataObject ini files to more common name.

2008-10-04 10:22:05 -04:00

Memcached_DataObject.php

Was accidentally not saving cached items (doh!)

2009-01-22 20:51:05 +00:00

Message.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Nonce.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Notice_inbox.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Notice_source.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Notice_tag.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Notice.php

Merge branch 'master' of /var/www/mublog

2009-01-23 08:58:31 +01:00

Profile_block.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Profile_tag.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Profile.php

move membership/adminship tests to profile

2009-01-21 13:57:18 -05:00

Queue_item.php

TRUE

2008-12-23 14:44:28 -05:00

Related_group.php

Remove require_once for Memcached_DBObject from new classes

2009-01-23 02:54:38 +00:00

Remember_me.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Remote_profile.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Reply.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Sms_carrier.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Subscription.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

Token.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

User_group.php

Upload logos for groups

2009-01-23 08:15:29 +01:00

User_openid.php

change function headers to K&R style

2008-12-23 14:33:23 -05:00

User.php

Merge branch 'master' of /var/www/mublog

2009-01-23 08:58:31 +01:00