aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/10093' into develop-olympusAndreas Fischer2011-12-031-28/+72
|\ | | | | | | | | | | | | | | | | | | * p/ticket/10093: [ticket/10093] Use correct ANSI code for clearing color. [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic. [ticket/10093] Use color in commit-msg hook warning/error messages. [ticket/10093] Refactor complaining in commit-msg hook for color support. [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors. [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
| * [ticket/10093] Use correct ANSI code for clearing color.Oleg Pudeyev2011-12-031-2/+2
| | | | | | | | PHPBB3-10093
| * [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.Oleg Pudeyev2011-12-031-18/+3
| | | | | | | | PHPBB3-10093
| * [ticket/10093] Use color in commit-msg hook warning/error messages.Oleg Pudeyev2011-11-261-1/+50
| | | | | | | | | | | | | | By default color is used if the message is printed to a tty, phpbb.hooks.commit-msg.color configuration setting can override this. PHPBB3-10093
| * [ticket/10093] Refactor complaining in commit-msg hook for color support.Oleg Pudeyev2011-11-261-17/+22
| | | | | | | | PHPBB3-10093
| * [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.Oleg Pudeyev2011-11-261-1/+1
| | | | | | | | PHPBB3-10093
| * [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.Oleg Pudeyev2011-11-261-0/+5
| | | | | | | | PHPBB3-10093
* | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-013-1/+60
|\ \ | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| * \ Merge remote-tracking branch 'github-bantu/ticket/10480' into ↵Nils Adermann2011-12-012-0/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * github-bantu/ticket/10480: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker.
| | * | [ticket/10480] Add a build target for changelog building.Andreas Fischer2011-11-291-0/+6
| | | | | | | | | | | | | | | | PHPBB3-10480
| | * | [ticket/10480] Add a build script for exporting the changelog from tracker.Andreas Fischer2011-11-291-0/+53
| | | | | | | | | | | | | | | | PHPBB3-10480
| * | | Merge remote-tracking branch 'github-bantu/ticket/10502' into ↵Nils Adermann2011-12-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * github-bantu/ticket/10502: [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| | * | | [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.Andreas Fischer2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10502
* | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-291-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10501] Fix description of table prefixes
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10501' into ↵Andreas Fischer2011-11-291-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10501: [ticket/10501] Fix description of table prefixes
| | * | | [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | They must start with a letter, not an alphanumeric character PHPBB3-10501
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-281-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
| * | | [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.Andreas Fischer2011-11-281-1/+0
| |/ /
* | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-0/+8
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
| * | [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.Andreas Fischer2011-11-271-0/+8
| | |
* | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
|\ \ \ | |/ / | | | | | | | | | * prep-release-3.0.10: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| * | Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| |\ \ | | | | | | | | | | | | | | | | * rxu/ticket/10497: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| | * | [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from the ticket PHPBB3-9008 fix. When topic marking was enabled for guests, and a guest visited a forum with a new topic which is marked unread, the built SQL missed an alias for a TOPICS_TABLE which resulted in the following error: Unknown column 't.topic_approved' in 'where clause' [1054] The fix is to add an alias for the table. PHPBB3-10497 PHPBB3-9008
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-262-2/+9
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-264-5/+12
| |/
* | Merge remote-tracking branch 'p/ticket/10280' into develop-olympusAndreas Fischer2011-11-251-11/+15
|\ \ | | | | | | | | | | | | * p/ticket/10280: [ticket/10280] Change the display of user activation settings in the ACP.
| * | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
|/ / | | | | | | | | | | Use a select box to be consistent with other settings. PHPBB3-10280
* | 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
| |