 Arantor
|
9f82d32d62
Merge pull request #769 from Arantor/release-2.1
|
11 years ago |
|
Peter Spicer
|
adce8eb20f
! Merging in everything patched in 2.0.6 that wasn't already fixed either directly or indirectly in 2.1 already.
|
11 years ago |
|
Arantor
|
8486deade0
Merge pull request #599 from emanuele45/sceditor_1.4.4
|
11 years ago |
 Suki
|
3a2d8e2548
And add $smcFunc['htmlspecialchars'] again
|
11 years ago |
|
Suki
|
48d42bd23b
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into htmlspecialchars
|
11 years ago |
|
Suki
|
fea020371c
Merge conflict
|
11 years ago |
|
Suki
|
2797e88d13
Merge conflict resolved
|
11 years ago |
|
Peter Spicer
|
b0179a5b1c
! Making members pending approval and moderation reports more prominent. The moderation menu, like most of the time, has it wrong anyway and a separate "accident" may happen to it in the future, but for now, let's get rid of icky (and frequently wrong, as well as some old) language strings and be a bit daring.
|
11 years ago |
|
Arantor
|
7716451369
Merge pull request #668 from jdarwood007/more-php5.5-fixes
|
11 years ago |
 jdarwood007
|
60b552624b
More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat
|
11 years ago |
|
Arantor
|
b4a910932f
Merge pull request #670 from live627/expand_pages-
|
11 years ago |
 John Rayes
|
8495f2191a
Ditch the <strong> tags
|
11 years ago |
|
jdarwood007
|
a4124a4a13
More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat
|
11 years ago |
|
John Rayes
|
6c1974e012
! Make expandPages() nest properly: Fixes #669
|
11 years ago |
|
jdarwood007
|
3e46fa2644
More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat
|
11 years ago |
|
John Rayes
|
eed0506637
! Remove useless function param
|
11 years ago |
|
Suki
|
5d33d1f278
Long lines then!
|
11 years ago |
|
Suki
|
310f75a982
Take care of htmlspecialchars in Index.template
|
11 years ago |
|
Suki
|
a73078ba47
$smcFunc['htmlspecialchars'] on Subs
|
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 |
 Jeremy D
|
e0475fcaa0
Left some testing stuff in.
|
11 years ago |
|
Jeremy D
|
26e21869df
Replaced list_getModLogEntries /e preg_replace with a callback.
|
11 years ago |
|
Jeremy D
|
4d2e31cd8f
Replaced Smileys /e preg_replace with a callback.
|
11 years ago |
 emanuele
|
f3fc7e61ff
SCEditor updated to 1.4.3 - thanks Spuds for the directions ;D
|
11 years ago |
 Bryan Deakin
|
7f3407f2ea
Fixes bold bbc bug ... thanks to ema and illori
|
11 years ago |
 Michael Eshom
|
f2781a6610
That wasn't supposed to be there...
|
11 years ago |
|
Michael Eshom
|
54683d86ef
Link directly to the message, to prevent things from breaking if a post is moved, etc.
|
11 years ago |
|
Michael Eshom
|
5bd25d87cc
Merge pull request #467 from PortaMx/release-2.1
|
11 years ago |
 PortaMx
|
b8c3a95d37
rename the hooks:
|
11 years ago |
|
Michael Eshom
|
d4577d4662
Don't use ['html_headers'] to add JS (per #339)
|
11 years ago |
