aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'igorw/ticket/10258' into developAndreas Fischer2011-07-3017-0/+19
|\ | | | | | | | | * igorw/ticket/10258: [ticket/10258] Add HTML5 meta charset tag
| * [ticket/10258] Add HTML5 meta charset tagIgor Wiedler2011-07-2917-0/+19
| | | | | | | | | | | | | | 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-7/+6
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/10199] Delete a useless join in viewtopic.
| * \ 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 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 branch 'develop-olympus' into developOleg Pudeyev2011-07-300-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * develop-olympus:
| * | | | 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.
* | \ \ \ \ Merge branch 'develop-olympus' into developOleg Pudeyev2011-07-303-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10032] Fixed typos in bbcode button name.
| * | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-07-251-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
| * | | | 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-igorw/ticket/10258' into developNils Adermann2011-07-2026-210/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1218-21/+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] Adjust some deprecated tags for HTML5 in coding-guidelinesIgor Wiedler2011-07-111-15/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-10258
| * | | | [ticket/10258] Remove copyright meta tag from docsIgor Wiedler2011-07-117-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails HTML5 validation and we already have a 'copyright and disclaimer' section in all of those documents. We can always represent the copyright more semantically later (such as the HTML5 <copyright> tag). PHPBB3-10258
| * | | | [ticket/10258] Remove resource-type and distribution meta tagsIgor Wiedler2011-07-1012-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They break HTML5 validation. PHPBB3-10258
| * | | | [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tagsIgor Wiedler2011-07-1025-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These meta tags are IE specific and do not validate as HTML5. PHPBB3-10258
| * | | | [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-0926-143/+108
| | | | | | | | | | | | | | | | | | | | PHPBB3-10258
* | | | | 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