Merge pull request #456 from pixelroot/master

New Theme "Smoothly"

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

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

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

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

new file:   view/theme/smoothly/icons/dot.png
new file:   view/theme/smoothly/lang_selector.tpl
modified:   view/theme/smoothly/login.tpl
modified:   view/theme/smoothly/style.css
new file:   view/theme/smoothly/wall_thread.tpl
new file:   view/theme/smoothly/wallwall_thread.tpl

modified:   view/theme/smoothly/comment_item.tpl
modified:   view/theme/smoothly/contact_template.tpl
modified:   view/theme/smoothly/jot-header.tpl
modified:   view/theme/smoothly/jot.tpl
modified:   view/theme/smoothly/login.tpl
modified:   view/theme/smoothly/photo_top.tpl
modified:   view/theme/smoothly/profile_entry.tpl
modified:   view/theme/smoothly/profile_vcard.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
view/theme/smoothly/icons/
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl

view/theme/smoothly/icons/
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl

allow comments on other folks wall-to-wall postings

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

update writable for dfrn contacts when using local delivery

rev update

Merge pull request #457 from fermionic/testbubble-broken-with-threading

Add wall_thread and wallwall_thread

conversation.tpl doesnt appear to be necessary

add threading files to make testbubble not broken with threading

view/theme/smoothly/lang_selector.tpl

modified:   view/theme/smoothly/style.css

ignore exif orientation if we can't parse the particular flavour of exif

deleted:    view/theme/smoothly/back-gradient.jpg
modified:   view/theme/smoothly/style.css

new file:   view/theme/smoothly/login.tpl

view/theme/smoothly/login.tpl

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

remote_user can now support multiple contacts being logged in at once

rev update

Merge pull request #455 from fermionic/previews-dont-work

conversation needs preview parameter

conversation needs preview parameter

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

attachments from non-friendica contacts shouldn't go through redir - it won't work

rev update

Merge pull request #454 from CyberDomovoy/mass_vhost

VirtualDocumentRoot and mod_rewrite

Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot

new file:   view/theme/smoothly/back-gradient.jpg
new file:   view/theme/smoothly/calendar.png
new file:   view/theme/smoothly/comment_item.tpl
new file:   view/theme/smoothly/connect.png
new file:   view/theme/smoothly/contact_template.tpl
new file:   view/theme/smoothly/conversation.tpl
new file:   view/theme/smoothly/group_drop.tpl
new file:   view/theme/smoothly/group_edit.tpl
new file:   view/theme/smoothly/group_side.tpl
new file:   view/theme/smoothly/groups.png
new file:   view/theme/smoothly/icons.png
new file:   view/theme/smoothly/icons.svg
new file:   view/theme/smoothly/jot-header.tpl
new file:   view/theme/smoothly/jot.tpl
new file:   view/theme/smoothly/lock.cur
new file:   view/theme/smoothly/login-bg.gif
new file:   view/theme/smoothly/lrarrow.gif
new file:   view/theme/smoothly/mail_head.tpl
new file:   view/theme/smoothly/match.tpl
new file:   view/theme/smoothly/menu-user-pin.jpg
new file:   view/theme/smoothly/menu-user-pin.png
new file:   view/theme/smoothly/nav-bg.png
new file:   view/theme/smoothly/nav.tpl
new file:   view/theme/smoothly/nets.tpl
new file:   view/theme/smoothly/next.png
new file:   view/theme/smoothly/notifications.png
new file:   view/theme/smoothly/photo-menu.jpg
new file:   view/theme/smoothly/photo_album.tpl
new file:   view/theme/smoothly/photo_top.tpl
new file:   view/theme/smoothly/photo_view.tpl
new file:   view/theme/smoothly/photography.png
new file:   view/theme/smoothly/premium.png
new file:   view/theme/smoothly/prev.png
new file:   view/theme/smoothly/profile_entry.tpl
new file:   view/theme/smoothly/profile_vcard.tpl
new file:   view/theme/smoothly/saved_searches_aside.tpl
new file:   view/theme/smoothly/screenshot.jpg
new file:   view/theme/smoothly/screenshot.png
new file:   view/theme/smoothly/search.png
new file:   view/theme/smoothly/search_item.tpl
new file:   view/theme/smoothly/star.png
new file:   view/theme/smoothly/style.css
new file:   view/theme/smoothly/theme.php
new file:   view/theme/smoothly/user.png
new file:   view/theme/smoothly/wall_item.tpl
new file:   view/theme/smoothly/wallwall_item.tpl

