Sarven Capadisli d30df07908 Merge branch '0.7.x' into 0.8.x ...

Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css

2009-05-01 00:16:25 +00:00

..

Avatar.php

Fix name of default avatar

2009-02-06 04:03:03 -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

Added dirty dates to Foreign_link

2009-04-28 17:08:20 -07: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

Added dirty dates to Foreign_link

2009-04-28 17:08:20 -07:00

laconica.links.ini

move DB_DataObject ini files to more common name.

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

Memcached_DataObject.php

Revert "run 'set names' after each connection to deal with UTF8 correctly"

2009-04-26 12:27:32 -04:00

Message.php

change function headers to K&R style

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

Nonce.php

Fix nonce usage in OAuth store

2009-03-07 12:55:09 -08:00

Notice_inbox.php

Move algorithm for caching to Notice class

2009-04-29 11:27:45 -04:00

Notice_source.php

change function headers to K&R style

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

Notice_tag.php

PostgreSQL - fixed a couple more quoting issues

2009-03-05 16:18:31 +00:00

Notice.php

Merge branch '0.7.x' into 0.8.x

2009-05-01 00:16:25 +00:00

Profile_block.php

change function headers to K&R style

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

Profile_tag.php

fix problem with dupe tags in profile

2009-02-28 15:17:49 -08:00

Profile.php

Move common_avatar_* functions to Avatar

2009-02-06 03:55:48 -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

Status_network.php

Host multiple sites with the same codebase

2009-04-07 17:10:54 -04:00

statusnet.ini

Host multiple sites with the same codebase

2009-04-07 17:10:54 -04: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

Move common_avatar_* functions to Avatar

2009-02-06 03:55:48 -05:00

User_openid.php

change function headers to K&R style

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

User.php

Change to avoid a join in notice inbox

2009-04-28 13:07:05 -04:00