This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Michael 0409b5cdba Merge remote branch 'upstream/master' ...

Conflicts:
	include/bbcode.php

2012-02-23 20:53:22 +01:00

..

acl_selectors.php

acl_selectors.php - Friendika -> Friendica

2012-02-20 19:38:42 -03:00

api.php

Merge pull request #45 from annando/master

2012-02-22 20:21:05 -08:00

attach.php

…

auth.php

…

bb2diaspora.php

Removed the export of markdown articles. That was for testing purposes only.

2012-02-23 07:53:45 +01:00

bbcode.php

Merge remote branch 'upstream/master'

2012-02-23 20:53:22 +01:00

cache.php

…

config.php

…

contact_selectors.php

…

contact_widgets.php

…

Contact.php

…

conversation.php

…

cronhooks.php

…

crypto.php

…

datetime.php

…

dba.php

…

delivery.php

…

diaspora.php

allow forum posts by followers on Diaspora

2012-02-22 19:56:28 -08:00

directory.php

…

email.php

…

EmailNotification.php

…

enotify.php

new notify sort of working in testbubble

2012-02-22 23:34:30 -08:00

event.php

…

expire.php

…

fcontact.php

…

group.php

…

html2bbcode.php

fix img tag with size attribute

2012-02-23 11:12:36 +01:00

items.php

mark all notifications read

2012-02-21 16:59:57 -08:00

message.php

…

nav.php

more theme notify fixes

2012-02-23 00:28:26 -08:00

network.php

…

notifier.php

…

oauth.php

add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)

2012-01-18 16:21:30 -08:00

oembed.php

…

pgettext.php

…

Photo.php

…

plugin.php

…

poller.php

restore poller normal operation

2012-02-22 20:31:33 -08:00

profile_advanced.php

…

profile_selectors.php

…

profile_update.php

…

queue_fn.php

…

queue.php

…

remoteupdate.php

…

salmon.php

…

Scrape.php

Scrape.php - Friendika -> Friendica

2012-02-20 19:38:42 -03:00

security.php

…

session.php

…

socgraph.php

…

system_unavailable.php

…

template_processor.php

template: add support for variable filters

2012-02-21 11:25:22 +01:00

text.php

never enough documentation

2012-02-22 01:50:06 -08:00