Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x ...

Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css

2011-02-28 15:39:43 -08:00

..

Avatar.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Config.php

common_cache_key() -> Cache::key()

2010-09-06 10:07:43 -04:00

Confirm_address.php

change function headers to K&R style

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

Consumer.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Conversation.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Deleted_notice.php

check correct define (not backwards compatible)

2009-09-15 21:12:44 -04:00

Design.php

Fix ticket #2181: Can't save #000000 (black) in color fields on design page

2011-01-04 13:09:44 -08:00

Fave.php

add fixme for since_id/max_id on fave streaming (?)

2010-12-17 14:32:06 -08:00

File_oembed.php

Encapsulate the oEmbed -> oohembed fallback into oEmbedHelper class. Also added a chance to whitelist sites that don't show discovery info but do have oEmbed API endpoints, and to provide alternate APIs for some common services.

2010-11-12 17:41:35 -08:00

File_redirection.php

Merge branch '0.9.x' into merge

2010-12-07 10:50:05 -08:00

File_thumbnail.php

Save oEmbed photo references as thumbnails if there's not a separate thumbnail_url entry in the return data. This fixes thumb saving for Flickr photo references.

2010-11-12 14:03:08 -08:00

File_to_post.php

Bad method call in File_to_post

2010-12-29 13:28:32 -08:00

File.php

Use cachedQuery on File::getAttachments, plus other cleanups:

2011-01-31 12:22:50 -08:00

Foreign_link.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Foreign_service.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Foreign_subscription.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Foreign_user.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Group_alias.php

Fixed problem causing 500 error on notices containing a non-existent group

2010-03-06 00:30:15 +00:00

Group_block.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Group_inbox.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Group_member.php

membership stream method and return membership from join() in Group_member class

2010-12-13 13:50:39 -05:00

Inbox.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Invitation.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Local_group.php

* add translator documentation

2010-07-29 13:01:04 +02:00

Location_namespace.php

flip x flag on generated files

2009-10-21 22:43:41 -04:00

Login_token.php

* add translator documentation

2010-07-29 13:01:04 +02:00

Managed_DataObject.php

fix a couple bugs in Managed_DataObject

2010-11-01 14:31:32 -07:00

Memcached_DataObject.php

Merge branch '0.9.x' into 1.0.x

2011-02-28 15:39:43 -08:00

Message.php

URL shortening fix for direct messages: if we're going to shorten the text, shorten the rendered text too.

2010-12-02 13:59:51 -08:00

Nonce.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Notice_inbox.php

Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.

2010-03-02 11:54:02 -08:00

Notice_source.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:21:09 +02:00

Notice_tag.php

Merge remote branch 'gitorious/0.9.x' into 1.0.x

2010-12-30 15:52:08 -08:00

Notice.php

Merge branch '0.9.x' into 1.0.x

2011-02-28 15:39:43 -08:00

Oauth_application_user.php

Revert DB change for OAuth. Change compound key for oauth_application_user

2010-10-20 11:41:04 -07:00

Oauth_application.php

Ticket #2811 use more consistent max limit for OAuth application registration descriptions; now using the field max of 255 rather than $config['site']['textlimit'] as fallback if $config['application']['desclimit'] is unset or out of bounds.

2010-10-11 12:52:32 -07:00

Oauth_token_association.php

i18n/L10n updates, translator docs updated, superfluous whitespace removed.

2010-10-21 03:10:46 +02:00

Profile_block.php

define LACONICA and accept LACONICA for backwards compatibility

2009-08-26 10:41:36 -04:00

Profile_role.php

Background deletion of user accounts. Notices are deleted in chunks, then the user itself when they're all gone.

2010-03-15 16:08:00 -07:00

Profile_tag.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

Profile.php

Merge branch '0.9.x' into 1.0.x

2011-02-28 15:39:43 -08:00

Queue_item.php

Ticket #2797: replace addslashes() with explicit escape calls on the DB objects

2010-11-19 15:06:26 -08:00

Related_group.php

some class files had x bit set

2009-05-22 21:11:46 -04:00

Remember_me.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

Remote_profile.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

Reply.php

Update sorting on reply/mentions timeline: added reply_profile_id_modified_notice_id_idx index to reply table

2010-12-17 14:43:45 -08:00

Safe_DataObject.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

Schema_version.php

Add stub schema_version table

2010-10-19 15:38:53 -07:00

Session.php

Revert "Session GC fix: save session.modified field as UTC so our comparisons work." - no longer needed with ticket #3020 fix to time zone settings

2011-01-31 11:50:24 -08:00

Sms_carrier.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

Status_network_tag.php

* translator documentation added.

2010-10-23 19:20:51 +02:00

status_network.ini

oops. really embarassing typo (that explains some weird behaviour)

2010-07-29 16:32:41 -04:00

Status_network.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

statusnet.ini

Merge branch '0.9.x' into 1.0.x

2011-02-28 15:39:43 -08:00

statusnet.links.ini

PHP 5.3 compatibility hack for DB_DataObject

2010-02-12 11:15:12 -08:00

Subscription.php

Merge branch '0.9.x' into activityatompub

2010-12-11 11:03:02 -05:00

Token.php

Add verifier and verified callback to token for OAuth 1.0a

2010-01-24 16:36:05 -08:00

User_group.php

events for creating a group

2011-01-26 18:35:01 -07:00

User_im_prefs.php

IM cleanup on 1.0.x branch:

2010-04-30 15:29:05 -07:00

User_location_prefs.php

Add magic formula to keep DB_DataObject from treating location prefs pkey as autoincrement

2009-12-30 08:56:43 -10:00

User_urlshortener_prefs.php

Give users more control over URL shortening

2010-04-26 02:40:36 -04:00

User_username.php

* i18n/L10n and translator documentation updates.

2010-09-28 23:42:18 +02:00

User.php

Merge branch '0.9.x' into 1.0.x

2011-02-28 15:39:43 -08:00