aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2Nils Adermann2011-10-174-1/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests still execute correctly using PHPUnit 3.5 on PHP 5.3 and above. The php version limitation for a directory was added in PHPUnit 3.6. A separate test suite is required because the functional tests are in the whitelisted tests directory. The base test for functional testing is only included in bootstrap in versions 5.3 and above. PHPBB3-10414
* | | | | Merge remote-tracking branch 'bantu/ticket/10417' into developIgor Wiedler2011-10-171-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10417: [ticket/10417] Fix array_merge() on undefined $config variable.
| * | | | | [ticket/10417] Fix array_merge() on undefined $config variable.Andreas Fischer2011-10-161-2/+4
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10417
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-161-6/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10413] Fix CS [ticket/10413] Make create_schema_files usable
| * | | | Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympusAndreas Fischer2011-10-161-6/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * igorw/ticket/10413: [ticket/10413] Fix CS [ticket/10413] Make create_schema_files usable
| | * | | [ticket/10413] Fix CSIgor Wiedler2011-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10413
| | * | | [ticket/10413] Make create_schema_files usableIgor Wiedler2011-10-141-6/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10413
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-9/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10377] Do not allow all moderators to sticky posts
| * | | | Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympusNils Adermann2011-10-141-9/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/10377: [ticket/10377] Do not allow all moderators to sticky posts
| | * | | | [ticket/10377] Do not allow all moderators to sticky postsIgor Wiedler2011-10-141-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the mcp the change_topic_type does not properly check permissions, allowing moderators to make any post sticky or announced by visiting the correct URL. PHPBB3-10377
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-142-11/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
| * | | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-142-11/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
| | * | | | | [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.Andreas Fischer2011-10-141-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10327
| | * | | | | [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.Andreas Fischer2011-10-141-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10327
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-143-123/+120
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8240] Add ability to get a list of columns of a tables to db_tools. [ticket/8240] Add ability to get a list of tables to db_tools.
| * | | | | [ticket/8240] Add ability to get a list of columns of a tables to db_tools.Andreas Fischer2011-10-142-74/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8240
| * | | | | [ticket/8240] Add ability to get a list of tables to db_tools.Andreas Fischer2011-10-143-49/+75
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-8240
* | | | | Merge remote-tracking branch 'naderman/feature/functional-tests' into developIgor Wiedler2011-10-1410-64/+328
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/feature/functional-tests: [feature/functional-tests] Don't add elements to backup list twice [feature/functional-tests] Generate config correctly and install only once [feature/functional-tests] Configure functional tests through config file [feature/functional-tests] Implementing functional test framework with goutte
| * | | | | [feature/functional-tests] Don't add elements to backup list twiceNils Adermann2011-10-141-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10414
| * | | | | [feature/functional-tests] Generate config correctly and install only onceNils Adermann2011-10-144-51/+92
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10414
| * | | | | [feature/functional-tests] Configure functional tests through config fileNils Adermann2011-10-143-61/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functional tests now also use the test database PHPBB3-10414
| * | | | | [feature/functional-tests] Implementing functional test framework with goutteIgor Wiedler2011-10-146-0/+204
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10414
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-142-1/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| * | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-142-1/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| | * | | | [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-142-1/+19
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CREATE INDEX is internally mapped to an ALTER INDEX statement. * CREATE INDEX requires the INDEX permission. * ALTER TABLE requires the (more powerful) ALTER permission. * We require the ALTER permission anyway for operation. * Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX permission which is good because some management software does not give out the INDEX permission by default. http://dev.mysql.com/doc/refman/5.0/en/create-index.html PHPBB3-10327
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-148-35/+56
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'remotes/igorw/ticket/10189' into develop-olympusJoas Schilling2011-10-148-35/+56
| |\ \ \ \
| | * | | | [ticket/10189] Get rid of $id$ from schema filesIgor Wiedler2011-10-148-50/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10189
| | * | | | [ticket/10189] Add "automatically generated" comment into schema-filesIgor Wiedler2011-10-148-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10189
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 08:19:04 +0000