Merge branch 'master' of https://github.com/elkarte/Elkarte into theme
Merge branch 'master' of https://github.com/elkarte/Elkarte into theme
Filter notifications based on boards access - fixes #936

Signed-off-by: emanuele <emanuele45@gmail.com>
Reworked a bit the header with a couple of default options about the logo as discussed in topic=740

Signed-off-by: emanuele <emanuele45@gmail.com>
someone just had to start

Signed-off-by: emanuele <emanuele45@gmail.com>

Conflicts:
	themes/default/languages/Notification.english.php
done +1

Signed-off-by: emanuele <emanuele45@gmail.com>

Conflicts:
	themes/default/languages/ModerationCenter.german.formal.php
English tweaks

Signed-off-by: emanuele <emanuele45@gmail.com>
English tweaks

Signed-off-by: emanuele <emanuele45@gmail.com>
continued...

Signed-off-by: emanuele <emanuele45@gmail.com>

Conflicts:
	themes/default/languages/ModerationCenter.german.formal.php
	themes/default/languages/index.german.formal.php
In these cases better an sprintf ;)

Signed-off-by: emanuele <emanuele45@gmail.com>
DOOOONE! (well, this file.)

Signed-off-by: emanuele <emanuele45@gmail.com>

Conflicts:
	themes/default/languages/index.german.formal.php
Twaeks English files

Signed-off-by: emanuele <emanuele45@gmail.com>
Twaeks English files

Signed-off-by: emanuele <emanuele45@gmail.com>
Twaeks English files

Signed-off-by: emanuele <emanuele45@gmail.com>
Apparently hyphens are an heritage of the past: e-mail => email

Signed-off-by: emanuele <emanuele45@gmail.com>
Smiley tweaks

Signed-off-by: emanuele <emanuele45@gmail.com>
* removed centertext attribute from the memberlist.
* fixed a html syntax error.
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
fixed merge-conflict
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Merge pull request #1057 from emanuele45/header

Reworked a bit the header with a couple of default options about the log...
Merge upstream/master into theme