* remotes/upstream/master:
prevent duplicate friend suggestions
block filed items from deletion
add the bang
network filter is now a permission group
small fix in css
add right_aside to diabook-blue
add connectable services to right_aside
add PostIt to right_aside, fixes in css
* master:
* remotes/upstream/master: (25 commits)
diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
user settings: don't show emoticons
fix in css right_aside
small fix
fix 1024resolution
add right_aside to theme diabook
ability to change tags in edited posts
normalise comparison link on delegation page
quattro(-green) styling the 'filed under: remove' text
it's only item.filer ;-)
non static filer text
new lines removed
removed some new lines to cut down number of changed files
removed unneccessary stuff
removed problem from previous commit
tests for the template engine
adding filer functionality to quattro(-green)
missing tooltip for "file as"
prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
add file_as-option to diabook-derivates
...
* master:
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)
* remotes/upstream/master:
support lowercase :-p smilie
work around doubled linefeeds in tinymce3.5b2
add icons to aside diabook, fixes in css
revert permissions relaxation on community
add comix-plain
smooth the comix comment box
make autocomplete work with updated tinymce
ika to ica
private file in repository
facepark is unsupported ATM
remove stray template variable from old code
add comix theme
use password field for DB input
added Vijay's theme from facepark.in
added README to mcefixes to explain what is going on.
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
more friend suggestions
* master:
