 Arantor
|
e2ab20747b
Merge pull request #1257 from Arantor/release-2.1
|
10 vuotta sitten |
 Michael Eshom
|
e00c378298
Merge pull request #1135 from MissAllSunday/avatar_stuff
|
10 vuotta sitten |
|
Peter Spicer
|
dc4d70488a
! Cleanliness and consistency is good.
|
10 vuotta sitten |
|
Michael Eshom
|
18cea7aa2a
Merge pull request #1256 from Oldiesmann/release-2.1
|
10 vuotta sitten |
|
Michael Eshom
|
cd64bab6d4
! The user ID isn't used in the pm_labeled_messages table, causing an error...
|
10 vuotta sitten |
 Suki
|
37e208c9e7
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into avatar_stuff
|
10 vuotta sitten |
|
Suki
|
a26a1e45f9
oh yeah, I missed a (
|
10 vuotta sitten |
|
Suki
|
a27cf67b12
Un-borking things
|
10 vuotta sitten |
|
Arantor
|
43f6ddf352
Merge pull request #1255 from Arantor/release-2.1
|
10 vuotta sitten |
|
Peter Spicer
|
18f6a9eeba
! Add CAD and AUD to the list of supported currencies. This will (hopefully) limit some of the problems in future if only a little.
|
10 vuotta sitten |
|
Arantor
|
3d2188f9a8
Merge pull request #1254 from Arantor/release-2.1
|
10 vuotta sitten |
|
Peter Spicer
|
82df6650ed
! Make PM previews slightly nicer.
|
10 vuotta sitten |
|
Peter Spicer
|
93444b25c9
! Consistency is a lovely thing.
|
10 vuotta sitten |
|
Peter Spicer
|
a6ec6e15ff
! Cut some clutter, should help #1243
|
10 vuotta sitten |
|
Peter Spicer
|
56ced1a806
! Moar sprites.
|
10 vuotta sitten |
|
Peter Spicer
|
eb3cf9f035
! And another icon spritificated.
|
10 vuotta sitten |
|
Arantor
|
a483165b88
Merge pull request #1253 from Arantor/release-2.1
|
10 vuotta sitten |
|
Peter Spicer
|
d42f3b28a7
! And some more icon spriting combination magic.
|
10 vuotta sitten |
|
Peter Spicer
|
39c7043a0a
! A setting we don't really need.
|
10 vuotta sitten |
|
Peter Spicer
|
5f869dd489
! These don't appear to be in use anywhere
|
10 vuotta sitten |
|
Peter Spicer
|
448068d196
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1
|
10 vuotta sitten |
|
Peter Spicer
|
b36bb2936b
! We have this nice standardised code and we don't use it properly. So let's use it properly and fix #1250 in the process (hopefully)
|
10 vuotta sitten |
|
Peter Spicer
|
5c7d45435a
! Missed this one from Mantis 1493 (did previously, forgot to commit)
|
10 vuotta sitten |
|
Peter Spicer
|
d7a6af0ff3
! Clean up more old settings not in use any more, fixes #1252
|
10 vuotta sitten |
|
Arantor
|
efce9dca89
Merge pull request #1247 from live627/ca
|
10 vuotta sitten |
 John Rayes
|
9127b91692
WrapAction() won't assign a sub template if funtion is set
|
10 vuotta sitten |
|
Arantor
|
2826e6e4c7
Merge pull request #1246 from Arantor/release-2.1
|
10 vuotta sitten |
|
Peter Spicer
|
bc88a93e8f
! If possible, use the right language when we get to PayPal.
|
10 vuotta sitten |
|
Peter Spicer
|
49f172daf7
! A little code consistency and the remainder from Mantis 1493
|
10 vuotta sitten |
|
Peter Spicer
|
03cb0e1e27
! Mantis bug 1288, forcing ordering of table not to be based arbitrary row order, or insertion order but name followed by date
|
10 vuotta sitten |
