friendica_2021-01/mod
rabuzarus 743f2e0391 Merge develop into 0602_contact_profile
Conflicts:
	mod/contacts.php
2016-02-09 13:44:30 +01:00
..
_well_known.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
acctlink.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
acl.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
admin.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
allfriends.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
amcd.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
api.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
apps.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
attach.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
babel.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
bookmarklet.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
cb.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
common.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
community.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
contactgroup.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
contacts.php Merge develop into 0602_contact_profile 2016-02-09 13:44:30 +01:00
content.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
credits.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
crepair.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
delegate.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
dfrn_confirm.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
dfrn_notify.php Merge pull request #2326 from fabrixxm/revert_db949bb8 2016-02-09 06:55:49 +01:00
dfrn_poll.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
dfrn_request.php moved include Scape to top of the file 2016-01-03 19:15:13 +01:00
directory.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
dirfind.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
display.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
editpost.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
events.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
fbrowser.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
filer.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
filerm.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
follow.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
friendica.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
fsuggest.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
group.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
hcard.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
help.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
home.php Make the network page the new default page after login. 2014-08-25 23:34:29 +02:00
hostxrd.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
ignored.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
install.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
invite.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
item.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
like.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
localtime.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
lockview.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
login.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
lostpass.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
maintenance.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
manage.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
match.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
message.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
modexp.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
mood.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
msearch.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
navigation.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
network.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
newmember.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
nodeinfo.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
nogroup.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
noscrape.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
notes.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
notice.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
notifications.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
notify.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
oembed.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
oexchange.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
openid.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
opensearch.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
ostatus_subscribe.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
p.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
parse_url.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
photo.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
photos.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
ping.php Merge pull request #2326 from fabrixxm/revert_db949bb8 2016-02-09 06:55:49 +01:00
poco.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
poke.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
post.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
pretheme.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
probe.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
profile.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
profile_photo.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
profiles.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
profperm.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
proxy.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
pubsub.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
pubsubhubbub.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
qsearch.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
randprof.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
receive.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
redir.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
register.php Fix for issue 2060: When password is provided during the register process now the user is redirected correctly. 2015-11-14 08:07:09 +01:00
regmod.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
removeme.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
repair_ostatus.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
rsd_xml.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
salmon.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
search.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
session.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
settings.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
share.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
smilies.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
starred.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
statistics_json.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
subthread.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
suggest.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
tagger.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
tagrm.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
toggle_mobile.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
uexport.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
uimport.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
update_community.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
update_display.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
update_network.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
update_notes.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
update_profile.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
videos.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
view.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
viewcontacts.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
viewsrc.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
wall_attach.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
wall_upload.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
wallmessage.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
webfinger.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
xrd.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00