Michael Vogel 307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment ... Conflicts: include/ostatus.php		2015-12-22 11:25:37 +01:00
..
Contact.php	Bugfix: The bbcode conversion of the profile was inconsistent	2015-12-14 23:53:35 +01:00
Emailer.php	…
Photo.php	…
Scrape.php	Code beautification	2015-12-06 18:57:23 +01:00
acl_selectors.php	…
api.php	change api/user/group_* to api/friendica/group_*	2015-12-07 22:18:55 +01:00
attach.php	…
auth.php	Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment	2015-12-22 11:25:37 +01:00
auth_ejabberd.php	…
bb2diaspora.php	…
bbcode.php	…
cache.php	…
cli_startup.php	…
config.php	…
contact_selectors.php	…
contact_widgets.php	…
conversation.php	Bugfix: Warning because of undefined constant	2015-12-13 09:43:47 +01:00
cron.php	Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.	2015-12-15 23:26:58 +01:00
cronhooks.php	Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.	2015-12-15 23:26:58 +01:00
crypto.php	…
datetime.php	…
dba.php	…
dba_pdo.php	…
dbstructure.php	modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0.	2015-12-04 19:49:09 +00:00
dbupdate.php	…
delivery.php	Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment	2015-12-22 11:25:37 +01:00
diaspora.php	…
directory.php	…
discover_poco.php	Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.	2015-12-15 23:26:58 +01:00
dsprphotoq.php	…
email.php	…
enotify.php	…
event.php	…
expire.php	…
fcontact.php	…
features.php	…
feed.php	…
files.php	…
follow.php	…
forums.php	…
friendica_smarty.php	…
gprobe.php	…
group.php	…
html2bbcode.php	…
html2plain.php	…
identity.php	Bugfix: The bbcode conversion of the profile was inconsistent	2015-12-14 23:53:35 +01:00
items.php	Just one more place where we had forgotten to use the bbcode function for the about text	2015-12-15 00:11:19 +01:00
lock.php	…
map.php	…
message.php	…
msgclean.php	…
nav.php	…
network.php	…
notifier.php	Rearrangements	2015-12-14 22:39:52 +01:00
oauth.php	…
oembed.php	…
onepoll.php	…
ostatus.php	Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment	2015-12-22 11:25:37 +01:00
pgettext.php	…
photos.php	…
pidfile.php	…
plaintext.php	…
plugin.php	…
poller.php	Bugfix for the maximum load check in worker.	2015-12-16 00:14:53 +01:00
profile_selectors.php	…
profile_update.php	…
pubsubpublish.php	Only optical stuff	2015-12-14 00:42:36 +01:00
queue.php	…
queue_fn.php	…
quoteconvert.php	…
redir.php	…
remoteupdate.php	…
salmon.php	Code cleanup and first steps for a better comment distribition with DFRN and OStatus	2015-12-13 12:15:45 +01:00
security.php	…
session.php	Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment	2015-12-22 11:25:37 +01:00
shadowupdate.php	…
socgraph.php	Bugfix for pull request #2147 (Fix for issue #2122)	2015-12-06 20:05:57 +01:00
system_unavailable.php	…
tags.php	…
tagupdate.php	…
template_processor.php	…
text.php	…
threads.php	…
threadupdate.php	…
uimport.php	…
update_gcontact.php	…
user.php	…