friendica/include
Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:33:00 +01:00
..
autoloader
Core
acl_selectors.php
api.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
attach.php
auth.php
auth_ejabberd.php
autoloader.php
bb2diaspora.php
bbcode.php
cache.php cache: use unserialize(false) 2016-11-20 17:32:37 +01:00
cli_startup.php
config.php Add $default_value parameter to Config::get() and PConfig::get() 2016-06-10 12:00:34 +02:00
Contact.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
contact_selectors.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
contact_widgets.php
conversation.php
create_shadowentry.php
cron.php
cronhooks.php
cronjobs.php
crypto.php
datetime.php
dba.php
dba_pdo.php
dbclean.php
dbm.php
dbstructure.php
dbupdate.php
delivery.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
dfrn.php
diaspora.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
directory.php
DirSearch.php
discover_poco.php
email.php
Emailer.php
enotify.php *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 2016-12-19 14:27:16 +01:00
event.php
expire.php
fcontact.php
features.php
feed.php
files.php
follow.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
ForumManager.php
friendica_smarty.php
gprobe.php
group.php
html2bbcode.php
html2plain.php
HTTPExceptions.php
identity.php
items.php
like.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
lock.php
map.php
message.php
msgclean.php
nav.php
network.php
NotificationsManager.php
notifier.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
oauth.php
oembed.php
onepoll.php
ostatus.php
ParseUrl.php
pgettext.php
Photo.php
photos.php
pidfile.php
plaintext.php
plugin.php
poller.php
post_update.php
Probe.php
profile_selectors.php
profile_update.php
pubsubpublish.php
queue.php Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
queue_fn.php
quoteconvert.php
redir.php Coding convention applied: 2016-12-20 10:12:31 +01:00
remove_contact.php Some brackets added 2016-11-28 22:18:37 +00:00
salmon.php added more curly braces + space between "if" and brace 2016-12-20 17:58:34 +01:00
Scrape.php
security.php
session.php
shadowupdate.php
Smilies.php
socgraph.php
spool_post.php
system_unavailable.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tags.php
tagupdate.php
template_processor.php better logger format, some comments 2014-04-27 15:18:43 +02:00
text.php
threads.php
threadupdate.php
uimport.php
update_gcontact.php
user.php
xml.php