 John Rayes
|
8e113d6113
! Typo
|
11 years ago |
 Jessica González
|
f9b7bdcef3
Merge pull request #641 from MissAllSunday/gitattributes
|
11 years ago |
|
Suki
|
e5577df480
cherrypick from jdarwood007 #122
|
11 years ago |
|
Suki
|
ade48a99da
Merge branch '2db12bde18f7ca334307830ad87f602f8c231562' into gitattributes
|
11 years ago |
 Arantor
|
96349182ce
Merge pull request #640 from Arantor/release-2.1
|
11 years ago |
|
Peter Spicer
|
d734f78d2d
! Try to make sure the DB session serializer is indeed using one we know to be safe (fixes #277)
|
11 years ago |
|
Arantor
|
0fac0ddae3
Merge pull request #577 from MissAllSunday/integrate_register_check
|
11 years ago |
|
Arantor
|
4de39f9d02
Merge pull request #637 from Arantor/release-2.1
|
11 years ago |
|
Peter Spicer
|
61bdbf018a
! Move the avatar out of the h4 in the thread and PM display templats (fixes #584)
|
11 years ago |
|
Arantor
|
a44b3e2fd6
Merge pull request #634 from Arantor/release-2.1
|
11 years ago |
|
Peter Spicer
|
d11e719cab
! Add Personal Text to the list of standard profile fields, incidentally this makes the field available on registration, as an option. Because of conflicts with the ability to set default text, setting default text is only available when the field is enabled and not shown at registration (the default). We *could* amend birthday to be disabled but we probably shouldn't, we can revisit that in future, which means this should resolve #301.
|
11 years ago |
|
Arantor
|
f0e7f9f9dd
Merge pull request #632 from Arantor/release-2.1
|
11 years ago |
|
Peter Spicer
|
1db0e7aa25
! Cast the user id to an int when we first get it set up because that's the right thing to do. Essentially as per #338 and #355 but without any edit conflicts.
|
11 years ago |
|
Arantor
|
b12828e327
Merge pull request #630 from Arantor/misc-anti-spam
|
11 years ago |
|
Peter Spicer
|
45a4622699
+ Anti spam measures: a time gate and an empty field that is normally hidden but will trap some bots.
|
11 years ago |
|
Peter Spicer
|
09e92f2380
Revert "+ Anti spam measures, namely a time gate on registration and an empty field during any CAPTCHA instance."
|
11 years ago |
|
Peter Spicer
|
254e15ca38
+ Anti spam measures, namely a time gate on registration and an empty field during any CAPTCHA instance.
|
11 years ago |
 Michael Eshom
|
8a963902f5
Merge pull request #629 from Oldiesmann/release-2.1
|
11 years ago |
|
Michael Eshom
|
7302c2cdfa
Don't complain about the database version when there's a DB error (as per #507)
|
11 years ago |
|
Michael Eshom
|
996814e6db
Merge pull request #628 from Oldiesmann/release-2.1
|
11 years ago |
|
Michael Eshom
|
13a40470f2
Oops
|
11 years ago |
|
Michael Eshom
|
394081d22c
Fix a few bugs related to #623
|
11 years ago |
|
Michael Eshom
|
5d80f7d464
Merge pull request #624 from Oldiesmann/release-2.1
|
11 years ago |
|
Michael Eshom
|
212f627f61
Fix titles on stats page which were broken by #621
|
11 years ago |
|
Michael Eshom
|
7078f0fcb3
Merge pull request #623 from Oldiesmann/release-2.1
|
11 years ago |
|
Michael Eshom
|
e896373c84
Copy over the 'Allow users to disable word censor' setting when upgrading
|
11 years ago |
|
Michael Eshom
|
3618f6ddcb
Move 'Allow users to disable word censor' to a global setting
|
11 years ago |
|
Michael Eshom
|
854364ffc2
Merge pull request #622 from Oldiesmann/release-2.1
|
11 years ago |
|
Michael Eshom
|
042c9ef0b8
JS error if an available update is marked critical (Fixes #619)
|
11 years ago |
|
Michael Eshom
|
2708c5e530
JS error if an available update is marked critical (Fixes #619)
|
11 years ago |
