Merge pull request #483 from fabrixxm/bug471

admin: Don't allow to block or delete site admin in users admin page.

Merge pull request #486 from cvogeley/master

Show notifications in title, ignore OSX .DS_Store files

ignore OSX .DS_Store files

remove .DS_Store

Remove and ignore .DS_Store

ES: bringing the strings to 100% thx to csolisr

Add notifications in title

Pull request #484 (Smoothly)

Merge pull request #485 from tomtom84/master

Corrected titlebar notifications in Diabook.

Corrected titlebar notifications in Diabook

Add titlebar notifications to Dispy.

Add title bar notifications to Smoothly

Gitignore seems to have been overwritten with somebody's personal copy - put the old one back.

admin: Don't allow to block or delete site admin in users admin page. fix bug 471

Merge pull request #482 from pixelroot/master

bug fix

modified:   view/theme/smoothly/style.css

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

Merge pull request #481 from pixelroot/master

Better mark new posts

new file:   view/theme/smoothly/default.php
new file:   view/theme/smoothly/footer.tpl
new file:   view/theme/smoothly/header.tpl
modified:   view/theme/smoothly/nav.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

Merge pull request #480 from pixelroot/master

Bug fixes

fix item_id table

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

rev update

bug 479 - typo in database.sql

Merge pull request #478 from fermionic/frost-improvements

Frost improvements

missed one

various bug fixes

frost: added some missing baseurls to nav.tpl

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

Make 'Friendika' 'Friendica' in open search.

DE: update to the strings

permissions selector showing up for guests, testbubble and smoothly

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

rev update - add cancel markup to editor

DE: update to the strings

Merge pull request #470 from CyberDomovoy/html5-treebuilder-namespace-error

Detect the namespace uri from token name

Merge pull request #477 from fermionic/private-image-failure

Private image failure

make size search less greedy

fix permissions for uploaded images with size specified

new file:   view/theme/smoothly/bottom.tpl
new file:   view/theme/smoothly/js/jquery.autogrow.textarea.js
new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.js
new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.min.js

modified:   view/theme/smoothly/style.css

Merge pull request #476 from pixelroot/master

new funktion

new file:   view/theme/smoothly/down.png

modified:   view/theme/smoothly/style.css

Merge pull request #475 from pixelroot/master

Bugs

quattro: lilac color schema

DE: update to the strings

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

quattro: mail link to profile page

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

ostatus disabled typo

modified:   view/theme/smoothly/style.css

Merge pull request #474 from pixelroot/master

Bug fix

modified:   view/theme/smoothly/style.css

Merge pull request #473 from pixelroot/master

Editor redesign

deleted:    view/theme/smoothly/group_edit.tpl

Merge pull request #472 from pixelroot/master

Group-Edit bug

deleted:    view/theme/smoothly/default.php
modified:   view/theme/smoothly/nav.tpl

Merge pull request #471 from pixelroot/master

Theme Smoothly

new file:   view/theme/smoothly/default.php

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

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

typo on previous checkin - set max number of images for an inserted link, default 2.

Transform prefixed elements to classic ones

Better integration with the existing code

Detect the namespace uri from token name

reverse the default newuser privacy setting to public. Sites can over-ride.

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