aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-163-9/+16
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/6632] Better viewing of topics for wide screen displays Conflicts: phpBB/styles/prosilver/template/forumlist_body.html phpBB/styles/prosilver/template/viewforum_body.html
| * 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 branch 'develop-olympus' into developNils Adermann2011-07-161-1/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
| * | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10266] Add "Return to forum" link after reporting a post
| * | | 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.
* | \ \ \ Merge remote-tracking branch 'github-bantu/ticket/10265' into developNils 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 branch 'develop-olympus' into developNils Adermann2011-07-164-9/+161
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
| * | | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-1/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10226] Use is_numeric() instead of preg_replace() [ticket/10226] Allow mysqli connections via local sockets/pipes
| * | | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
| * | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-165-3/+73
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-164-26/+68
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 Conflicts: phpBB/includes/functions_display.php
| * | | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-163-37/+37
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7291] Use template loop for character list, to avoid double &first_char
| * | | | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-166-22/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/5506] Do not display an empty last page after deleting logs.
| * | | | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
| * | | | | | 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-tracking branch 'igorw/ticket/10260' into developAndreas Fischer2011-07-161-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10260: [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-24 05:34:27 +0000