Josh Woody
144effd74c
Allow setting parent forums regardless of permission settings. (Bug #58415 )
2010-03-17 10:04:07 -05:00
Nils Adermann
be78817d27
Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105
2010-03-02 21:41:24 +01:00
Cullen Walsh
965ab55394
Parse urls in signature taking into account the allow_sig_links config option introduced in phpBB 3.0.6, per bug #57105
2010-03-02 12:22:11 -08:00
Nils Adermann
f493509eb2
Merge branch 'bug/aptx/54945' into develop-olympus
2010-03-02 21:15:13 +01:00
Marek A. Ruszczyński
93a2407f65
Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.
...
Moved the MIN(smiley_order) to the SELECT column list now, so it can be
used for sorting on MySQL 4, but also still works on MSSQL, which the
bug was originally about.
2010-03-02 21:12:35 +01:00
Chris Smith
5003595ed6
Missed one half of bug #54855 whoops
2010-03-02 21:07:07 +01:00
Nils Adermann
72e2af08e1
Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855
2010-03-02 20:46:19 +01:00
Nils Adermann
24fda6671d
Merging master after 3.0.7 release into develop-olympus to make sure there are no inconsistencies.
2010-03-02 20:33:50 +01:00
Chris Smith
2f6c8a0164
Missed one half of bug #54855 whoops
2010-03-02 19:30:37 +00:00
Nils Adermann
ca8cc03763
Merge commit 'release-3.0.7'
2010-03-02 01:09:13 +01:00
Nils Adermann
35a62ed008
Merge commit 'release-3.0.7-RC2'
2010-03-02 01:09:11 +01:00
Nils Adermann
3b46681652
Merge commit 'release-3.0.7-RC1'
2010-03-02 01:09:02 +01:00
Nils Adermann
6606e4bffe
Merge commit 'release-3.0.6'
2010-03-02 01:05:41 +01:00
Nils Adermann
723e38ece2
Merge commit 'release-3.0.6-RC4'
2010-03-02 01:05:41 +01:00
Nils Adermann
6ebc26e330
Merge commit 'release-3.0.6-RC3'
2010-03-02 01:05:41 +01:00
Nils Adermann
f0eb18fffd
Merge commit 'release-3.0.6-RC2'
2010-03-02 01:05:40 +01:00
Nils Adermann
021c186be9
Merge commit 'release-3.0.6-RC1'
2010-03-02 01:05:40 +01:00
Nils Adermann
4f9c3b8f5c
Merge commit 'release-3.0.5'
2010-03-02 01:05:40 +01:00
Nils Adermann
a45bca7c49
Merge commit 'release-3.0.5-RC1'
2010-03-02 01:05:39 +01:00
Nils Adermann
1f3498c0d6
Merge commit 'release-3.0.4'
2010-03-02 01:05:39 +01:00
Nils Adermann
a0b5877217
Merge commit 'release-3.0.4-RC1'
2010-03-02 01:05:39 +01:00
Nils Adermann
6482e72e7c
Merge commit 'release-3.0.3'
2010-03-02 01:05:39 +01:00
Nils Adermann
25052e1f67
Merge commit 'release-3.0.3-RC1'
2010-03-02 01:05:39 +01:00
Nils Adermann
4cc06650d4
Merge commit 'release-3.0.2'
2010-03-02 01:05:39 +01:00
Nils Adermann
92271af9cd
Merge commit 'release-3.0.2-RC2'
2010-03-02 01:05:38 +01:00
Nils Adermann
ee781806eb
Merge commit 'release-3.0.2-RC1'
2010-03-02 01:05:38 +01:00
Nils Adermann
5324afeffd
Merge commit 'release-3.0.1'
2010-03-02 01:05:38 +01:00
Nils Adermann
0434ccf303
Merge commit 'release-3.0.1-RC1'
2010-03-02 01:05:38 +01:00
Nils Adermann
2ba97da524
Merge commit 'release-3.0.0'
2010-03-02 01:05:37 +01:00
Nils Adermann
aa4495b8ad
Merge commit 'release-3.0-RC8'
2010-03-02 01:05:37 +01:00
Nils Adermann
8a3c323933
Merge commit 'release-3.0-RC7'
2010-03-02 01:05:37 +01:00
Nils Adermann
54f94e0d42
Merge commit 'release-3.0-RC6'
2010-03-02 01:05:37 +01:00
Nils Adermann
1a09d0e238
Merge commit 'release-3.0-RC5'
2010-03-02 01:05:36 +01:00
Nils Adermann
75e7ffc317
Merge commit 'release-3.0-RC4'
2010-03-02 01:05:36 +01:00
Nils Adermann
1ceddd9eec
Merge commit 'release-3.0-RC3'
2010-03-02 01:05:36 +01:00
Nils Adermann
0e0c8d7819
Merge commit 'release-3.0-RC2'
2010-03-02 01:05:35 +01:00
Nils Adermann
bae824e818
Merge commit 'release-3.0-RC1'
2010-03-02 01:05:35 +01:00
Nils Adermann
517f253532
Merge commit 'release-3.0-B5'
2010-03-02 01:05:34 +01:00
Nils Adermann
89b37954f9
Merge commit 'release-3.0-B4'
2010-03-02 01:05:34 +01:00
Nils Adermann
07633a66e8
Merge commit 'release-3.0-B3'
2010-03-02 01:05:34 +01:00
Nils Adermann
ee82970d96
Merge commit 'release-3.0-B2'
2010-03-02 01:05:33 +01:00
Nils Adermann
f7a28642fe
Tagging the "Run, bugs, run! Bertie is coming!" 3.0.7 release.
...
git-svn-id: file:///svn/phpbb/tags/release_3_0_7@10557 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 22:24:04 +00:00
Yuriy Rusko
d62068cfad
#58285 - Language pack fix
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10556 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 21:01:16 +00:00
Nils Adermann
872ad322ec
Increment version number to 3.0.7
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 19:30:58 +00:00
Nils Adermann
a6f2f7e9a9
Merge r10487 into 3.0.7: Make those warnings more consistent.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10554 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 19:20:23 +00:00
Nils Adermann
c089fe8e39
Prepare 3.0.7 release
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10553 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 00:41:56 +00:00
Nils Adermann
cb2d1bd4fc
Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations without utf8 support, it only matches ascii characters & numbers there. [Bug #58055 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10552 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 00:00:39 +00:00
Nils Adermann
5bd9d461e0
Make the new {INTTEXT} work on pcre installations without utf8 support, it only matches ascii characters & numbers there. [Bug #58055 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10551 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 23:57:13 +00:00
Nils Adermann
33de245e64
Merge r10549 into 3.0.7: After generating all packages go through the full installs and make sure the files do not contain any errors [Bug #58255 ]
...
3.0.7-RC2 contains an image file missing one byte (icon_textbox_search.gif) you can take it from an previous phpBB3 release, it was not changed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10550 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 22:08:43 +00:00
Nils Adermann
e5c6cac09a
After generating all packages go through the full installs and make sure the files do not contain any errors [Bug #58255 ]
...
3.0.7-RC2 contains an image file missing one byte (icon_textbox_search.gif) you can take it from an previous phpBB3 release, it was not changed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10549 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 21:19:43 +00:00
