aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympusOleg Pudeyev2011-07-301-1/+1
|\ | | | | | | | | * callumacrae/ticket/10293: [ticket/10293] Fixed the JavaScript in the jumpbox.
| * [ticket/10293] Fixed the JavaScript in the jumpbox.Callum Macrae2011-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | The current code is invalid, and results in an critical error which aborts the script before it gets to return false, thus allowing the form to submit with an invalid forum ID. This commit fixes that by referencing "this" instead of "document.jumpbox", which didn't exist because the form had no name. PHPBB3-10293
* | Merge remote-tracking branch 'p/ticket/10199' into develop-olympusAndreas Fischer2011-07-301-7/+6
|\ \ | | | | | | | | | | | | * p/ticket/10199: [ticket/10199] Delete a useless join in viewtopic.
| * | [ticket/10199] Delete a useless join in viewtopic.Oleg Pudeyev2011-07-241-7/+6
| |/ | | | | | | PHPBB3-10199
* | Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympusAndreas Fischer2011-07-301-2/+2
|\ \ | | | | | | | | | | | | * bantu/ticket/10263: [ticket/10263] Fix comment about return value of phpbb_version_compare().
| * | [ticket/10263] Fix comment about return value of phpbb_version_compare().Andreas Fischer2011-07-271-2/+2
| | | | | | | | | | | | PHPBB3-10263
* | | Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympusOleg Pudeyev2011-07-303-3/+3
|\ \ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/10032: [ticket/10032] Fixed typos in bbcode button name.
| * | | [ticket/10032] Fixed typos in bbcode button name.Callum Macrae2011-07-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | addlistitem was addlitsitem. PHPBB3-10032
* | | | Merge remote-tracking branch 'callumacrae/ticket/10292' into develop-olympusAndreas Fischer2011-07-251-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * callumacrae/ticket/10292: [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
| * | | [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.Callum Macrae2011-07-251-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | There is no space between the first radio button and "Yes", while there is a space between the second radio button and "No". This commit fixes that. PHPBB3-10292
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/6632' into ↵Nils Adermann2011-07-163-9/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/6632: [ticket/6632] Better viewing of topics for wide screen displays
| * | | [ticket/6632] Better viewing of topics for wide screen displaysJoas Schilling2011-07-143-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes PHPBB3-6458 "Width of Topics and Posts columns in Board Index is causing problems with language packs" by increasing the size to 90px instead of the ~70 it was like. Also tested on RTL languages. PHPBB3-6458 PHPBB3-6632
* | | | Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympusNils Adermann2011-07-161-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10257: [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003. [ticket/10257] Fix AAAA record parsing for old versions of Windows [ticket/10257] Add missing break statement after CNAME block.
| * | | | [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.Andreas Fischer2011-07-131-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10257
| * | | | [ticket/10257] Fix AAAA record parsing for old versions of WindowsPatrick Webster2011-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of Windows use a different output format for AAAA records. PHPBB3-10257
| * | | | [ticket/10257] Add missing break statement after CNAME block.Andreas Fischer2011-07-131-0/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10257
* | | | Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympusNils Adermann2011-07-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10274: [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
| * | | | [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_mainAndreas Fischer2011-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10274
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10266' into ↵Nils Adermann2011-07-161-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10266: [ticket/10266] Add "Return to forum" link after reporting a post
| * | | | | [ticket/10266] Add "Return to forum" link after reporting a postJoas Schilling2011-07-141-0/+7
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-10266
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10265' into develop-olympusNils Adermann2011-07-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10265: [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.
| * | | | | [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.Andreas Fischer2011-07-131-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10265
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympusNils Adermann2011-07-164-9/+161
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10263: [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php [ticket/10263] Adding unit tests for phpbb_version_compare(). [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
| * | | | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.phpAndreas Fischer2011-07-141-4/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.phpAndreas Fischer2011-07-141-5/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | [ticket/10263] Adding unit tests for phpbb_version_compare().Andreas Fischer2011-07-131-0/+130
| | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | [ticket/10263] Add wrapper for version_compare() that allows the use of A and BAndreas Fischer2011-07-131-0/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add wrapper function for version_compare() that allows using uppercase A and B for alpha and beta release version strings. PHPBB3-10263
* | | | Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympusNils Adermann2011-07-161-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * github-rxu/ticket/10226: [ticket/10226] Use is_numeric() instead of preg_replace() [ticket/10226] Allow mysqli connections via local sockets/pipes
| * | | | [ticket/10226] Use is_numeric() instead of preg_replace()rxu2011-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10226
| * | | | [ticket/10226] Allow mysqli connections via local sockets/pipesrxu2011-06-211-1/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10226
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into ↵Nils Adermann2011-07-161-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10252: [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
| * | | | | [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permissionJoas Schilling2011-07-151-0/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission. PHPBB3-10252
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympusNils Adermann2011-07-165-3/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10243: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). [ticket/10243] Call phpbb_gmgetdate() from various places. [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
| * | | | | [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().Andreas Fischer2011-07-131-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10243
| * | | | | [ticket/10243] Call phpbb_gmgetdate() from various places.Andreas Fischer2011-07-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10243
| * | | | | [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.Andreas Fischer2011-07-121-0/+21
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-10243
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into ↵Nils Adermann2011-07-164-25/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10237: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
| * | | | | [ticket/10237] Also display login-box on subscribingJoas Schilling2011-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10237
| * | | | | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-114-18/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some information to the confirm-box (forum_name / topic title) PHPBB3-10237
| * | | | | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-072-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10237
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/7291' into ↵Nils Adermann2011-07-163-37/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/7291: [ticket/7291] Use template loop for character list, to avoid double &first_char
| * | | | | | [ticket/7291] Use template loop for character list, to avoid double &first_charJoas Schilling2011-07-143-37/+37
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-7291
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into ↵Nils Adermann2011-07-166-22/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/5506: [ticket/5506] Do not display an empty last page after deleting logs.
| * | | | | | [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-146-22/+39
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix is copied from view_inactive_users(). Also add keywords and sort parameters to url for deleting logs and inactive users. And finally save some queries if there are no logs/users to display anyway
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/10208' into develop-olympusNils Adermann2011-07-151-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * github-bantu/ticket/10208: [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
| * | | | | [ticket/10208] Explain what happens when 'Warning duration' is set to 0.Tabitha Backoff2011-07-161-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10208
* | | | | Merge remote branch 'remotes/callumacrae/ticket/10216' into develop-olympusJoas Schilling2011-07-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * remotes/callumacrae/ticket/10216: [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
| * | | | | [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.Callum Macrae2011-07-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously "errors are listing below", should have said "errors are listed below". PHPBB3-10216
* | | | | Merge remote branch 'remotes/bantu/ticket/10267' into develop-olympusJoas Schilling2011-07-141-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * remotes/bantu/ticket/10267: [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
| * | | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
| |/ / / | | | | | | | | | | | | PHPBB3-10267