Merge pull request #1975 from Oldiesmann/release-2.1

! Minor fixes related to alerts
Merge pull request #1976 from Oldiesmann/release-2.1

Move alert strings back to their own language file
Merge pull request #1977 from Oldiesmann/release-2.1

! Fix upgrade for Postgres
For static and normal methods is_callable will return false
the check is redundant anyway.

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #1979 from MissAllSunday/stuff

For static and normal methods is_callable will return false
! Tokens were set too late in the proccess

Signed-off-by: John Rayes <live627@gmail.com>
! saveSettings() didn't pass select box  options to saveDBSettings()

Signed-off-by: John Rayes <live627@gmail.com>
! saveSettings() didn't check POST variables

Signed-off-by: John Rayes <live627@gmail.com>
Added bottom margin to #topic_header columns
When box-sizing is changed to border-box globally for all elements the
info column header becomes higher than the rest. This pushes the subject
div in the first row to the right. This is no error at all. It's only
for upward compatibility when using SMF curved theme in context with
other software that uses a different box model.

Signed-off-by: Michael 'Tekkla' Zorn <tekkla@tekkla.de>
! Only use secured gravatars if forum-wide SSL is being froced

Signed-off-by: John Rayes <live627@gmail.com>
+ A few more options for timezones

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1984 from live627/dev

Even more random fixes
Merge pull request #1983 from tekkla/Theming

Added bottom margin to #topic_header columns
Make Quick Reply more uniform with full post template

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1985 from live627/dev

Make Quick Reply more uniform with full post template
Tidy the CSS
Signed-off-by: Antes <antes@simplemachines.org>
u no cause conflict!
Signed-off-by: Antes <antes@simplemachines.org>
Merge branch 'release-2.1' of git://github.com/simplemachines/SMF2.1 into CSS

# By John Rayes (6) and Michael 'Tekkla' Zorn (1)
# Via John Rayes
* 'release-2.1' of git://github.com/simplemachines/SMF2.1:
  Make Quick Reply more uniform with full post template
  + A few more options for timezones
  ! Only use secured gravatars if forum-wide SSL is being froced
  Added bottom margin to #topic_header columns When box-sizing is changed to border-box globally for all elements the info column header becomes higher than the rest. This pushes the subject div in the first row to the right. This is no error at all. It's only for upward compatibility when using SMF curved theme in context with other software that uses a different box model.
  ! saveSettings() didn't check POST variables
  ! saveSettings() didn't pass select box  options to saveDBSettings()
  ! Tokens were set too late in the proccess

Conflicts:
	Themes/default/css/index.css

Signed-off-by: Antes <antes@simplemachines.org>
Add missing moderation center strings (my fault...)

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>
first part is done i think
Signed-off-by: Antes <antes@simplemachines.org>