friendica-github/mod
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
..
acl.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
admin.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
allfriends.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
amcd.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
api.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
apps.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
attach.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
cb.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
common.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
community.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contactgroup.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
contacts.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
crepair.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
delegate.php normalise comparison link on delegation page 2012-03-22 06:19:27 -07:00
dfrn_confirm.php change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
dfrn_notify.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
dfrn_poll.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
dfrn_request.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
directory.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
dirfind.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
display.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
editpost.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
events.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
filer.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
filerm.php handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
follow.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
friendica.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
friendika.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
fsuggest.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
group.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
hcard.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
help.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
home.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
hostxrd.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
install.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
invite.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
item.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
like.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
localtime.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
lockview.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
login.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
lostpass.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
manage.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
match.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
message.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
modexp.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
msearch.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
network.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
newmember.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notice.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notifications.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notify.php basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
oembed.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
oexchange.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
openid.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
opensearch.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
parse_url.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photo.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
photos.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
ping.php wrong var for notify total 2012-03-28 17:51:43 -07:00
poco.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
post.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
pretheme.php theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
probe.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profile_photo.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profiles.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
profperm.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
pubsub.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
qsearch.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
receive.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
redir.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
register.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
regmod.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
removeme.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
rsd_xml.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
salmon.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
search.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
session.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
settings.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
share.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
smilies.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
starred.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
suggest.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tagger.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tagrm.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
uexport.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update_community.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update_network.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update_notes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update_profile.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
view.php check for style.php existence before inclusion 2012-04-01 16:21:55 -07:00
viewcontacts.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
viewsrc.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wall_attach.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wall_upload.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wallmessage.php send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
webfinger.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
xrd.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00