Evan Prodromou 5d09b6b3f0 Merge branch '0.8.x' into 0.9.x ... Conflicts: EVENTS.txt actions/finishremotesubscribe.php actions/postnotice.php actions/public.php actions/remotesubscribe.php actions/showstream.php actions/updateprofile.php actions/userauthorization.php classes/laconica.ini lib/common.php lib/oauthstore.php lib/omb.php		2009-08-27 11:16:45 -07:00
..
accountsettingsaction.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
action.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
arraywrapper.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
attachmentlist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
attachmentnoticesection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
attachmenttagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
blockform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
channel.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
clienterroraction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
clientexception.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
command.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
commandinterpreter.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
common.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
connectsettingsaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
currentuserdesignaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
daemon.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
dberroraction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
dbqueuemanager.php	change controlyourself.ca to status.net	2009-08-25 18:19:04 -04:00
deleteaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
designsettings.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
disfavorform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
error.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
event.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
facebookaction.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
facebookutil.php	a distributed -> the distributed	2009-08-25 18:14:12 -04:00
favorform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
featureduserssection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
feed.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
feedlist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
form.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
galleryaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupdesignaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupeditform.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
grouplist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupminilist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupnav.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupsbymemberssection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupsbypostssection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
groupsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
grouptagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
htmloutputter.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
imagefile.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
jabber.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
joinform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
jsonsearchresultslist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
language.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
leaveform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
logingroupnav.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
mail.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
mailbox.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
messageform.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
microid.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
noticeform.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
noticelist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
noticesection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
nudgeform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
oauthclient.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
oauthstore.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
omb.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
ownerdesignaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
parallelizingdaemon.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
personalgroupnav.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
personaltagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
ping.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
plugin.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
popularnoticesection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
profileaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
profilelist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
profileminilist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
profilesection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
publicgroupnav.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
queuehandler.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
queuemanager.php	change controlyourself.ca to status.net	2009-08-25 18:19:04 -04:00
router.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
rssaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
search_engines.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
searchaction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
searchgroupnav.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
section.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
servererroraction.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
serverexception.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
settingsaction.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
Shorturl_api.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
snapshot.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
stompqueuemanager.php	change controlyourself.ca to status.net	2009-08-25 18:19:04 -04:00
subgroupnav.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subpeopletagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subs.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscribeform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscriberspeopleselftagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscriberspeopletagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscriptionlist.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscriptionspeopleselftagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
subscriptionspeopletagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
tagcloudsection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
theme.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
topposterssection.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
twitter.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
twitterapi.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
twitteroauthclient.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
unblockform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
unqueuemanager.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
unsubscribeform.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
util.php	Merge branch '0.8.x' into 0.9.x	2009-08-27 11:16:45 -07:00
webcolor.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
widget.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
xmloutputter.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
xmlstringer.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00
xmppqueuehandler.php	define LACONICA and accept LACONICA for backwards compatibility	2009-08-26 10:41:36 -04:00