aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'igorw/ticket/10258' into developAndreas Fischer2011-07-303-0/+4
|\ | | | | | | | | * igorw/ticket/10258: [ticket/10258] Add HTML5 meta charset tag
| * [ticket/10258] Add HTML5 meta charset tagIgor Wiedler2011-07-293-0/+4
| | | | | | | | | | | | | | This allows knowing the charset when saving web pages to disk. Also, this is supported by all browsers. PHPBB3-10258
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-301-2/+2
|\ \ | |/ |/| | | | | * develop-olympus: [ticket/10263] Fix comment about return value of phpbb_version_compare().
| * 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 'github-igorw/ticket/10258' into developNils Adermann2011-07-203-13/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/10258: [ticket/10258] Remove the meta charset tag [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines [ticket/10258] Remove copyright meta tag from docs [ticket/10258] Remove resource-type and distribution meta tags [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags [ticket/10258] Change the DOCTYPE to HTML5
| * | | [ticket/10258] Remove the meta charset tagIgor Wiedler2011-07-123-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The charset tag is useless, because if a charset content-type header is present it takes precedence. And phpBB always sends such a header. PHPBB3-10258
| * | | [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tagsIgor Wiedler2011-07-103-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | These meta tags are IE specific and do not validate as HTML5. PHPBB3-10258
| * | | [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-093-12/+15
| | | | | | | | | | | | | | | | PHPBB3-10258
* | | | 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-163-9/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-163-9/+31
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] 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-161-0/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-161-0/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 wrapper function for getdate() for UTC timestamps.Andreas Fischer2011-07-121-0/+21
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-10243
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-24/+58
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-161-23/+57
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10237
* | | | | | | 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 developJoas Schilling2011-07-141-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * develop-olympus: [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
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-072-1/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-072-1/+37
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| | * \ \ Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9Andreas Fischer2011-07-072-1/+37
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10250: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| | | * | | [ticket/10250] The site_logo hash is different depending on imageset & languageNils Adermann2011-07-061-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10250
| | | * | | [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imagesetNils Adermann2011-07-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10250
| | | * | | [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is usedNils Adermann2011-07-051-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new logo is slightly wider than the old logo. If we changed the size in the imageset.cfg we would cause a conflict for everyone who replaced the logo with their own and modified the size. Instead we overwrite the width and height in the img() function in session.php only if its contents are that of the stock phpbb logo. PHPBB3-10250
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-062-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * | | | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-07-062-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | * prep-release-3.0.9: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol