Craig Andrews a535ccdc4e Merge remote branch 'laconica/0.8.x' into 0.9.x ...

Conflicts:
	lib/common.php
	lib/twitter.php

2009-09-02 16:42:15 -04:00

..

accesstoken.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

all.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

allrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

api.php

Implement the is_member and membership group api's

2009-08-27 22:55:32 -04:00

attachment_ajax.php

define LACONICA and accept LACONICA for backwards compatibility

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

attachment_thumbnail.php

define LACONICA and accept LACONICA for backwards compatibility

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

attachment.php

define LACONICA and accept LACONICA for backwards compatibility

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

avatarbynickname.php

define LACONICA and accept LACONICA for backwards compatibility

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

avatarsettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

block.php

define LACONICA and accept LACONICA for backwards compatibility

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

blockedfromgroup.php

define LACONICA and accept LACONICA for backwards compatibility

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

confirmaddress.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

conversation.php

define LACONICA and accept LACONICA for backwards compatibility

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

deletenotice.php

define LACONICA and accept LACONICA for backwards compatibility

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

disfavor.php

define LACONICA and accept LACONICA for backwards compatibility

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

doc.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

editgroup.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

emailsettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

facebookhome.php

define LACONICA and accept LACONICA for backwards compatibility

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

facebookinvite.php

define LACONICA and accept LACONICA for backwards compatibility

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

facebooklogin.php

define LACONICA and accept LACONICA for backwards compatibility

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

facebookremove.php

define LACONICA and accept LACONICA for backwards compatibility

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

facebooksettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

favor.php

define LACONICA and accept LACONICA for backwards compatibility

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

favorited.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

favoritesrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

featured.php

define LACONICA and accept LACONICA for backwards compatibility

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

file.php

define LACONICA and accept LACONICA for backwards compatibility

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

finishremotesubscribe.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

foaf.php

Fixes foaf notices, use Profile for information that's missing in Remote_profile

2009-09-01 17:52:03 -04:00

groupblock.php

define LACONICA and accept LACONICA for backwards compatibility

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

groupbyid.php

define LACONICA and accept LACONICA for backwards compatibility

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

groupdesignsettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

grouplogo.php

define LACONICA and accept LACONICA for backwards compatibility

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

groupmembers.php

define LACONICA and accept LACONICA for backwards compatibility

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

grouprss.php

define LACONICA and accept LACONICA for backwards compatibility

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

groups.php

define LACONICA and accept LACONICA for backwards compatibility

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

groupsearch.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

groupunblock.php

define LACONICA and accept LACONICA for backwards compatibility

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

imsettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

inbox.php

define LACONICA and accept LACONICA for backwards compatibility

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

invite.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

joingroup.php

define LACONICA and accept LACONICA for backwards compatibility

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

leavegroup.php

define LACONICA and accept LACONICA for backwards compatibility

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

login.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

logout.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

makeadmin.php

define LACONICA and accept LACONICA for backwards compatibility

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

microsummary.php

define LACONICA and accept LACONICA for backwards compatibility

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

newgroup.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

newmessage.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

newnotice.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

noticesearch.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

noticesearchrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

nudge.php

define LACONICA and accept LACONICA for backwards compatibility

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

oembed.php

define LACONICA and accept LACONICA for backwards compatibility

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

opensearch.php

define LACONICA and accept LACONICA for backwards compatibility

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

othersettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

outbox.php

define LACONICA and accept LACONICA for backwards compatibility

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

passwordsettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

peoplesearch.php

define LACONICA and accept LACONICA for backwards compatibility

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

peopletag.php

define LACONICA and accept LACONICA for backwards compatibility

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

postnotice.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

profilesettings.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

public.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

publicrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

publictagcloud.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

recoverpassword.php

define LACONICA and accept LACONICA for backwards compatibility

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

register.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

remotesubscribe.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

replies.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

repliesrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

requesttoken.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

showfavorites.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

showgroup.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

showmessage.php

define LACONICA and accept LACONICA for backwards compatibility

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

shownotice.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

showstream.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

smssettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

subedit.php

define LACONICA and accept LACONICA for backwards compatibility

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

subscribe.php

define LACONICA and accept LACONICA for backwards compatibility

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

subscribers.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

subscriptions.php

define LACONICA and accept LACONICA for backwards compatibility

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

sup.php

define LACONICA and accept LACONICA for backwards compatibility

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

tag.php

define LACONICA and accept LACONICA for backwards compatibility

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

tagother.php

define LACONICA and accept LACONICA for backwards compatibility

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

tagrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapiaccount.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapiblocks.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapidirect_messages.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

twitapifavorites.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapifriendships.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapigroups.php

added my email address next to my name at the top of the files

2009-08-27 22:56:54 -04:00

twitapihelp.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapinotifications.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapisearchatom.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapisearchjson.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapistatuses.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

twitapistatusnet.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapitags.php

added my email address next to my name at the top of the files

2009-08-27 22:56:54 -04:00

twitapitrends.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitapiusers.php

define LACONICA and accept LACONICA for backwards compatibility

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

twitterauthorization.php

define LACONICA and accept LACONICA for backwards compatibility

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

twittersettings.php

Fixed bug in which you cannot turn off importing friends timelines flag

2009-09-02 00:24:30 +00:00

unblock.php

define LACONICA and accept LACONICA for backwards compatibility

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

unsubscribe.php

define LACONICA and accept LACONICA for backwards compatibility

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

updateprofile.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

userauthorization.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00

userbyid.php

define LACONICA and accept LACONICA for backwards compatibility

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

userdesignsettings.php

define LACONICA and accept LACONICA for backwards compatibility

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

usergroups.php

define LACONICA and accept LACONICA for backwards compatibility

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

userrss.php

define LACONICA and accept LACONICA for backwards compatibility

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

xrds.php

Merge branch '0.8.x' into 0.9.x

2009-08-27 11:16:45 -07:00