| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [git-tools] use mktemp in pre-commit (thanks nn-) | Igor Wiedler | 2010-03-10 | 1 | -2/+1 |
| | | |||||
| * | Merge branch 'develop-olympus' into git-tools | Igor Wiedler | 2010-03-10 | 29 | -0/+1766 |
| |\ | |||||
| | * | [develop-olympus] Backported 3.1 unit tests to 3.0. | Nils Adermann | 2010-03-10 | 29 | -0/+1766 |
| | | | | | | | | | | | Start adding unit tests for bugs you fix! Tests for anything are welcome really. We have to work on these a lot. | ||||
| * | | [git-tools] pre-commit hook for syntax checking | Igor Wiedler | 2010-03-10 | 1 | -0/+44 |
| |/ | | | | | | | | This pre-commit hook utilises PHP's command-line -l (lint) option, which checks for syntax errors. In case of an error the commit is rejected and the error displayed. Testing is welcome. | ||||
| * | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵ | Nils Adermann | 2010-03-08 | 1 | -2/+2 |
| |\ | | | | | | | develop-olympus | ||||
| | * | Add feature/ support to branchname hook | Igor Wiedler | 2010-03-08 | 1 | -2/+2 |
| | | | | | | | | | | | The previously introduced branchname hook now will also use feature/ branch names, in addition to the existing bug/. | ||||
| * | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵ | Nils Adermann | 2010-03-08 | 1 | -0/+24 |
| |\ \ | |/ | | | | | develop-olympus | ||||
| | * | Adding a branchname prepare-commit-msg hook | Igor Wiedler | 2010-03-08 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git supports several hooks, some of which are client-side. The prepare-commit-msg hook is run right after a `git commit` call, before the editor is opened. This allows the initial message to be altered. This hook will check if the current branch name begins with `bug/`, in which case it will prepend `[$branchname]` to the commit message. This makes it easier to create proper commit messages. http://wiki.phpbb.com/Git#Commit_Messages For more information refer to the hook source. | ||||
| * | | Merge branch 'bug/dpward/58755' into develop-olympus | Nils Adermann | 2010-03-07 | 2 | -1/+2 |
| |\ \ | |||||
| | * | | Adding the bugfix for #58755 to the changelog. | Nils Adermann | 2010-03-07 | 1 | -0/+1 |
| | | | | |||||
| | * | | [bug/58755] Fix a redirection bug that can occur after login | David Ward | 2010-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects any forum (i.e. https://myforum/phpBB3/) where: - the forum is located in a directory underneath the web root (i.e., NOT https://myforum/) - a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php) - the URI used ends in a slash (i.e., NOT https://myforum/phpBB3) If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=). This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=) | ||||
| * | | | Merge branch 'bug/evil3/12531' into develop-olympus | Nils Adermann | 2010-03-07 | 2 | -2/+3 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | [bug/12531] proposed solution for bug #12531 | Igor Wiedler | 2010-03-06 | 2 | -2/+3 |
| | | | | |||||
| | * | | Oops, forgot the changelog for #57105 | Cullen Walsh | 2010-03-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into develop-olympus | Nils Adermann | 2010-03-06 | 7 | -9/+15 |
| |\ \ \ | |||||
| | * \ \ | Merge commit 'release-3.0.7-PL1' | Nils Adermann | 2010-03-06 | 10 | -13/+27 |
| | |\ \ \ | |||||
| | | * | | | exclude the image file with text in the name from having newlines fixed | Nils Adermann | 2010-03-05 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Incrementing the version number to 3.0.7-PL1 | Nils Adermann | 2010-03-05 | 7 | -10/+16 |
| | | | | | | |||||
| | | * | | | Mark the bugfix #58595 as a security fix | Nils Adermann | 2010-03-05 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances. | Andreas Fischer | 2010-03-05 | 2 | -2/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'bug/evil3/51555' into develop-olympus | Nils Adermann | 2010-03-06 | 2 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | [bug/51555] proposed fix for bug #51555 | Igor Wiedler | 2010-03-06 | 2 | -1/+2 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'bug/bantu/58595' into develop-olympus | Nils Adermann | 2010-03-05 | 2 | -2/+9 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | Mark the bugfix #58595 as a security fix | Nils Adermann | 2010-03-05 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances. | Andreas Fischer | 2010-03-05 | 2 | -1/+2 |
| |/ / / / | |||||
| * | | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105 | Nils Adermann | 2010-03-02 | 1 | -0/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | Oops, forgot the changelog for #57105 | Cullen Walsh | 2010-03-02 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105 | Nils Adermann | 2010-03-02 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Parse urls in signature taking into account the allow_sig_links config ↵ | Cullen Walsh | 2010-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | option introduced in phpBB 3.0.6, per bug #57105 | ||||
| * | | | | Merge branch 'bug/aptx/54945' into develop-olympus | Nils Adermann | 2010-03-02 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY. | Marek A. Ruszczyński | 2010-03-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Missed one half of bug #54855 whoops | Chris Smith | 2010-03-02 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855 | Nils Adermann | 2010-03-02 | 2 | -1/+2 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Missed one half of bug #54855 whoops | Chris Smith | 2010-03-02 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Merging master after 3.0.7 release into develop-olympus to make sure there ↵ | Nils Adermann | 2010-03-02 | 3 | -5/+5 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | are no inconsistencies. | ||||
| | * | | Merge commit 'release-3.0.7' | Nils Adermann | 2010-03-02 | 10 | -21/+76 |
| | |\ \ | |||||
| | | * | | Tagging the "Run, bugs, run! Bertie is coming!" 3.0.7 release. | Nils Adermann | 2010-02-28 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | git-svn-id: file:///svn/phpbb/tags/release_3_0_7@10557 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | Increment version number to 3.0.7 | Nils Adermann | 2010-02-28 | 3 | -3/+3 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | Merge r10487 into 3.0.7: Make those warnings more consistent. | Nils Adermann | 2010-02-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10554 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | Prepare 3.0.7 release | Nils Adermann | 2010-02-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10553 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations ↵ | Nils Adermann | 2010-02-28 | 1 | -9/+20 |
| | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Merge r10549 into 3.0.7: After generating all packages go through the full ↵ | Nils Adermann | 2010-02-27 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | #58055 again | Henry Sudhof | 2010-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10547 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | okay, minus should work now #58055 | Henry Sudhof | 2010-02-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10545 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | possible cause of #58055 | Henry Sudhof | 2010-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10543 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | only whitespaces, not newlines | Henry Sudhof | 2010-02-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10541 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | Merge r10537 into 3.0.7. branch | Andreas Fischer | 2010-02-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10538 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | * | | Merge commit 'release-3.0.7-RC2' | Nils Adermann | 2010-03-02 | 33 | -176/+481 |
| | |\ \ | |||||
| | | * | | Tagging the 3.0.7-RC2 release. | Nils Adermann | 2010-02-24 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | git-svn-id: file:///svn/phpbb/tags/release_3_0_7-RC2@10535 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
| | | * | prepare build script for RC2 | Nils Adermann | 2010-02-24 | 2 | -4/+4 |
| | | | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10534 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |