Michael Vogel bfca7f47ef Merge remote branch 'upstream/master' ... Conflicts: include/bb2diaspora.php		2012-07-13 23:39:51 +02:00
..
markdownify
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	Merge remote branch 'upstream/master'	2012-07-13 23:39:51 +02:00
bbcode.php	Merge remote branch 'upstream/master'	2012-07-13 23:39:51 +02:00
cache.php
config.php
Contact.php
contact_selectors.php
contact_widgets.php
conversation.php	add plink to profile notifications	2012-07-12 16:12:37 -07:00
cronhooks.php
crypto.php	remove obsolete zot encapsulation functions	2012-07-05 20:58:45 -07:00
datetime.php	typos	2012-06-25 21:39:07 -07:00
dba.php	Merge remote branch 'upstream/master'	2012-07-13 23:39:51 +02:00
delivery.php	create third privacy state - public post but not searchable or publicly visible	2012-06-28 17:43:29 -07:00
diaspora.php	make likes on comments work with Diaspora, some small bugs	2012-07-12 23:14:39 -06:00
directory.php
email.php
EmailNotification.php
enotify.php	notification issue on wall-to-wall posts	2012-07-11 02:58:57 -07:00
event.php
expire.php
fcontact.php
follow.php
gprobe.php
group.php
html2bbcode.php	try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff	2012-07-02 01:11:19 -07:00
html2plain.php
items.php	Merge remote branch 'upstream/master'	2012-07-13 23:39:51 +02: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	nav: pass $baseurl to template	2012-06-29 05:29:29 -04:00
network.php	Merge remote branch 'upstream/master'	2012-07-13 23:39:51 +02:00
notifier.php	create third privacy state - public post but not searchable or publicly visible	2012-06-28 17:43:29 -07:00
oauth.php
oembed.php
onepoll.php
pgettext.php
Photo.php	better check for image EXIF support	2012-07-08 11:17:50 -06:00
pidfile.php
plugin.php
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	add rudimentary locking capability to Friendica functions	2012-07-05 14:26:42 -06:00
security.php
session.php
socgraph.php
system_unavailable.php
template_processor.php
text.php	fix !@#$ tinymce linebreaks for the thousandth time	2012-07-04 17:15:43 -07:00
user.php	config to disable email validation	2012-07-01 18:56:00 -07:00