* remotes/upstream/master:
DE strings
implement max load average before queuing/deferring delivery and poller processes
yet another bug in remote_friends_in_common
string update
use html symbols for double quotes
string update
proofreading the mail templates in fr fixed typo, grammar, spelling…
validate_url() and validate_email() validate also IP address.
* master:
* remotes/upstream/master:
diabook-theme: small fix
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
* master:
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: made boxes at right_aside sortable
use cid rather than uid in perms
Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
use mysql replace on cache items
fixing common friends
rev update
Moved Meta Viewport from global head.tpl to diabook's header
* master:
* remotes/upstream/master:
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
diabook-theme: tryied to improve performance a bit
diabook-theme: fix footer/impressum
missing param
provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
delineate the new profile changes from the rest of the text
how did that happen?
shuffle results of remote_common_friends widget
only validate once
perform basic validation
* master:
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.
I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
* remotes/upstream/master:
final touches - show friends in common with total strangers from different sites
fix size
cross fingers
reduce the scope a bit
add template
fn not found
really fat fingers today - though none of this has gone further than my own site
another one
typo
first try common friends for visitors
* master:
