Commit graph

8943 commits

Author SHA1 Message Date
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
ac5995551b Tag phpBB 3.0.6 Release Candidate 2
git-svn-id: file:///svn/phpbb/tags/release_3_0_6-RC2@10190 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 17:05:47 +00:00
Meik Sievertsen
1612be1af3 alt instead of title, fix XHTML issue reported in ticket #51945
(i will not announce this change, the code changes package for RC2 and the final release will include it though, the RC1 one will not be updated to reflect this change)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10189 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 16:42:52 +00:00
Meik Sievertsen
96b3361577 add recent important additions/fixes to the changelog
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10188 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 10:27:19 +00:00
Meik Sievertsen
3e0bf1f8a4 prepare for RC2
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10187 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 09:41:49 +00:00
Joas Schilling
de25ce8724 Fix Bug #51835 - editing posts with attachments - regression from r9843 introduced in #48265
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 08:41:47 +00:00
Meik Sievertsen
023760c8b2 I think i need to check other DBMS more often. :/
- fix index check for sqlite, firebird and oracle
- add check for unique index
- fix changing default value for column in mssql (add constraint)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10185 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-24 15:36:05 +00:00
Andreas Fischer
66038cde5b Fix bug #51905 - Only check whether forum image exists if forum image is specified.
Related to bug #39005.
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10184 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-24 12:37:39 +00:00
Meik Sievertsen
54c22ae52a remove log_time index (was not used at all)
At the same time the database updater now supports checking for existing indexes. The db tools will not have this in 3.0.6 (the db tools have a function to retrieve all indexes) and i need to test the updater on all DBMS today...

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10183 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-24 08:53:17 +00:00
Henry Sudhof
c1b898890b #51805
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10182 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-23 17:41:11 +00:00
Meik Sievertsen
1461beacf6 submit buttons in same style as other submit buttons in ACP
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10181 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-23 17:03:04 +00:00
Meik Sievertsen
35eea4539a check for m_split and m_merge permission on target topic and topic icon selection (Bug #51675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-23 09:41:54 +00:00
Joas Schilling
87eb1d9f20 Fix Bug #51775 - Do not unlock topics with QuickReply
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10179 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-23 08:19:22 +00:00
Meik Sievertsen
782d680b54 Fix getting host for situations where the name/IP is not resolvable. Related to Bug #41025
Related revisions: r9387 and r10158

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10178 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-22 15:09:09 +00:00
Meik Sievertsen
90e1187601 Move add_log() call for captcha "configure" page to the captcha plugin, because only the plugin is able to know if the config got updated or not.
Note to captcha MOD authors: please check if you have a function acp_page() and if an add_log() call is required for your plugin.
Bug #51695

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10177 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-22 10:03:17 +00:00
Meik Sievertsen
5d52b32a63 regression in r9647 (wrong fix for bug #45975) - Bug #51505 (Patch by HardStyle)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10176 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-22 09:55:50 +00:00
Meik Sievertsen
2ba402b06d And now i feel even more dirty because i had to adjust the oracle hack to allow for queries > 4k to let it recognise concatenated strings and strings having the character ")" in it. I also added fallback code in case our regex splits too much. :/
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10175 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-21 18:02:33 +00:00
Meik Sievertsen
3d5ca6b2b7 Ok, the oracle database backup never actually worked at all. We used the wrong delimiter, did not preserve correct sequence order, did not merge primary keys and uniques... i think no one ever tried to actually restore an oracle backup.
Fix all of this.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10174 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-21 17:59:39 +00:00
Henry Sudhof
61c6c07abc #50485
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10173 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-21 11:36:36 +00:00
Meik Sievertsen
5382eb441d remove unnecessary query parts... thanks to asinshesq for pointing it out.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10172 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 18:50:35 +00:00
Meik Sievertsen
0e130c107b forgot to add display active flag to forum data in r10169 for bug #19135
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10171 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 17:52:06 +00:00
Meik Sievertsen
8da2b69e2b note correct username if post/topic get's removed if user is anonymous
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10170 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 17:08:16 +00:00
Meik Sievertsen
4006def79d set "display active topics" to true by default for new forum creation... regression/addition from/to bug #19135
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10169 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 16:46:31 +00:00
Meik Sievertsen
97be42d31c improve code to detect and solve conflicts for code removed from one version to another.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10168 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 16:20:20 +00:00
Meik Sievertsen
7a244e1d2b if preserve_cr is true and the file generated no conflict but is obviously not "empty" we tag it as modified because preserve_cr is the default mode for showing modifications (else the user gets a resolvable conflict and may wonder why ;))
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10167 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 16:18:41 +00:00