Merge remote branch 'upstream/master'

string update

positional params in "was tagged in a photo" string

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

put 1i8n position orders in welcome string

Depublish public posts when archiving a contact

Changes to make contacts delete all content from the user when a user is deleted.

NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.

Please check carefully. I tested locally on my server, but not with other
servers.

Merge pull request #521 from fermionic/20121101-updates

Various updates

no profile pic on photos page if no photos have been uploaded

update_display for display live updates

display live update; don't collapse comments on live update

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

rev update

add a confirm dialog and a busy rotator for delete selected

prevent double posting of status updates and comments

Merge pull request #520 from fermionic/20121101-auto-redir-and-theme-threading

auto redir and theme threading

get rid of stray file

fix theme control of allowing threading

don't try to auto redir if I'm a blocked or pending contact

vier: threads

ES: update to the strings

FR: update to the strings

IT: update to the strings

poco - ignore archived contacts

rev update

rev update

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

Merge pull request #516 from fermionic/20121029-auto-redir-fix

make sure that the contact is local for auto redir

Merge pull request #517 from fermionic/20121029-wall-live-commenting

add live div to wall page

Merge pull request #518 from fermionic/20121029-email-polling-array-size

don't combine msg and meta arrays unless they're the same size

Merge pull request #519 from fermionic/20121029-delete-duplicate-template-files

delete template files that are identical to the defaults

missed quattro threaded_conversation live update field

delete template files that are identical to the defaults

don't combine msg and meta arrays unless they're the same size

add live div to wall page

make sure that the contact is local for auto redir

rev update

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

revive "mark everything seen" on main network page - see comments

view/theme/smoothly/screenshot.png

new file:   view/theme/smoothly/images/arrow.png
new file:   view/theme/smoothly/images/calendar.png
new file:   view/theme/smoothly/images/connect.png
new file:   view/theme/smoothly/images/dot.png
new file:   view/theme/smoothly/images/down.png
new file:   view/theme/smoothly/images/file.gif
new file:   view/theme/smoothly/images/groups.png
new file:   view/theme/smoothly/images/icons.png
new file:   view/theme/smoothly/images/icons.svg
new file:   view/theme/smoothly/images/login-bg.gif
new file:   view/theme/smoothly/images/lrarrow.gif
new file:   view/theme/smoothly/images/menu-user-pin.jpg
new file:   view/theme/smoothly/images/menu-user-pin.png
new file:   view/theme/smoothly/images/nav-bg.png
new file:   view/theme/smoothly/images/next.png
new file:   view/theme/smoothly/images/notifications.png
new file:   view/theme/smoothly/images/photo-menu.jpg
new file:   view/theme/smoothly/images/photography.png
new file:   view/theme/smoothly/images/premium.png
new file:   view/theme/smoothly/images/prev.png
new file:   view/theme/smoothly/images/search.png
new file:   view/theme/smoothly/images/shiny.png
new file:   view/theme/smoothly/images/star.png
new file:   view/theme/smoothly/images/tobottom.png
new file:   view/theme/smoothly/images/totop.png
new file:   view/theme/smoothly/images/user.png

deleted:    view/theme/smoothly/arrow.png
deleted:    view/theme/smoothly/calendar.png
deleted:    view/theme/smoothly/connect.png
modified:   view/theme/smoothly/css/typography.css
deleted:    view/theme/smoothly/dot.png
deleted:    view/theme/smoothly/down.png
deleted:    view/theme/smoothly/file.gif
deleted:    view/theme/smoothly/groups.png
deleted:    view/theme/smoothly/icons.png
deleted:    view/theme/smoothly/icons.svg
deleted:    view/theme/smoothly/login-bg.gif
deleted:    view/theme/smoothly/lrarrow.gif
deleted:    view/theme/smoothly/menu-user-pin.jpg
deleted:    view/theme/smoothly/menu-user-pin.png
deleted:    view/theme/smoothly/nav-bg.png
modified:   view/theme/smoothly/nav.tpl
deleted:    view/theme/smoothly/nets.tpl
deleted:    view/theme/smoothly/next.png
deleted:    view/theme/smoothly/notifications.png
deleted:    view/theme/smoothly/photo-menu.jpg
deleted:    view/theme/smoothly/photo_album.tpl
deleted:    view/theme/smoothly/photo_top.tpl
deleted:    view/theme/smoothly/photo_view.tpl
deleted:    view/theme/smoothly/photography.png
deleted:    view/theme/smoothly/premium.png
deleted:    view/theme/smoothly/prev.png
deleted:    view/theme/smoothly/profile_entry.tpl
deleted:    view/theme/smoothly/profile_vcard.tpl
deleted:    view/theme/smoothly/saved_searches_aside.tpl
deleted:    view/theme/smoothly/screenshot.png
deleted:    view/theme/smoothly/search.png
deleted:    view/theme/smoothly/search_item.tpl
deleted:    view/theme/smoothly/shiny.png
deleted:    view/theme/smoothly/star.png

Merge pull request #515 from simonlnu/master

fixed the silly preview bug

fix for preview post thingy blocking the posting buttons

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

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