deleted:    view/theme/softy/back-gradient.jpg
deleted:    view/theme/softy/calendar.png
deleted:    view/theme/softy/comment_item.tpl
deleted:    view/theme/softy/connect.png
deleted:    view/theme/softy/contact_template.tpl
deleted:    view/theme/softy/conversation.tpl
deleted:    view/theme/softy/group_drop.tpl
deleted:    view/theme/softy/group_edit.tpl
deleted:    view/theme/softy/group_side.tpl
deleted:    view/theme/softy/groups.png
deleted:    view/theme/softy/icons.png
deleted:    view/theme/softy/icons.svg
deleted:    view/theme/softy/jot-header.tpl
deleted:    view/theme/softy/jot.tpl
deleted:    view/theme/softy/lock.cur
deleted:    view/theme/softy/login-bg.gif
deleted:    view/theme/softy/lrarrow.gif
deleted:    view/theme/softy/mail_head.tpl
deleted:    view/theme/softy/match.tpl
deleted:    view/theme/softy/menu-user-pin.jpg
deleted:    view/theme/softy/menu-user-pin.png
deleted:    view/theme/softy/nav-bg.png
deleted:    view/theme/softy/nav.tpl
deleted:    view/theme/softy/nets.tpl
deleted:    view/theme/softy/next.png
deleted:    view/theme/softy/notifications.png
deleted:    view/theme/softy/photo-menu.jpg
deleted:    view/theme/softy/photo_album.tpl
deleted:    view/theme/softy/photo_top.tpl
deleted:    view/theme/softy/photo_view.tpl
deleted:    view/theme/softy/photography.png
deleted:    view/theme/softy/premium.png
deleted:    view/theme/softy/prev.png
deleted:    view/theme/softy/profile_entry.tpl
deleted:    view/theme/softy/profile_vcard.tpl
deleted:    view/theme/softy/saved_searches_aside.tpl
deleted:    view/theme/softy/screenshot.jpg
deleted:    view/theme/softy/screenshot.png
deleted:    view/theme/softy/search.png
deleted:    view/theme/softy/search_item.tpl
deleted:    view/theme/softy/star.png
deleted:    view/theme/softy/style.css
deleted:    view/theme/softy/theme.php
deleted:    view/theme/softy/user.png
deleted:    view/theme/softy/wall_item.tpl
deleted:    view/theme/softy/wallwall_item.tpl
view/theme/smoothly/

DE strings (pokes THX @zottel)

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

rev update

Merge pull request #452 from fabrixxm/master

 quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas

quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas

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

rev update

Merge pull request #451 from fabrixxm/master

fixes and tweaks

quattro: remove 'experimental'

quattro: fix live update

deleted:    view/theme/softy/style.alex
deleted:    view/theme/softy/style.alt

