aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into ↵Andreas Fischer2011-12-163-129/+116
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/revert/8996: [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 [ticket/8996] Revert initial fix to keep old behaviour on empty selection
| | * | | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2Joas Schilling2011-12-151-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey" This reverts commit 219bdbaf7044bd203755ed138d109cf39ccdb837. PHPBB3-8996
| | * | | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selectionJoas Schilling2011-12-153-117/+108
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp" This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc. PHPBB3-8996
* | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-093-1/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10319] Missing hidden fields in search form
| * | | | | Merge branch 'ticket/cyberalien/10319' into prep-release-3.0.10Nils Adermann2011-12-093-1/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cyberalien/10319: [ticket/10319] Missing hidden fields in search form
| | * | | | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-093-1/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing hidden fields in search form (bug added in 3.0.9) PHPBB3-10319
* | | | | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10511: [ticket/10511] Fix a grammar defect in permissions language.
| * | | | | | [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10511
* | | | | | | Merge remote-tracking branch 'p/ticket/9876' into develop-olympusAndreas Fischer2011-12-081-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9876: [ticket/9876] Distinctly name user and forum roles for newly registered users.
| * | | | | | | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9876
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympusOleg Pudeyev2011-12-031-0/+137
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10434: [ticket/10434] Add script for creating search index from CLI.
| * | | | | | | [ticket/10434] Add script for creating search index from CLI.Andreas Fischer2011-10-301-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10434
* | | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-034-88/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10349: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| * | | | | | | | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-292-44/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10349
| * | | | | | | | [ticket/10349] Update function commentPatrick Webster2011-09-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10349
| * | | | | | | | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-283-50/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what now runs in the unit tests. The COMMENTS field in the dbms data is no longer needed, so it has been removed. PHPBB3-10349
| * | | | | | | | [ticket/10349] Unit tests: Consolidate schema comment removal functionsPatrick Webster2011-09-201-58/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10349
| * | | | | | | | [ticket/10349] Unit tests: Remove comments while loading schema filesPatrick Webster2011-09-031-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform the same operations that the installer does when preparing the schema files. These functions come straight from /includes/functions_install.php and /includes/functions_admin.php. PHPBB3-10349
* | | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-042-3/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 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-RC3.Andreas Fischer2011-12-044-6/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-041-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10503] Debug error "Invalid arguments" when previewing edits
| * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10503' into ↵Andreas Fischer2011-12-041-3/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10503: [ticket/10503] Debug error "Invalid arguments" when previewing edits
| | * | | | | | | | [ticket/10503] Debug error "Invalid arguments" when previewing editsJoas Schilling2011-11-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty value of poll_options should be an empty array, so that sizeof() is 0. PHPBB3-9776 PHPBB3-10503
* | | | | | | | | | 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