small tweaks
- gender_None
Signed-off-by: Antes <antes@simplemachines.org>
Merge branch 'release-2.1' of git://github.com/simplemachines/SMF2.1 into release-2.1

# By John Rayes
# Via John Rayes
* 'release-2.1' of git://github.com/simplemachines/SMF2.1:
  + Auto emulate on server mod
!Undefined index: id_attach

Signed-off-by: Suki <suki@missallsunday.com>
!Undefined index: id_attach

Signed-off-by: Suki <suki@missallsunday.com>
Spell checking button was in wrong position

Now returned to just-after-preview position, as in SMF 2.0.x
Signed-off-by: Angelina Belle <angelinabelle1@hotmail.com>
Merge pull request #1947 from Antes/release-2.1

small tweaks
If we already are using a custom dir, delete the predefined one.

Signed-off-by: Suki <suki@missallsunday.com>
Borrow custom_avatar's index.php file
fixes #1953

Signed-off-by: Suki <suki@missallsunday.com>
from image to CSS! Bye On/Off images :)

Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #1960 from Antes/general_fix

from image to CSS! Bye On/Off images :)
Merge pull request #1958 from AngelinaBelle/patch-3

! Spell checking button was in wrong position
Make popups "simple" actions

Signed-off-by: John Rayes <live627@gmail.com>
Simple actions require simple errors (fixes #1961)

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

Dev
Merge pull request #1959 from MissAllSunday/avatar_stuff

Avatar stuff
- Remove the option to use the full editor on quick reply

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

Remove the option to use the full editor on quick reply
! Static definitions can only be defined once

Signed-off-by: John Rayes <live627@gmail.com>
! Avatar uploads weren't shown (fixes #1951)
+ Gravatar settings went missing

Signed-off-by: John Rayes <live627@gmail.com>