aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105Nils Adermann2010-03-021-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-021-0/+1
| | | |
* | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105Nils Adermann2010-03-021-1/+1
|\ \ \ \ | |/ / /
| * | | Parse urls in signature taking into account the allow_sig_links config ↵Cullen Walsh2010-03-021-1/+1
| | | | | | | | | | | | | | | | option introduced in phpBB 3.0.6, per bug #57105
* | | | Merge branch 'bug/aptx/54945' into develop-olympusNils Adermann2010-03-021-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.Marek A. Ruszczyński2010-03-021-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 whoopsChris Smith2010-03-022-1/+2
| | | |
* | | | Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855Nils Adermann2010-03-022-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Missed one half of bug #54855 whoopsChris Smith2010-03-022-1/+2
| | | |
* | | | Merging master after 3.0.7 release into develop-olympus to make sure there ↵Nils Adermann2010-03-023-5/+5
|\ \ \ \ | |/ / / |/| / / | |/ / are no inconsistencies.
| * | Merge commit 'release-3.0.7'Nils Adermann2010-03-0210-21/+76
| |\ \
| | * | Tagging the "Run, bugs, run! Bertie is coming!" 3.0.7 release.Nils Adermann2010-02-280-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.7Nils Adermann2010-02-283-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 Adermann2010-02-281-3/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10554 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Prepare 3.0.7 releaseNils Adermann2010-02-282-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 Adermann2010-02-281-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 Adermann2010-02-272-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 againHenry Sudhof2010-02-271-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10547 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10545 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10543 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * only whitespaces, not newlinesHenry Sudhof2010-02-251-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. branchAndreas Fischer2010-02-252-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 Adermann2010-03-0233-176/+481
| |\ \
| | * | Tagging the 3.0.7-RC2 release.Nils Adermann2010-02-240-0/+0
| | |/ | | | | | | | | | git-svn-id: file:///svn/phpbb/tags/release_3_0_7-RC2@10535 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * prepare build script for RC2Nils Adermann2010-02-242-4/+4
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10534 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10528 into 3.0.7: Update: Store expected resulting file contents in ↵Nils Adermann2010-02-242-25/+81
| | | | | | | | | | | | | | | | | | cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Previous version bump commit r10506 was missing schema_data.sql so that has ↵Nils Adermann2010-02-231-2/+2
| | | | | | | | | | | | | | | | | | been updated to 3.0.7-RC2 as well now git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10532 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merging r10514 into 3.0.7: Bugs #53925 and #52085 - Language fixes related ↵Nils Adermann2010-02-232-2/+2
| | | | | | | | | | | | | | | | | | to the quick reply settings git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10531 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to ↵Nils Adermann2010-02-237-3/+72
| | | | | | | | | | | | | | | | | | enable quick reply in all forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10526 into 3.0.7 branch.Andreas Fischer2010-02-232-6/+8
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10515 into 3.0.7 branchNils Adermann2010-02-232-1/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10522 into 3.0.7 branchNils Adermann2010-02-231-14/+48
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10523 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10520 into 3.0.7 branch.Andreas Fischer2010-02-221-1/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10521 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * sneak attack merge r10518Chris Smith2010-02-222-1/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Enter stage left: the INTTEXT token (merge)Henry Sudhof2010-02-214-4/+14
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * propdelHenry Sudhof2010-02-201-0/+0
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10513 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * merging TEXT warn from 3_0_0Henry Sudhof2010-02-203-91/+132
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10512 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * merge in r10509Chris Smith2010-02-202-0/+8
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10510 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * #57715 - Correct behavior of "force_approved_state" when value is false. Josh Woody2010-02-182-2/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10507 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Bump version to 3.0.7-RC2.Andreas Fischer2010-02-182-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10503, r10504 into 3.0.7 branch.Andreas Fischer2010-02-181-3/+11
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10505 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10497 and r10499 into 3.0.7 - #57755Andreas Fischer2010-02-184-3/+41
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10488 into 3.0.7 branch. #57505Andreas Fischer2010-02-183-3/+3
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10501 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to ↵Joas Schilling2010-02-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | folders. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10493, r10494 - #57825Andreas Fischer2010-02-172-1/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10495 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10484 and r10485 into 3.0.7 branch.Andreas Fischer2010-02-084-7/+9
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Fix #57395, a regression from r10427Josh Woody2010-02-071-1/+1
| | | | | | | | | | | | | | | | | | (merging r10482 into branch_3_0_7) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10483 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10473 into the 3.0.7 branch.Josh Woody2010-02-043-3/+27
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
| | * Merge r10472 and r10474 into the 3.0.7 branchJosh Woody2010-02-043-4/+5
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10475 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge commit 'release-3.0.7-RC1'Nils Adermann2010-03-02137-855/+5078
| |\ \
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 03:21:34 +0000