friendica/include
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
..
autoloader
Core
acl_selectors.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
api.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
attach.php
auth.php
auth_ejabberd.php Merge pull request #3032 from annando/1612-auth-ejabber 2016-12-20 15:45:18 +01:00
autoloader.php
bb2diaspora.php
bbcode.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
cache.php
cli_startup.php
config.php
Contact.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
contact_selectors.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
contact_widgets.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
conversation.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
create_shadowentry.php
cron.php changed to this: 2016-12-20 10:58:03 +01:00
cronhooks.php
cronjobs.php
crypto.php
datetime.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
dba.php
dba_pdo.php
dbclean.php
dbm.php
dbstructure.php
dbupdate.php
delivery.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
dfrn.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
diaspora.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
directory.php
DirSearch.php
discover_poco.php
email.php added spaces + curly braces 2016-12-20 11:38:16 +01:00
Emailer.php
enotify.php
event.php changed to this: 2016-12-20 10:58:03 +01:00
expire.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
fcontact.php
features.php
feed.php
files.php
follow.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
ForumManager.php
friendica_smarty.php
gprobe.php
group.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
html2bbcode.php
html2plain.php
HTTPExceptions.php
identity.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
items.php converted more to dbm::is_result() + added braces/space 2016-12-20 15:37:27 +01:00
like.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
lock.php Coding convention applied: 2016-12-20 10:10:33 +01:00
map.php
message.php added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 2016-12-21 23:12:28 +01:00
msgclean.php
nav.php changed to this: 2016-12-20 10:58:03 +01:00
network.php added more curyl braces + spaces between "if" and brace 2016-12-20 10:44:27 +01:00
NotificationsManager.php provide local time for notifications 2016-12-22 00:28:52 +01:00
notifier.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
oauth.php
oembed.php
onepoll.php Coding convention applied: 2016-12-20 10:10:33 +01:00
ostatus.php
ParseUrl.php
pgettext.php
Photo.php
photos.php
pidfile.php
plaintext.php
plugin.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
poller.php used more App::get_baseurl() instead of get_app()->get_baseurl(). 2016-12-20 21:51:25 +01:00
post_update.php
Probe.php
profile_selectors.php
profile_update.php Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
pubsubpublish.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
queue.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
queue_fn.php
quoteconvert.php
redir.php Coding convention applied: 2016-12-20 10:10:33 +01:00
remove_contact.php
salmon.php added more curly braces + space between "if" and brace 2016-12-20 17:57:40 +01:00
Scrape.php
security.php added more curly braces + space between "if" and brace 2016-12-20 17:57:40 +01:00
session.php
shadowupdate.php
Smilies.php
socgraph.php added more curly braces + space between "if" and brace 2016-12-20 17:57:40 +01:00
spool_post.php
system_unavailable.php
tags.php
tagupdate.php
template_processor.php
text.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
threads.php
threadupdate.php
uimport.php
update_gcontact.php
user.php Continued with coding convention: 2016-12-20 21:13:50 +01:00
xml.php