Michael 3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon ...

Conflicts:
	include/bbcode.php

2017-04-20 05:44:31 +00:00

..

_well_known.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

acctlink.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

acl.php

Left trim at sign from nicks in ACL

2017-04-10 22:09:49 -04:00

admin.php

Issue 3157: No fulltext anymore

2017-04-18 20:09:05 +00:00

allfriends.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

amcd.php

Normalize App parameter declaration (mod folder, 1 out of 3)

2017-01-09 23:12:54 +11:00

api.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

apps.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

attach.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

babel.php

Improve babel page display for diaspora2bb mode

2017-03-26 19:06:22 -04:00

bookmarklet.php

Normalize App parameter declaration (mod folder, 1 out of 3)

2017-01-09 23:12:54 +11:00

cal.php

Added a whitespace between comma and t()

2017-04-08 16:57:24 +02:00

cb.php

Normalize App parameter declaration (mod folder, 1 out of 3)

2017-01-09 23:12:54 +11:00

common.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

community.php

Issue 3248: Make communityhome work again.

2017-03-26 05:29:24 +00:00

contactgroup.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

contacts.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

content.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

credits.php

Normalize App parameter declaration (mod folder, 1 out of 3)

2017-01-09 23:12:54 +11:00

crepair.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

delegate.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

dfrn_confirm.php

Merge branch 'develop' into rewrites/coding-convention-split2

2017-04-01 22:16:08 +02:00

dfrn_notify.php

Merge branch 'develop' into rewrites/coding-convention-split2

2017-04-01 22:16:08 +02:00

dfrn_poll.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

dfrn_request.php

Added a whitespace between comma and t()

2017-04-08 16:57:24 +02:00

directory.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

dirfind.php

Remove more deprecated "poco_check" calls

2017-03-22 07:11:58 +00:00

display.php

Bugfix: fix the author image in the meta elements in html head (display module)

2017-01-30 15:23:44 +01:00

editpost.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

events.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

fbrowser.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

fetch.php

We fetched a little bit too much ...

2017-01-15 15:06:32 +00:00

filer.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

filerm.php

Normalize App parameter declaration (mod folder, 1 out of 3)

2017-01-09 23:12:54 +11:00

follow.php

Added a whitespace between comma and t()

2017-04-08 16:57:24 +02:00

friendica.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

fsuggest.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

group.php

Added a whitespace between comma and t()

2017-04-08 16:57:24 +02:00

hcard.php

Normalize App parameter declaration (mod folder, 1 out of 3)

2017-01-09 23:12:54 +11:00

help.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

home.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

hostxrd.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

hovercard.php

Fix for MySQL 5.7+

2017-04-11 23:00:45 +02:00

ignored.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

install.php

Default UTF8MB4 for CREATE DATABASE

2017-04-16 16:04:38 +02:00

invite.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

item.php

added spaces + used x ()

2017-04-01 22:12:53 +02:00

like.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

localtime.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

lockview.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

login.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

lostpass.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

maintenance.php

If the maintenance reason is a url, then redirect to this address

2017-03-19 19:03:09 +00:00

manage.php

Continued:

2017-03-25 13:15:42 +01:00

manifest.php

Web app manifest (fixes #3317)

2017-04-13 16:46:36 +02:00

match.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

message.php

SQL AS for messages

2017-04-17 15:01:05 +02:00

modexp.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

mood.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

msearch.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

navigation.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

network.php

Issue 3157: No fulltext anymore

2017-04-18 20:09:05 +00:00

newmember.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

nodeinfo.php

Remove parendingsdas

2017-03-26 13:12:02 +00:00

nogroup.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

noscrape.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

notes.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

notice.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

notifications.php

Remove extra htmlentities in notifications

2017-04-18 19:34:46 -04:00

notify.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

oembed.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

oexchange.php

Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

2017-01-12 07:25:44 +00:00

openid.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

opensearch.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

ostatus_subscribe.php

Normalize App parameter declaration (mod folder, 2 out of 3)

2017-01-09 23:14:25 +11:00

p.php

As well here ...

2017-01-15 15:18:31 +00:00

parse_url.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

photo.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

photos.php

MySQL ANY_VALUE with fallback to MIN

2017-04-15 00:42:44 +02:00

ping.php

Fix ping_init SQL

2017-04-12 18:54:54 +02:00

poco.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

poke.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

post.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

pretheme.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

probe.php

Avoid possible problems with numeric nicknames and GNU Social

2017-04-09 04:29:02 +00:00

profile_photo.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

profile.php

Fix profile wrong DISTINCT + ORDER BY

2017-04-12 18:49:29 +02:00

profiles.php

More general date test for dob

2017-04-16 15:36:01 +02:00

profperm.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

proxy.php

removed conflict solving remains, took from upstream/develop

2016-12-22 09:14:14 +01:00

pubsub.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

pubsubhubbub.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

qsearch.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

randprof.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

receive.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

redir.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

register.php

Added a whitespace between comma and t()

2017-04-08 16:57:24 +02:00

regmod.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

removeme.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

repair_ostatus.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

rsd_xml.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

salmon.php

Reworked OStatus communication part to better support Mastodon.

2017-04-19 21:37:00 +00:00

search.php

Issue 3157: No fulltext anymore

2017-04-18 20:09:05 +00:00

session.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

settings.php

Merge branch 'develop' into space_before_t

2017-04-08 23:17:31 -04:00

share.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

smilies.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

starred.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

statistics_json.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

subthread.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

suggest.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

tagger.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

tagrm.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

toggle_mobile.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

uexport.php

Added a whitespace between comma and t()

2017-04-08 16:57:24 +02:00

uimport.php

Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

2017-01-12 07:25:44 +00:00

update_community.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

update_display.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

update_network.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

update_notes.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

update_profile.php

Normalize App parameter declaration (mod folder, 3 out of 3)

2017-01-09 23:14:55 +11:00

videos.php

MySQL ANY_VALUE with fallback to MIN

2017-04-15 00:42:44 +02:00

view.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

viewcontacts.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

viewsrc.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

wall_attach.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

wall_upload.php

make use of Config class

2017-03-25 21:07:12 +01:00

wallmessage.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00

webfinger.php

Avoid possible problems with numeric nicknames and GNU Social

2017-04-09 04:29:02 +00:00

worker.php

Now there is only the worker.

2017-02-26 23:16:49 +00:00

xrd.php

Revert "Coding convention applied - part 1"

2017-03-21 12:02:59 -04:00