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

provide separate hashtag and mentions for themes in addition to composite tags

rev update

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

Friendicaland

Merge pull request #469 from pixelroot/master

Theme Smoothly

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

Merge pull request #468 from pixelroot/master

Theme Smoothly

modified:   view/theme/smoothly/star.png
modified:   view/theme/smoothly/theme.php

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

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

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

Merge pull request #467 from fermionic/frost-mobile-toggle-mobile

add mobile toggle to frost mobile

add mobile toggle to frost mobile

allow events to be ignored

don't allow followers to get a post through unless it's a tag deliver

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

use local photo for tag notifications if available

rev update

Couple of spare smiley images removed.

Should have been deleted when these got moved to smiley_pack

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

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

Merge pull request #466 from pixelroot/master

Theme Smoothly

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/theme.php

modified:   view/theme/smoothly/style.css

Merge pull request #465 from CyberDomovoy/Imagick

Fallback to gd if Imagick can't load the data

Fallback to gd if Imagick can't load the data

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

rev update + multiple profile photos

Merge pull request #464 from pixelroot/master

theme smoothly

new file:   view/theme/smoothly/generic_links_widget.tpl
modified:   view/theme/smoothly/style.css

new file:   view/theme/smoothly/arrow.png
new file:   view/theme/smoothly/categories_widget.tpl
modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

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

DE: update to the strings

bring back comment edit buttons

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

rev update

Merge pull request #462 from CyberDomovoy/threaded_items

Threaded items, objects

Merge pull request #463 from pixelroot/master

Version 0.5

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

modified:   style.css

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

deleted:    view/theme/smoothly/comment_item.tpl
deleted:    view/theme/smoothly/moderated_comment.tpl
modified:   view/theme/smoothly/style.css

new file:   view/theme/smoothly/follow.tpl
new file:   view/theme/smoothly/peoplefind.tpl
modified:   view/theme/smoothly/style.css

modified:   view/theme/smoothly/style.css

Tabs trouble? What happened? I sure aven't changed anything to my editor...

Port friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994

Port friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1

Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd

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

Conflicts:
include/conversation.php

remove mobile file

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

rev update + bug 477 'Romania' misspelled

DE: getting the strings back to 100%

Romania typo.

frost-mobile:  was missing infront of the nav-images

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

provide option to view photo albums in posted order (rather than blog order)

rev update

Merge pull request #461 from pixelroot/master

Version 0.4

deleted:    view/theme/smoothly/mobile

deleted:    view/theme/smoothly/icons/dot.png
deleted:    view/theme/smoothly/js/jquery.ae.image.resize.js
deleted:    view/theme/smoothly/js/jquery.ae.image.resize.min.js

modified:   view/theme/smoothly/comment_item.tpl
new file:   view/theme/smoothly/dot.png
new file:   view/theme/smoothly/moderated_comment.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
deleted:    view/theme/smoothly/icons/dot.png
deleted:    view/theme/smoothly/js/jquery.ae.image.resize.js
deleted:    view/theme/smoothly/js/jquery.ae.image.resize.min.js

new file:   view/theme/smoothly/js/jquery.ae.image.resize.js
new file:   view/theme/smoothly/js/jquery.ae.image.resize.min.js
modified:   view/theme/smoothly/theme.php

Merge pull request #460 from fermionic/frost-mobile-settings-and-add-contact

add settings sections and "add contacts"; other tweaks and fixes

add settings sections and add contacts; other tweaks and fixes

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

modified:   view/theme/smoothly/style.css

new file:   view/theme/smoothly/mobile

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

provide local_block - block_public as far as content but can connect with the grid.

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

rev update

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

Typo in notifier.

Merge pull request #459 from fermionic/individual-choice-of-mobile-theme

Individual choice of mobile theme

Merge pull request #458 from fermionic/twitter-profile-picture-too-small

small twitter improvements

small twitter improvements

mark all mobile themes

allow individual choice of mobile themes

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