* 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
...
projects / friendica.git / commit