new file:   view/theme/softy/back-gradient.jpg
new file:   view/theme/softy/calendar.png
new file:   view/theme/softy/comment_item.tpl
new file:   view/theme/softy/connect.png
new file:   view/theme/softy/contact_template.tpl
new file:   view/theme/softy/conversation.tpl
new file:   view/theme/softy/group_drop.tpl
new file:   view/theme/softy/group_edit.tpl
new file:   view/theme/softy/group_side.tpl
new file:   view/theme/softy/groups.png
new file:   view/theme/softy/icons.png
new file:   view/theme/softy/icons.svg
new file:   view/theme/softy/jot-header.tpl
new file:   view/theme/softy/jot.tpl
new file:   view/theme/softy/lock.cur
new file:   view/theme/softy/login-bg.gif
new file:   view/theme/softy/lrarrow.gif
new file:   view/theme/softy/mail_head.tpl
new file:   view/theme/softy/match.tpl
new file:   view/theme/softy/menu-user-pin.jpg
new file:   view/theme/softy/menu-user-pin.png
new file:   view/theme/softy/nav-bg.png
new file:   view/theme/softy/nav.tpl
new file:   view/theme/softy/nets.tpl
new file:   view/theme/softy/next.png
new file:   view/theme/softy/notifications.png
new file:   view/theme/softy/photo-menu.jpg
new file:   view/theme/softy/photo_album.tpl
new file:   view/theme/softy/photo_top.tpl
new file:   view/theme/softy/photo_view.tpl
new file:   view/theme/softy/photography.png
new file:   view/theme/softy/premium.png
new file:   view/theme/softy/prev.png
new file:   view/theme/softy/profile_entry.tpl
new file:   view/theme/softy/profile_vcard.tpl
new file:   view/theme/softy/saved_searches_aside.tpl
new file:   view/theme/softy/screenshot.jpg
new file:   view/theme/softy/screenshot.png
new file:   view/theme/softy/search.png
new file:   view/theme/softy/search_item.tpl
new file:   view/theme/softy/star.png
new file:   view/theme/softy/style.alex
new file:   view/theme/softy/style.alt
new file:   view/theme/softy/style.css
new file:   view/theme/softy/theme.php
new file:   view/theme/softy/user.png
new file:   view/theme/softy/wall_item.tpl
new file:   view/theme/softy/wallwall_item.tpl

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

config: fix get_config and get_pconfig search for serialized array
works also if the serialized string contains newlines

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

Merge pull request #450 from fermionic/frost-showmore-border

make the show more line look nicer

make the show more line look nicer

Merge pull request #449 from fermionic/markdownify-breaks-links-with-underscores

manually fix escaped underscores in links

manually fix escaped underscores in links

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

rev update

Merge pull request #448 from fermionic/limit-items-on-all-pages

limit number of items on profile page too

Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags

regular expressions were grabbing too much

Merge pull request #443 from fermionic/new-users-privacy-settings

automatically make posts private for new users

DE: some translations

Merge remote branch 'friendica/master' into bid-prov

quattro: display date info as "ago" with mouse over date stamp

get "ago" information into the mail thread view

quattro: mail_display has no ago information so don't display it

quattro: use "ago" for date information and on mouse the date stamp

pass "ago" information to the mail_list template

quattro: expanded the new prvmessage field a bit

limit number of items on profile page too; add show more back to Frost mobile; some show more fixes

regular expressions were grabbing too much

Merge pull request #446 from fermionic/frost-scrollbars-are-annoying

Frost scrollbars are annoying

remove show more/less from frost mobile--it is too great a load

remove show more/less animation on mobile

Merge pull request #445 from fermionic/frost-scrollbars-are-annoying

Frost scrollbars are annoying

update version

try to get rid of scrollbars in Frost

hey: you missed a spot

add documentation; add to admin panel; some tweaks and interface stuff

Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show

restore nav element to login pages, since system messages are sent in it

restore nav element to login pages, since system messages are sent in it

probably shouldn't require exact match for non-string

Merge pull request #442 from fermionic/frost-image-upload-and-post-local-time

fix image and file upload on frost moble; add support to frost for local...

automatically make posts private for new users

fix image and file upload on frost moble; add support to frost for local post time

Remove wall to wall checking base on @ tags, too heavy for the database.

This should be done when we store the item (https://social.errlock.org/display/domovoy/26698)

wall to wall detection: fallback using @ tags, and check if one is a forum.

Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum)

Logic error

method, not property

Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items

method, not property

Some optimization

Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items

Fix copy/paste stupidity

Better wall to wall detection (fallback on checking if we have a @ tag)

Better wall to wall detection (fallback to finding @ tags)

handle Windows proc_run

rev update

One click comments on threaded items.

comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.

Toplevel items a treaded as non-threaded ones (comment-box is at the bottom)

Sync objects with upstream

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

moods