added braces, opps

Signed-off-by: Roland Häder <roland@mxchange.org>

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

Signed-off-by: Roland Haeder <roland@mxchange.org>

always surround operators like +,-,. with spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

opps, missed this space ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

Opps, fixed parser errors

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued:
- added curly braces/spaces
- added TODOs (type-hints, old-lost code)
- more usage of dbm::is_result()
- combined some if() return stuff into a simple return statement

Signed-off-by: Roland Haeder <roland@mxchange.org>

tpzo fixed ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added space + type-hinted $a (App)

Signed-off-by: Roland Haeder <roland@mxchange.org>

added space

Signed-off-by: Roland Haeder <roland@mxchange.org>

fixed intending

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed some parentheses, but left them in where a string was concated

Signed-off-by: Roland Haeder <roland@mxchange.org>

Continued a bit:
- rewrote 2 multi-line single comments to one multi-line comment
- added TODO for rewriting function to closure (CR request)

Signed-off-by: Roland Haeder <roland@mxchange.org>

fixed spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

CR: added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3339 from Hypolite/issue/#2803-icons

Change icon of contact page links

Merge pull request #3335 from annando/issue-3331

Issue 3331: Remove unneeded table "deliverq"

Merge pull request #3319 from Hypolite/issue/#3316

Use get_contact_by_url for unknown contacts in acl_lookup

Change icon of contact page links

Add htmlentities to protect nick/addr in acl_lookup

Merge pull request #3338 from annando/issue-3336

Issue 3336: The date format should now be okay

Issue 3336: The date format should now be okay

Changed documentation

Merge pull request #3330 from Rudloff/feature/keypress

Scroll to next/previous thread when pressing j/k (fixes #3327)

Merge pull request #3332 from Rudloff/feature/manifest

Web app manifest (fixes #3317)

Doc about j/k keyboard shortcuts

Web app manifest (fixes #3317)

Scroll to next/previous thread when pressing j/k (fixes #3327)

Removed it here as well

Removed documentation

Issue 3331: Removed unneeded table "deliverq"

Merge pull request #3329 from Alkarex/sql-type-contact.contact-type

Allow negative contact.contat-type

Fiddling with the unknown contact array values

Bump update version

Bump DB version

Allow negative contact.contat-type

https://github.com/friendica/friendica/issues/3328

Add error handling for missing contacts

Merge pull request #3315 from Hypolite/issue/#3285

Add spoiler tags for Mastodon Content Warning

Use get_contact_details_by_url for unknown contacts

- Fix typo
- Fix comment
- Fix closure

Added "braces" for @annando

Merge pull request #3320 from Hypolite/issue/#3292

Ignore Activity Streams `delete` messages from Mastodon

Ignore Activity Streams `delete` messages from Mastodon

Add network for unknown contacts in ACL

Left trim at sign from nicks in ACL

Rewrote code according to @annando feedback

- Normalize boolean operators

Add Content Warning support for comments too

Doh!

Add spoiler tags for Mastodon Content Warning

Merge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs

Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0

Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0

Merge pull request #3311 from tobiasd/20170409-ru

RU translations THX pztrn

RU translations THX pztrn

Merge pull request #3310 from annando/1704-probing

Avoid possible problems with numeric nicknames and GNU Social

Avoid possible problems with numeric nicknames and GNU Social

Merge pull request #3307 from rebeka-catalina/space_before_t

Space before t

Merge branch 'develop' into space_before_t

opps, missed this one.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs

Desktop-Notifs: include the user id into the storage key for local browser storage

Desktop-Notifs: include the user id into the storage key for local browser storage

not on develop was this code in, but here? :-/

Signed-off-by: Roland Haeder <roland@mxchange.org>

huh? missed again

Signed-off-by: Roland Haeder <roland@mxchange.org>

more spaces! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

more spaces + curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

more spaces and curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>

curly braces were missing again ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

more spaces again ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

some more spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added curly braces + spaces (CR)

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces (CR)

Signed-off-by: Roland Haeder <roland@mxchange.org>

again develop and this branch differs ... (no blame on cherry-picking though)

Signed-off-by: Roland Haeder <roland@mxchange.org>

opps, was somehow missed to cherry-pick/merge ?

+ converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>

Opps!

Signed-off-by: Roland Haeder <roland@mxchange.org>

Cleanups:
- made SQL keywords all uper-case
- put all SQL columns in back-ticks
- added curly braces
- added/removed spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

more spaces + curly braces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

removed spaces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

huh? was in develop branch but not here?

Signed-off-by: Roland Haeder <roland@mxchange.org>

no spaces here ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge pull request #3304 from rebeka-catalina/local_dir_warning

Local dir warning

more spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>

added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>

more spaces + curly braces + converted multiple single-line comments to one mult-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>

fixed spacing + intending

Signed-off-by: Roland Haeder <roland@mxchange.org>

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

The other lone comma in 1177

Added a whitespace between comma and t()

Modified the warning message

Deleted the lone comma between paratheses

Correction of 1177 and added modification to 1171

Merge pull request #3306 from Hypolite/issue/#3274

Fix path to default Text_Highlighter CSS

Fix path to default Text_Highlighter CSS

Merge branch 'develop' of git://github.com/friendica/friendica into develop

adding space for readability

Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button

Bugfix: there was a gui issue on the navbar account dropdown button

Bugfix: there was a gui issue on the navbar account dropdown button

Warning, that profile published in local directory may be visible in public

Merge pull request #3303 from annando/1704-duplicate-feed

Avoid duplicates with feeds and "remote self"

Warning, that profile published in local directory may be visible in public