tobias/friendica
1
0
Fork 0
Code Pull requests Activity
friendica/mod
History
Roland Häder b9e4b9f274 Merge remote-tracking branch 'upstream/develop' into develop 
Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 15:44:31 +01:00
..
_well_known.php changed to this: 2016-12-20 10:58:55 +01:00
acctlink.php changed to this: 2016-12-20 10:58:55 +01:00
acl.php changed to this: 2016-12-20 10:58:55 +01:00
admin.php changed to this: 2016-12-20 10:58:55 +01:00
allfriends.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
amcd.php changed to this: 2016-12-20 10:58:55 +01:00
api.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
apps.php changed to this: 2016-12-20 10:58:55 +01:00
attach.php changed to this: 2016-12-20 10:58:55 +01:00
babel.php changed to this: 2016-12-20 10:58:55 +01:00
bookmarklet.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
cal.php changed to this: 2016-12-20 10:58:55 +01:00
cb.php changed to this: 2016-12-20 10:58:55 +01:00
common.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
community.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
contactgroup.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
contacts.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
content.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
credits.php changed to this: 2016-12-20 10:58:55 +01:00
crepair.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
delegate.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
dfrn_confirm.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
dfrn_notify.php changed to this: 2016-12-20 10:58:55 +01:00
dfrn_poll.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
dfrn_request.php changed to this: 2016-12-20 10:58:55 +01:00
directory.php changed to this: 2016-12-20 10:58:55 +01:00
dirfind.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
display.php changed to this: 2016-12-20 10:58:55 +01:00
editpost.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
events.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
fbrowser.php changed to this: 2016-12-20 10:58:55 +01:00
fetch.php changed to this: 2016-12-20 10:58:55 +01:00
filer.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
filerm.php Changed $a->get_baseurl() to App::get_baseurl() 2016-12-20 12:45:16 +01:00
follow.php Changed $a->get_baseurl() to App::get_baseurl() 2016-12-20 12:45:16 +01:00
friendica.php changed to this: 2016-12-20 10:58:55 +01:00
fsuggest.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
group.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
hcard.php changed to this: 2016-12-20 10:58:55 +01:00
help.php Changed $a->get_baseurl() to App::get_baseurl() 2016-12-20 12:45:16 +01:00
home.php added curly braces + space between "if" and brace + added TODO 2016-12-20 11:14:30 +01:00
hostxrd.php changed to this: 2016-12-20 10:58:55 +01:00
hovercard.php changed to this: 2016-12-20 10:58:55 +01:00
ignored.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
install.php changed to this: 2016-12-20 10:58:55 +01:00
invite.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
item.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
like.php changed to this: 2016-12-20 10:58:55 +01:00
localtime.php changed to this: 2016-12-20 10:58:55 +01:00
lockview.php changed to this: 2016-12-20 10:58:55 +01:00
login.php changed to this: 2016-12-20 10:58:55 +01:00
lostpass.php changed to this: 2016-12-20 10:58:55 +01:00
maintenance.php changed to this: 2016-12-20 10:58:55 +01:00
manage.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
match.php Changed $a->get_baseurl() to App::get_baseurl() 2016-12-20 12:45:16 +01:00
message.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
modexp.php changed to this: 2016-12-20 10:58:55 +01:00
mood.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
msearch.php changed to this: 2016-12-20 10:58:55 +01:00
navigation.php changed to this: 2016-12-20 10:58:55 +01:00
network.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
newmember.php changed to this: 2016-12-20 10:58:55 +01:00
nodeinfo.php changed to this: 2016-12-20 10:58:55 +01:00
nogroup.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
noscrape.php changed to this: 2016-12-20 10:58:55 +01:00
notes.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
notice.php changed to this: 2016-12-20 10:58:55 +01:00
notifications.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
notify.php added curly braces + space between "if" and brace 2016-12-20 11:27:40 +01:00
oembed.php changed to this: 2016-12-20 10:58:55 +01:00
oexchange.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
openid.php changed to this: 2016-12-20 10:58:55 +01:00
opensearch.php changed to this: 2016-12-20 10:58:55 +01:00
ostatus_subscribe.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
p.php Continued with #3010: 2016-12-15 09:59:13 +01:00
parse_url.php changed to this: 2016-12-20 10:58:55 +01:00
photo.php changed to this: 2016-12-20 10:58:55 +01:00
photos.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-20 15:44:31 +01:00
ping.php *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 2016-12-19 14:27:16 +01:00
poco.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
poke.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
post.php changed to this: 2016-12-20 10:58:55 +01:00
pretheme.php changed to this: 2016-12-20 10:58:55 +01:00
probe.php changed to this: 2016-12-20 10:58:55 +01:00
profile.php changed to this: 2016-12-20 10:58:55 +01:00
profile_photo.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
profiles.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
profperm.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
proxy.php *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 2016-12-19 14:27:16 +01:00
pubsub.php changed to this: 2016-12-20 10:58:55 +01:00
pubsubhubbub.php changed to this: 2016-12-20 10:58:55 +01:00
qsearch.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
randprof.php added spaces + curly braces 2016-12-20 11:38:16 +01:00
receive.php changed to this: 2016-12-20 10:58:55 +01:00
redir.php Changed $a->get_baseurl() to App::get_baseurl() 2016-12-20 12:45:16 +01:00
register.php changed to this: 2016-12-20 10:58:55 +01:00
regmod.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
removeme.php Changed $a->get_baseurl() to App::get_baseurl() 2016-12-20 12:45:16 +01:00
repair_ostatus.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
rsd_xml.php changed to this: 2016-12-20 10:58:55 +01:00
salmon.php changed to this: 2016-12-20 10:58:55 +01:00
search.php changed to this: 2016-12-20 10:58:55 +01:00
session.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
settings.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
share.php changed to this: 2016-12-20 10:58:55 +01:00
smilies.php changed to this: 2016-12-20 10:58:55 +01:00
starred.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
statistics_json.php changed to this: 2016-12-20 10:58:55 +01:00
subthread.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-20 15:44:31 +01:00
suggest.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
tagger.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-20 15:44:31 +01:00
tagrm.php added curly braces + space between "if" and brace 2016-12-20 12:35:18 +01:00
toggle_mobile.php Opps, forgot this ... 2016-12-20 12:38:11 +01:00
uexport.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
uimport.php changed to this: 2016-12-20 10:58:55 +01:00
update_community.php changed to this: 2016-12-20 10:58:55 +01:00
update_display.php changed to this: 2016-12-20 10:58:55 +01:00
update_network.php changed to this: 2016-12-20 10:58:55 +01:00
update_notes.php changed to this: 2016-12-20 10:58:55 +01:00
update_profile.php changed to this: 2016-12-20 10:58:55 +01:00
videos.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
view.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
viewcontacts.php changed to this: 2016-12-20 10:58:55 +01:00
viewsrc.php added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
wall_attach.php changed to this: 2016-12-20 10:58:55 +01:00
wall_upload.php Coding convention applied: 2016-12-20 10:10:33 +01:00
wallmessage.php changed to this: 2016-12-20 10:58:55 +01:00
webfinger.php changed to this: 2016-12-20 10:58:55 +01:00
worker.php Store spooled data 2016-12-01 20:53:18 +00:00
xrd.php changed to this: 2016-12-20 10:58:55 +01:00