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

..

allsites.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

cleardb.sh

clear and rebuild db scripts

2008-09-22 15:58:24 -04:00

commandline.inc

last scrub of Laconica -> StatusNet

2009-08-26 03:33:43 -04:00

createsim.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

decache.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

delete_status_network.sh

global search and replace for laconica -> statusnet

2009-08-25 18:53:24 -04:00

enjitqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

facebookqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

fixup_conversations.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

fixup_hashtags.php

define LACONICA and accept LACONICA for backwards compatibility

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

fixup_inboxes.php

define LACONICA and accept LACONICA for backwards compatibility

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

fixup_notices_rendered.php

define LACONICA and accept LACONICA for backwards compatibility

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

fixup_replies.php

define LACONICA and accept LACONICA for backwards compatibility

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

fixup_utf8.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

getpiddir.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

getvaliddaemons.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

inbox_users.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

jabberqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

maildaemon.php

Merge branch '0.8.x' into 0.9.x

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

ombqueuehandler.php

Merge branch '0.8.x' into 0.9.x

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

pingqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

publicqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

rebuilddb_psql.sh

global search and replace for laconica -> statusnet

2009-08-25 18:53:24 -04:00

rebuilddb.sh

clear and rebuild db scripts

2008-09-22 15:58:24 -04:00

reportsnapshot.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

SearchMonkey-MrH.0.txt

Updated URL patterns for identica Profiles for YahooSearchMonkey app.

2009-03-09 19:43:46 +00:00

SearchMonkey-Om3.0.txt

Updated URL patterns for identica Profiles for YahooSearchMonkey app.

2009-03-09 19:43:46 +00:00

SearchMonkey-yQP.0.txt

Updated URL patterns for identica Profiles for YahooSearchMonkey app.

2009-03-09 19:43:46 +00:00

sessiongc.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

setpassword.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

setup_status_network.sh

global search and replace for laconica -> statusnet

2009-08-25 18:53:24 -04:00

setup.cfg.sample

use different name for connection and database

2009-06-23 11:22:54 -07:00

showcache.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

sitemap.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

smsqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

sphinx-cron.sh

update names in shell scripts

2009-08-25 18:43:48 -04:00

sphinx-indexer.sh

update names in shell scripts

2009-08-25 18:43:48 -04:00

sphinx.sh

sphinx scripts

2008-11-23 23:44:35 -05:00

startdaemons.sh

update names in shell scripts

2009-08-25 18:43:48 -04:00

statusnet.spec

last scrub of Laconica -> StatusNet

2009-08-26 03:33:43 -04:00

stopdaemons.sh

update names in shell scripts

2009-08-25 18:43:48 -04:00

synctwitterfriends.php

change controlyourself.ca to status.net

2009-08-25 18:19:04 -04:00

triminboxes.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

twitterqueuehandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

twitterstatusfetcher.php

last scrub of Laconica -> StatusNet

2009-08-26 03:33:43 -04:00

uncache_users.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

update_pot.sh

last scrub of Laconica -> StatusNet

2009-08-26 03:33:43 -04:00

update_translations.php

define LACONICA and accept LACONICA for backwards compatibility

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

xmppconfirmhandler.php

a distributed -> the distributed

2009-08-25 18:14:12 -04:00

xmppdaemon.php

Merge branch '0.8.x' into 0.9.x

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