* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* master:
* remotes/upstream/master:
prepare for using a master theme_init()
provide theme_init() functions
rev updates
API: API is now enhanced. mentions, repeat and destroy now works.
"vier": Some design stuff
"vier": Bookmarks now look better.
API: template for test function added
The "vier"-theme is now working again. But there is still work needed
New script that checks if a script is running
poller: An optional lockfile is used to check if the poller is already running
Several improvements
* master:
* remotes/upstream/master:
diabook-themes: small fix
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
ignore utf8 offset error for unit tests
had arg order backwards
try assertContains
tag tests cont.
fix autonamenegativelength test
some work on tests
* master:
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section
css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
* remotes/upstream/master:
ignore removed plugins
fix messed up config tables w/ duplicate entries
small fixes for the German strings
fix bad sql update
revert config changes, we're getting duplicate keys
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
* master:
