clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
friendica/mod
History
Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:29:56 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
allfriends.php
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
cb.php
changed to this:
2016-12-20 10:58:55 +01:00
common.php
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
dfrn_confirm.php
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 11:29:56 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
directory.php
Continued with coding convention:
2016-12-20 21:15:53 +01:00
dirfind.php
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
2016-12-21 23:12:28 +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 curly braces + space
2016-12-21 09:31:31 +01:00
fbrowser.php
changed to this:
2016-12-20 10:58:55 +01:00
fetch.php
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 11:29:56 +01:00
filer.php
added much more curly braces + space between "if" and brace
2016-12-20 11:56:34 +01:00
filerm.php
Continued with coding convention:
2016-12-20 21:15:53 +01:00
follow.php
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
2016-12-21 23:12:28 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
hcard.php
Continued with coding convention:
2016-12-20 21:15:53 +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/spaces + replace spaces with tabs to fix code indending (or so?)
2016-12-21 23:12:28 +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
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
2016-12-21 23:12:28 +01:00
invite.php
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
2016-12-21 23:12:28 +01:00
item.php
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 11:29:56 +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
used dbm::is_result() instead of count()
2016-12-20 21:39:06 +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
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
noscrape.php
Continued with coding convention:
2016-12-20 21:31:05 +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
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 09:03:44 +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
Continued with coding convention:
2016-12-20 21:15:53 +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
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
2016-12-20 12:50:36 -05: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
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:15:53 +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_photo.php
Continued with coding convention:
2016-12-20 21:15:53 +01:00
profile.php
Continued with coding convention:
2016-12-20 21:15:53 +01:00
profiles.php
Continued with coding convention:
2016-12-20 21:15:53 +01:00
profperm.php
added much more curly braces + space between "if" and brace
2016-12-20 11:56:34 +01:00
proxy.php
no need for this else block
2016-12-21 22:53:08 +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
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 11:29:56 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
session.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
settings.php
More curly braces added, left some TODOs behind
2016-12-21 23:17:36 +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 curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
2016-12-21 23:12:28 +01:00
statistics_json.php
changed to this:
2016-12-20 10:58:55 +01:00
subthread.php
Continued with coding convention:
2016-12-20 21:31:05 +01:00
suggest.php
Continued with coding convention:
2016-12-20 21:15:53 +01:00
tagger.php
Continued with coding convention:
2016-12-20 21:31:05 +01:00
tagrm.php
Continued with coding convention:
2016-12-20 21:31:05 +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
Continued with coding convention:
2016-12-20 21:15:53 +01:00
view.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
viewcontacts.php
Continued with coding convention:
2016-12-20 21:15:53 +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
Continued with coding convention:
2016-12-20 21:31:05 +01:00