Permalink
Switch branches/tags
Commits on Oct 17, 2011
  1. Merge branch 'develop-olympus' into develop

    bantu committed Oct 17, 2011
    * develop-olympus:
      [ticket/9525] Minimum post length 0 is accepted but not working.
  2. Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop…

    bantu committed Oct 17, 2011
    …-olympus
    
    * nickvergessen/ticket/9525:
      [ticket/9525] Minimum post length 0 is accepted but not working.
  3. Merge branch 'develop-olympus' into develop

    bantu committed Oct 17, 2011
    * develop-olympus:
      [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
  4. Merge remote-tracking branch 'naderman/ticket/10414' into develop

    bantu committed Oct 17, 2011
    * naderman/ticket/10414:
      [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2
  5. [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.…

    naderman committed Oct 17, 2011
    …6 on 5.2
    
    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
  6. Merge remote-tracking branch 'bantu/ticket/10416' into develop-olympus

    igorw committed Oct 17, 2011
    * bantu/ticket/10416:
      [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
  7. Merge remote-tracking branch 'bantu/ticket/10417' into develop

    igorw committed Oct 17, 2011
    * bantu/ticket/10417:
      [ticket/10417] Fix array_merge() on undefined $config variable.
Commits on Oct 16, 2011
  1. Merge branch 'develop-olympus' into develop

    bantu committed Oct 16, 2011
    * develop-olympus:
      [ticket/10413] Fix CS
      [ticket/10413] Make create_schema_files usable
  2. Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympus

    bantu committed Oct 16, 2011
    * igorw/ticket/10413:
      [ticket/10413] Fix CS
      [ticket/10413] Make create_schema_files usable
  3. [ticket/10416] Pass dbport to PDO object in ...connection_manager::co…

    bantu committed Oct 16, 2011
    …nnect().
    
    PHPBB3-10416
  4. [ticket/10413] Fix CS

    igorw committed Oct 16, 2011
    PHPBB3-10413
Commits on Oct 14, 2011
  1. Merge branch 'develop-olympus' into develop

    naderman committed Oct 14, 2011
    * develop-olympus:
      [ticket/10377] Do not allow all moderators to sticky posts
  2. Merge remote-tracking branch 'github-igorw/ticket/10377' into develop…

    naderman committed Oct 14, 2011
    …-olympus
    
    * github-igorw/ticket/10377:
      [ticket/10377] Do not allow all moderators to sticky posts
  3. Merge branch 'develop-olympus' into develop

    igorw committed Oct 14, 2011
    * 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.
  4. Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus

    igorw committed Oct 14, 2011
    * 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.
  5. Merge branch 'develop-olympus' into develop

    naderman committed Oct 14, 2011
    * 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.
  6. [ticket/10377] Do not allow all moderators to sticky posts

    igorw committed Oct 14, 2011
    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
  7. Merge remote-tracking branch 'naderman/feature/functional-tests' into…

    igorw committed Oct 14, 2011
    … develop
    
    * 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
  8. [ticket/10327] Use $this->tools instead of creating a new instance of…

    bantu committed Oct 14, 2011
    … db_tools.
    
    PHPBB3-10327
  9. [feature/functional-tests] Configure functional tests through config …

    naderman committed Oct 14, 2011
    …file
    
    The functional tests now also use the test database
    
    PHPBB3-10414
  10. [feature/functional-tests] Implementing functional test framework wit…

    igorw committed with naderman Aug 21, 2011
    …h goutte
    
    PHPBB3-10414
  11. [ticket/8240] Add ability to get a list of columns of a tables to db_…

    bantu committed Oct 14, 2011
    …tools.
    
    PHPBB3-8240
  12. Merge branch 'develop-olympus' into develop

    igorw committed Oct 14, 2011
    * develop-olympus:
      [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
  13. Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus

    igorw committed Oct 14, 2011
    * bantu/ticket/10327:
      [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
  14. [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for…

    bantu committed Oct 14, 2011
    … MySQL.
    
    * 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
  15. [ticket/10189] Get rid of $id$ from schema files

    igorw committed Oct 14, 2011
    PHPBB3-10189
  16. Merge branch 'develop-olympus' into develop

    igorw committed Oct 14, 2011
    * develop-olympus:
      [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
    
    Conflicts:
    	phpBB/includes/auth/auth_db.php