Commit graph

8998 commits

Author SHA1 Message Date
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
Meik Sievertsen
199bb13660 Tag phpBB Release Candidate 4
git-svn-id: file:///svn/phpbb/tags/release_3_0_6-RC4@10250 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-01 19:19:17 +00:00
Meik Sievertsen
b5c4dc3284 check for additional empty config variables...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10249 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-01 15:33:44 +00:00
Meik Sievertsen
5553cfc2ed Several fixes:
Fix Bug #53335
Fix wrong unique index fetch for oracle and sqlite
Fix alter column definition for firebird (although the query will fail in these circumstances [primary key] because firebird (again) does not support simple things... although... mssql/oracle having the same "problems", but there you are able to do more advanced queries)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10248 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-30 19:19:48 +00:00
Meik Sievertsen
c2832affae Fix another bug in WHERE statement rewrite for oracle. The bug(s) actually consist of not detecting correct parameters and then resulting in partial WHERE statements, where non-detected strings are simply removed. grrrrrr
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10247 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-30 17:21:20 +00:00
Meik Sievertsen
c02f276c5f saw this bug while debugging... we really really need another layer in 3.1.x (better sooner than later), but retaining backwards compatibility.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10246 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-30 16:59:48 +00:00
Meik Sievertsen
cdeca65aec Fix Jabber SASL PLAIN authentication failures. (Bug #52995)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10245 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-29 15:04:19 +00:00
Meik Sievertsen
2258d85623 Implement suggestion in ticket #52155 - Better way to generate SID-free links in feed.php
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10244 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-29 14:00:43 +00:00
Ruslan Uzdenov
3d3e673396 Fix Bug #53285 introduced in r10018 - Mark the first visible forum on index as unread if there's any unread global announcement
Authorised by: Bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10243 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:49:23 +00:00
Meik Sievertsen
401ee9ce59 now we will have an RC4 we can adjust this one email file to act like all other email files
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10242 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:18:02 +00:00
Meik Sievertsen
110f81684e I am very sorry... but the changes require (a hopefully very short) RC4 phase
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10241 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:05:17 +00:00
Meik Sievertsen
87e717ae87 Fix Bug #53245 - Correct regular expression escaping and only splitting keywords on space and "|"
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10240 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 15:10:32 +00:00
Henry Sudhof
df5fa06035 ... and finally
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10239 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 13:54:03 +00:00
Henry Sudhof
d53f9a22d6 adding normalization - shouldn't change anything
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10238 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 12:36:55 +00:00
Henry Sudhof
44719bd041 #53235 - removing accidental commits
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10237 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 12:27:46 +00:00
Meik Sievertsen
b23f6c90ba fix spaces/tabs
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10236 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 11:17:53 +00:00
Henry Sudhof
56c8e34145 #53235
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10235 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-27 08:43:00 +00:00
Meik Sievertsen
6ca7b21dc9 Fix Bug #53185 (icon width/height adjustement for icons > 127px also applied on smilies) - related to r10088
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10234 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-26 13:59:02 +00:00
Meik Sievertsen
6d1c40f6e6 Fix Bug #53175 (forum_options cleared if editing forum) - regression from r10024
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10233 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-25 09:03:05 +00:00
Chris Smith
d7d810a586 changelog more descriptive for #45805 r9633
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10232 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-24 23:15:10 +00:00
Meik Sievertsen
b850fc4fbe fix table creation in db_tools.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10231 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-24 14:28:59 +00:00
Meik Sievertsen
131ba8c2ba two obvious mistakes (thanks Jon :))
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10230 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-24 14:28:41 +00:00
Meik Sievertsen
4e8e766ed6 revert r9910 - ticket #1309
Reason for revert: http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=1309&start=8#post193395

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10229 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-24 13:04:26 +00:00