Michael Vogel 04c31d194f Merge remote branch 'upstream/master' ... Conflicts: update.php		2012-08-02 00:21:14 +02:00
..
markdownify	Changes in the bbcode to markdown converter to make it more compatible with Diaspora	2012-07-15 12:47:24 +02:00
acl_selectors.php
api.php	API: Now returns a real 404 when a function isn't implemented	2012-07-13 23:23:31 +02:00
attach.php
auth.php
bb2diaspora.php	Hopefully the final fix for image links in bb2diaspora	2012-07-15 13:40:01 +02:00
bbcode.php	bbcode: two new bbcode elements (style, class) for CSS	2012-08-02 00:13:37 +02:00
cache.php
config.php
Contact.php	add poke to contact photo menu	2012-07-19 21:03:31 -07:00
contact_selectors.php
contact_widgets.php
conversation.php	fix filer bug; some interface tweaks	2012-07-29 14:49:12 -06:00
cronhooks.php
crypto.php	remove obsolete zot encapsulation functions	2012-07-05 20:58:45 -07:00
datetime.php	recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396	2012-07-15 21:00:11 -07:00
dba.php	Merge remote branch 'upstream/master'	2012-07-13 23:39:51 +02:00
delivery.php
diaspora.php	Fixed syntax error in usage of anonymous function.	2012-07-25 21:38:28 -04:00
directory.php
email.php
EmailNotification.php
enotify.php	poke notifications	2012-07-19 20:13:40 -07:00
event.php
expire.php
fcontact.php
follow.php
gprobe.php
group.php
html2bbcode.php
html2plain.php
items.php	update contact photos and names in local delivery - not just polled feeds	2012-07-23 20:00:00 -07:00
lock.php	don't check for was_recently_delayed in diaspora_transmit during a queue run	2012-07-09 09:39:09 -06:00
message.php
msgclean.php
nav.php
network.php	network: Caching of images	2012-07-26 00:23:25 +02:00
notifier.php
oauth.php
oembed.php
onepoll.php
pgettext.php
Photo.php	Forgot a ;	2012-07-22 17:50:58 +02:00
pidfile.php
plugin.php	changes to support a mobile theme	2012-07-23 20:37:00 -06:00
poller.php
profile_advanced.php
profile_selectors.php
profile_update.php
queue.php	don't check for was_recently_delayed in diaspora_transmit during a queue run	2012-07-09 09:39:09 -06:00
queue_fn.php
quoteconvert.php
remoteupdate.php
salmon.php
Scrape.php
security.php
session.php
socgraph.php	missing param	2012-07-15 17:07:53 -07:00
system_unavailable.php
template_processor.php
text.php	tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.	2012-08-01 01:36:39 -07:00
user.php