aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympusAndreas Fischer2011-11-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/7932: [ticket/7932] Fix font size in select boxes
| | * | | | | | | | | | | | | | | | | | | [ticket/7932] Fix font size in select boxesJoas Schilling2011-10-291-0/+1
| | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7932
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympusAndreas Fischer2011-11-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9036: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| | * | | | | | | | | | | | | | | | | | | [ticket/9036] Add template variable 'S_AUTH_READ' to forumlistJoas Schilling2011-10-291-0/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9036
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-016-16/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
| * | | | | | | | | | | | | | | | | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-286-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10410
* | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-302-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympusJoas Schilling2011-10-302-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | [ticket/9778] Replaced "Find a member" with "Enter username"Marc Alexander2011-10-302-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on the "Users and groups" tab in the ACP, the user is able to either enter the username of the member he wants to manage or click on "Find a member" below the input field. Unfortunately, the label for the input field is also "Find a member", which leads some users to the idea that they can search for users using that input field. By changing the label to "Enter username" this should be clear to the user. PHPBB3-9778
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-293-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails. Conflicts: phpBB/install/database_update.php
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-293-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/9307: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails.
| | * | | | | | | | | | | | | | | | | | | [ticket/9307] Add config variable to installation schema.Chris Smith2011-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9307
| | * | | | | | | | | | | | | | | | | | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-242-2/+8
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new config option is 'email_max_chunk_size' I have not added an interface option to change this. PHPBB3-9307
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10420] Update includes/startup.php for PHP 5.4.
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympusIgor Wiedler2011-10-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10420: [ticket/10420] Update includes/startup.php for PHP 5.4.
| | * | | | | | | | | | | | | | | | | | | [ticket/10420] Update includes/startup.php for PHP 5.4.Andreas Fischer2011-10-181-2/+2
| | | |_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.4 dropped support for register globals and magic quotes. Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an E_CORE_ERROR error. PHPBB3-10420
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10422] Invalid "if" in viewtopic_body.html
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympusIgor Wiedler2011-10-291-7/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10422: [ticket/10422] Invalid "if" in viewtopic_body.html
| | * | | | | | | | | | | | | | | | | | | [ticket/10422] Invalid "if" in viewtopic_body.htmlVjacheslav Trushkin2011-10-181-7/+4
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing incorrect "IF" in viewtopic_body.html PHPBB3-10422
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympusIgor Wiedler2011-10-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10421: [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| | * | | | | | | | | | | | | | | | | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.phpAndreas Fischer2011-10-181-1/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10421
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-22/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10430] Fix typos/etc in coding guidelines
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into ↵Igor Wiedler2011-10-291-22/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * dellsystem/ticket/olympus/10430: [ticket/10430] Fix typos/etc in coding guidelines
| | * | | | | | | | | | | | | | | | | | | [ticket/10430] Fix typos/etc in coding guidelinesdellsystem2011-10-281-22/+20
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly minor changes to correct errors and improve readability. * "overcroud" --> "overcrowd" * "concentinations" --> "concatenations" * "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed * "keep a very close eye to it" --> "keep a very close eye on it" * Fixed some fragmented sentences under the SQL Quotes section * Added capitalisation of "sql", "select", "select distinct" * "noticable" --> "noticeable" * "outputed" --> "outputted" * Added a missing "it" on the line about append_sid() * And some other grammatical/stylistic changes, not worth listing them all PHPBB3-10430
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-28/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10259] Do not send notifications to user accounts joining free groups.
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympusIgor Wiedler2011-10-291-28/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10259: [ticket/10259] Do not send notifications to user accounts joining free groups.
| | * | | | | | | | | | | | | | | | | | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not make sense to send notifications to users joining a freely open group. They already know that they were added to the group, because they triggered the actual join. PHPBB3-10259
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10166' into develop-olympusIgor Wiedler2011-10-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10166: [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
| | * | | | | | | | | | | | | | | | | | [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txtAndreas Fischer2011-10-291-1/+1
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not make much sense to say "the username you received in a previous e-mail" when the message itself contains the username. PHPBB3-10166
* | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-2013-7/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10390: [ticket/10390] Revert back to escaped script tags inside document.write [ticket/10390] Fix wording: fallback should be fall back [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback [ticket/10390] Drop http protocol for Microsoft's CDN option [ticket/10390] Reword the language for jQuery host/server options [ticket/10390] Fix a type-o - captialize AJAX [ticket/10390] Improve the jQuery CDN url generation function [ticket/10390] Move jQuery version definition [ticket/10390] Allow option for jQuery to be hosted by a remote CDN Conflicts: phpBB/install/database_update.php
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Revert back to escaped script tags inside document.writeMatt Friedman2011-10-055-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert all script tags inside a document.write back to the escaped version so they won't trip up any XML parsers. PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Fix wording: fallback should be fall backMatt Friedman2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-277-61/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery will now be available via remote CDN from Google. Microsoft and jQuery CDNs have been removed, so we can simplify this option for the user. Default mode is NO so the copy of jQuery included with phpBB is served by default. PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallbackMatt Friedman2011-09-275-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML5 styles (ACP / Prosilver) do not need to use escaped javascript wrapped in an unescape function, so we can simplify it! Only subsilver2 will use the escaped version of the fallback code, because it is still XHTML. PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Drop http protocol for Microsoft's CDN optionMatt Friedman2011-09-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like Google, Microsoft supports both http and https protocols, so we can drop the protocol alltogether from the url so the Microsoft CDN will work on both HTTP or HTTPS sites without issue. Also I cleaned up some of the comments here. PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Reword the language for jQuery host/server optionsMatt Friedman2011-09-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword some of the language used for the description and pull-down options to try and make it more clear to users that they have the option to use jQuery from their own server with the copy included with phpBB, or from one of the remote CDN servers. PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Fix a type-o - captialize AJAXMatt Friedman2011-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AJAX should be capitalized where it appears in the ACP as the option: "Google AJAX API CDN" PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Improve the jQuery CDN url generation functionMatt Friedman2011-09-261-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per p's comments, return the remote url from a variable instead of using multiple returns. Also put the logic for creating Google's version on its own line, and count the version number's dots instead of length so it will be less likely to break if jQuery goes to version 1.10. PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Move jQuery version definitionMatt Friedman2011-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move jQuery version definition to its own block PHPBB3-10390
| * | | | | | | | | | | | | | | | | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-2614-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9525] Minimum post length 0 is accepted but not working.
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-172-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9525: [ticket/9525] Minimum post length 0 is accepted but not working.
| | * | | | | | | | | | | | | | | | | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-142-2/+2
| | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9525
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10416' into develop-olympusIgor Wiedler2011-10-171-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10416: [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
| | * | | | | | | | | | | | | | | | | | | [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().Andreas Fischer2011-10-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10416
* | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'naderman/ticket/10414' into developAndreas Fischer2011-10-174-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10414: [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2