Craig Andrews 49bce941a9 Merge remote branch 'statusnet/0.8.x' into 0.9.x ...

Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php

2009-09-24 17:15:54 -04:00

..

accountsettingsaction.php

Merge branch '0.8.x' into 0.9.x

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

action.php

Merge remote branch 'statusnet/0.8.x' into 0.9.x

2009-09-24 17:15:54 -04: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 remote branch 'laconica/0.8.x' into 0.9.x

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

commandinterpreter.php

Don't trigger E_NOTICE when looking for commands in the notice input

2009-09-21 16:45:09 +12:00

common.php

add http client config value

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

connectsettingsaction.php

define LACONICA and accept LACONICA for backwards compatibility

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

curlclient.php

statusize new HTTP classes

2009-09-15 22:31:52 -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

No need to call farbtastic.go.js because it was moved to userdesign.go.js

2009-09-20 13:44:22 +02: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.9.x' of git@gitorious.org:laconica/mainline into 0.9.x

2009-08-27 14:52:32 -07:00

facebookutil.php

Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x

2009-08-27 14:52:32 -07: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

Updated layout for filter by tag form

2009-09-04 15:59:27 +00: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

Created autofocus method to give focus to an element (primarily a form

2009-09-03 19:42:50 +00:00

httpclient.php

statusize new HTTP classes

2009-09-15 22:31:52 -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

Show username in subject of emails

2009-09-12 16:58:04 -04:00

mailbox.php

Removed <dl> structure from MailboxAction::showMessage. Same as

2009-08-31 17:52:45 +00: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 remote branch 'statusnet/0.8.x' into 0.9.x

2009-09-24 17:15:54 -04:00

noticelist.php

Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x

2009-09-20 12:55:34 +02: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

Make SyncTwitterFriends and TwitterStatusFetcher daemons use both HTTP Basic Auth as well as OAuth

2009-08-28 07:02:27 +00:00

oauthstore.php

Merge branch '0.8.x' into 0.9.x

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

omb.php

Fix bad merge d7ae0ed4fd755ebad0788a17d0f2fb6a6ca9d63b

2009-09-14 22:08:17 +02: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

Pluginize the URL shorteners

2009-09-03 14:58:50 -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 remote branch 'statusnet/0.8.x' into 0.9.x

2009-09-24 17:15:54 -04:00

rssaction.php

Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x

2009-08-27 14:52:32 -07: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

Pluginize the URL shorteners

2009-09-03 14:58:50 -04:00

snapshot.php

define LACONICA and accept LACONICA for backwards compatibility

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

stompqueuemanager.php

Revert "Several fixes to make RabbitMQ a player."

2009-09-15 17:08:27 -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

Merge remote branch 'laconica/0.8.x' into 0.9.x

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

twitterapi.php

Merge remote branch 'laconica/0.8.x' into 0.9.x

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

twitterbasicauthclient.php

stutuses -> statuses

2009-08-28 06:13:47 -07:00

twitteroauthclient.php

Merge remote branch 'laconica/0.8.x' into 0.9.x

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

unblockform.php

define LACONICA and accept LACONICA for backwards compatibility

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

unqueuemanager.php

'easy' way to handle notices at queue time

2009-09-21 14:39:22 -04:00

unsubscribeform.php

define LACONICA and accept LACONICA for backwards compatibility

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

util.php

Merge remote branch 'statusnet/0.8.x' into 0.9.x

2009-09-24 17:15:54 -04: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