Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Friendicaland - remove states no longer flying the Friendica banner.
  deleted:    view/theme/smoothly/categories_widget.tpl  deleted:    view/theme/smoothly/contact_template.tpl  deleted:    view/theme/smoothly/footer.tpl  deleted:    view/theme/smoothly/generic_links_widget.tpl  deleted:    view/theme/smoothly/group_drop.tpl  deleted:    view/theme/smoothly/group_side.tpl  deleted:    view/theme/smoothly/header.tpl  deleted:    view/theme/smoothly/mail_head.tpl  deleted:    view/theme/smoothly/message_side.tpl  deleted:    view/theme/smoothly/peoplefind.tpl  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/login.tpl  modified:   view/theme/smoothly/style.css

Friendicaland - remove states no longer flying the Friendica banner.

deleted:    view/theme/smoothly/categories_widget.tpl
deleted:    view/theme/smoothly/contact_template.tpl
deleted:    view/theme/smoothly/footer.tpl
deleted:    view/theme/smoothly/generic_links_widget.tpl
deleted:    view/theme/smoothly/group_drop.tpl
deleted:    view/theme/smoothly/group_side.tpl
deleted:    view/theme/smoothly/header.tpl
deleted:    view/theme/smoothly/mail_head.tpl
deleted:    view/theme/smoothly/message_side.tpl
deleted:    view/theme/smoothly/peoplefind.tpl
modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/login.tpl
modified:   view/theme/smoothly/style.css

Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (23 commits)
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php
  Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
  Diabook - first part of clean-up to make the theme maintainable.
  modified:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/profile_vcard.tpl  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php  new file:   view/theme/smoothly/vcard-widget.tpl
  rev update
  modified:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/default.php  modified:   view/theme/smoothly/nav.tpl  modified:   view/theme/smoothly/style.css  new file:   view/theme/smoothly/tobottom.png
  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php
  IT: update to the strings
  DE: update to the strings
  new file:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php
  DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
  Friendicaland
  undefined fn: init_groups_visitor in mod_profile, rev update
  Diabook - remove redundant TPL to bring back all admin settings
  CS: update to the strings
  ES: update to the strings
  FR: update to the strings
  ...

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).

Diabook - first part of clean-up to make the theme maintainable.

modified:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css

Merge remote branch 'upstream/master'

modified:   view/theme/smoothly/profile_vcard.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
new file:   view/theme/smoothly/vcard-widget.tpl

Merge https://github.com/friendica/friendica into pull

rev update

modified:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/default.php
modified:   view/theme/smoothly/nav.tpl
modified:   view/theme/smoothly/style.css
new file:   view/theme/smoothly/tobottom.png

modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

IT: update to the strings

DE: update to the strings

new file:   view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.

Merge branch 'master' of https://github.com/friendica/friendica

Friendicaland

Merge https://github.com/friendica/friendica into pull

undefined fn: init_groups_visitor in mod_profile, rev update

Diabook - remove redundant TPL to bring back all admin settings

CS: update to the strings

ES: update to the strings

FR: update to the strings

DE: update to the strings

modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

get rid of 'Friendika'

Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  imagick exception
  rev update
  diabook: use proper defaults in popup sidebar config
  diabook boxes: use a common hide/show form entry definition
  remove lots of duplicated code in diabook config handling

Merge https://github.com/friendica/friendica into pull

imagick exception

rev update

Merge pull request #514 from hmeine/master

Cleanups in diabook theme code

diabook: use proper defaults in popup sidebar config

diabook boxes: use a common hide/show form entry definition

remove lots of duplicated code in diabook config handling

merge HEAD

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

Trying this fix for endless redirection

oops - missingfile from last checking, the important one

disabling auto_redir until we prevent it from infinite looping

Merge https://github.com/friendica/friendica into pull

rev update

Merge pull request #513 from unary/photo-comments

Moved comment box on photos to be after the last comment, added text for...

Moved comment box on photos to be after the last comment, added text for the Preview link

DE/FR/PT-BR: update to the strings

Merge branch 'master' of https://github.com/friendica/friendica

German help file images

German helpfiles

Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts

for profile and photos, detect contacts from local hub and auto-redir

Merge pull request #508 from fermionic/no-theme-control-of-live-update-location

allow themes to decide where live updates appear

better fix for threads with no parent showing up as unseen

Merge https://github.com/friendica/friendica into pull

rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared

Merge pull request #507 from fermionic/imagick-profile-photos-squashed

use getWidth and getHeight, which are agnostic to Imagick being enabled

Merge pull request #510 from fermionic/lockview-plugin-support

allow changing the lockview content with a plugin

Merge pull request #511 from fermionic/manage-doesnt-obey-startpage-plugin

add home_init hook to manage to call startpage plugin

Merge https://github.com/friendica/friendica into pull

tinymce tag complete - only replace tagged text

rev update

Typo

Add a link to the wiki from the install guide for nginx, MariaDB, etc

Merge pull request #509 from fermionic/frost-0.3

frost style improvements; various tweaks

for profile and photos, detect contacts from local hub and auto-redir

add home_init hook to manage to call startpage plugin

allow changing the lockview content with a plugin

frost style improvements; various tweaks

allow themes to decide where live updates appear

use getWidth and getHeight, which are agnostic to Imagick being enabled

CS: update to the strings

Merge https://github.com/friendica/friendica into pull

rev update

Merge pull request #506 from hmeine/master

Add link to issue tracker to README

DE/PT-BR: update to the strings

Darkzero - make "visible to" legible.

Add link to issue tracker to README

Since the README is shown on the GitHub page, this makes the issue tracking
more accessible (at least) from there.

Merge https://github.com/friendica/friendica into pull

rev update

Merge pull request #505 from fermionic/nets-broken-in-themes

update themes for new All Networks option

update themes for new All Networks option

Dispy - selecting any network and then switching back to "all networks"
didn't work.  Remove nets.tpl to make it use the default one.

new file:   view/theme/smoothly/file.gif
modified:   view/theme/smoothly/search_item.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

DE: update to the strings

Merge https://github.com/friendica/friendica into pull

rev update

Merge pull request #503 from CyberDomovoy/valid_html

Use saved_searches_aside.tpl in search.php

CS: update to the strings

FR: update to the strings

DE: update to the strings

Merge pull request #504 from cvogeley/master

bring back BB-Code in cleanzero comments

Bring back BB-Code in comments

Use saved_searches_aside.tpl in search.php

Merge pull request #502 from fermionic/frost-categories-update

frost suport for categories and folder updates

frost suport for categories and folder updates

Merge pull request #501 from fermionic/network-remember-filters

don't set a date as a group

don't set a date as a group