aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-254-0/+64
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10483] Fix test suite when running with MySQL strict mode
| * | | | | Merge remote-tracking branch 'igorw/ticket/10483' into prep-release-3.0.10Oleg Pudeyev2011-11-254-0/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10483: [ticket/10483] Fix test suite when running with MySQL strict mode
| | * | | | | [ticket/10483] Fix test suite when running with MySQL strict modeIgor Wiedler2011-11-214-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10483
* | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-244-17/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10485' into ↵Oleg Pudeyev2011-11-244-17/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10485: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
| | * | | | | | [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-11-214-17/+25
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1 PHPBB3-6632 PHPBB3-10485
* | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-241-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10486] Create git shortlog and git diff --stat in build script.
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10486' into prep-release-3.0.10Oleg Pudeyev2011-11-241-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10486: [ticket/10486] Create git shortlog and git diff --stat in build script.
| | * | | | | | [ticket/10486] Create git shortlog and git diff --stat in build script.Andreas Fischer2011-11-221-0/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10486
* | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10488' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10488: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| | * | | | | | [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.Andreas Fischer2011-11-231-1/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10488
* | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10461' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10461: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| | * | | | | | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10461
| | * | | | | | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We pass $log_count as false now when we do not need to know how many log entries there are. However when $log_count is false, $log_count == 0 will be true as well and thus we will return early with 0. PHPBB3-9874 PHPBB3-10461
* | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10479] Remove PostgreSQL version numbers from driver's language string
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10479' into ↵Oleg Pudeyev2011-11-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10479: [ticket/10479] Remove PostgreSQL version numbers from driver's language string
| | * | | | | [ticket/10479] Remove PostgreSQL version numbers from driver's language stringJoas Schilling2011-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versions should be removed like for all other DBMS so we don't have to add each new version. PHPBB3-10479
* | | | | | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-213-3/+3
|/ / / / / /
* | | | | | [develop-olympus] Add changelog for 3.0.10-RC1Igor Wiedler2011-11-211-18/+144
| | | | | |
* | | | | | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-204-8/+10
| | | | | |
* | | | | | [develop-olympus] Bumping version numbers to final for 3.0.10 releases.Andreas Fischer2011-11-2010-11/+11
| | | | | |
* | | | | | Merge remote-tracking branch 'bantu/ticket/10446' into develop-olympusIgor Wiedler2011-11-2010-50/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10446: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition.
| * | | | | | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-2010-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | | | [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | | | [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | | | [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-2010-50/+26
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10446
* | | | | | Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
| * | | | | | [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line returns were being removed and links weren't being made clickable. This commit adds a line (contributed by AmigoJack) to retain the link breaks and make links clickable. PHPBB3-10402
* | | | | | | Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympusOleg Pudeyev2011-11-191-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/8599: [ticket/8599] Added ability to select all to add multiple smilies screen.
| * | | | | | | [ticket/8599] Added ability to select all to add multiple smilies screen.callumacrae2011-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8599
* | | | | | | | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-192-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * | | | | | | | [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10239
| * | | | | | | | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10239
* | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympusOleg Pudeyev2011-11-193-116/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8996: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
| * | | | | | | | | [ticket/8996] Also fix the BBCode bug in subsilver2 and acpJoas Schilling2011-11-183-108/+117
| | | | | | | | | |
| * | | | | | | | | [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskeyJoas Schilling2011-10-291-11/+15
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8996
* | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into ↵Nils Adermann2011-11-182-4/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/9776: [ticket/9776] Delete poll if no poll options were submitted.
| * | | | | | | | | [ticket/9776] Delete poll if no poll options were submitted.Joas Schilling2011-11-182-4/+21
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9776
* | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into ↵Nils Adermann2011-11-183-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/9956: [ticket/9956] Display error message if no disapprove reason given
| * | | | | | | | | [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-143-1/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9956
* | | | | | | | | Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympusNils Adermann2011-11-181-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-rxu/ticket/9416: [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
| * | | | | | | | | [ticket/9416] HTML entities in poll titles and options incorrectly re-encodedrxu2011-11-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9416
* | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into ↵Nils Adermann2011-11-183-1/+99
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10296: [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
| * | | | | | | | | | [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracledmauri2011-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10296
| * | | | | | | | | | [ticket/10296] Add unit test for CROSS JOIN with INNER JOINJoas Schilling2011-11-152-0/+98
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10296
* | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympusAndreas Fischer2011-11-181-12/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10185: [ticket/10185] Always set board startdate on conversion
| * | | | | | | | | | [ticket/10185] Always set board startdate on conversionJoas Schilling2011-11-151-12/+9
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board startdate should always be set to first user registration date. The current code did not do anything at all, as the board_startdate was always set on installation before running the convertor. PHPBB3-10185
* | | | | | | | | | Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |