Michael Vogel d653e27e2d Merge commit 'upstream/master' ... Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl		2012-03-11 20:22:28 +01:00
..
acl_selectors.php	Enabled automated doc building. Changes:	2012-03-01 11:44:33 +01:00
api.php
attach.php
auth.php
bb2diaspora.php
bbcode.php	bug #328	2012-03-10 18:52:50 -08:00
cache.php
config.php
Contact.php
contact_selectors.php
contact_widgets.php
conversation.php	bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed	2012-03-09 00:31:17 -08:00
cronhooks.php
crypto.php
datetime.php
dba.php
delivery.php
diaspora.php
directory.php
email.php	Mail: Removing signatures, gpg, unnecessary line breaks	2012-03-10 09:52:20 +01:00
EmailNotification.php
enotify.php	yet more work on notifications	2012-02-29 19:23:01 -08:00
event.php
expire.php
fcontact.php
group.php
html2bbcode.php	Merge commit 'upstream/master'	2012-03-09 11:41:23 +01:00
html2plain.php
items.php	still getting parent relays on remote systems	2012-03-07 18:23:55 -08:00
message.php
msgclean.php	Mail: Removing signatures, gpg, unnecessary line breaks	2012-03-10 09:52:20 +01:00
nav.php	messages-menu translation, add scroll-to-top and theme-bug-report in theme	2012-03-07 00:07:27 +01:00
network.php	relative link redirects	2012-02-26 14:34:01 -08:00
notifier.php	still getting parent relays on remote systems	2012-03-07 18:23:55 -08:00
oauth.php
oembed.php
pgettext.php
Photo.php
plugin.php
poller.php	Item cache now is one day.	2012-03-11 19:45:28 +01:00
profile_advanced.php
profile_selectors.php
profile_update.php
queue.php
queue_fn.php
quoteconvert.php
remoteupdate.php
salmon.php
Scrape.php	probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type	2012-03-01 18:49:23 -08:00
security.php	bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed	2012-03-09 00:31:17 -08:00
session.php
socgraph.php
system_unavailable.php
template_processor.php	template proc: fix variables regexp	2012-03-03 00:00:38 +01:00
text.php	Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.	2012-03-11 19:11:25 +01:00