aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2011-02-122-1/+222
|\ | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version. [ticket/9805] Setup security repository for developers. [ticket/9805] Move check lower down. [ticket/9805] Better support for already existing repositories. [ticket/9805] Add dry-run option. [ticket/9805] Use getopt(), add a few options, extend show_usage(). [ticket/9805] Script for easily cloning a whole github network.
| * Merge branch 'ticket/bantu/9805' into develop-olympusIgor Wiedler2011-02-121-0/+215
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9805: [ticket/9805] Setup security repository for developers. [ticket/9805] Move check lower down. [ticket/9805] Better support for already existing repositories. [ticket/9805] Add dry-run option. [ticket/9805] Use getopt(), add a few options, extend show_usage(). [ticket/9805] Script for easily cloning a whole github network.
| | * [ticket/9805] Setup security repository for developers.Andreas Fischer2011-02-031-0/+6
| | | | | | | | | | | | PHPBB3-9805
| | * [ticket/9805] Move check lower down.Andreas Fischer2011-02-031-6/+7
| | | | | | | | | | | | PHPBB3-9805
| | * [ticket/9805] Better support for already existing repositories.Andreas Fischer2011-02-031-17/+14
| | | | | | | | | | | | PHPBB3-9805
| | * [ticket/9805] Add dry-run option.Andreas Fischer2011-02-031-3/+19
| | | | | | | | | | | | PHPBB3-9805
| | * [ticket/9805] Use getopt(), add a few options, extend show_usage().Andreas Fischer2011-02-031-18/+34
| | | | | | | | | | | | PHPBB3-9805
| | * [ticket/9805] Script for easily cloning a whole github network.Andreas Fischer2011-01-151-0/+179
| | | | | | | | | | | | PHPBB3-9805
| * | Merge branch 'ticket/p/10029' into develop-olympusAndreas Fischer2011-02-101-1/+7
| |\ \ | | | | | | | | | | | | | | | | * ticket/p/10029: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
| | * | [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.Oleg Pudeyev2011-02-091-1/+7
| | | | | | | | | | | | | | | | PHPBB3-10029
* | | | Merge branch 'ticket/p/10013' into developIgor Wiedler2011-02-124-4/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10013: [ticket/10013] Use mkdir to create directory trees. [ticket/10013] Fixed cache test to create intermediate directories. [ticket/10013] Changed cache test to use tests/tmp/cache as cache directory
| * | | | [ticket/10013] Use mkdir to create directory trees.Oleg Pudeyev2011-02-121-5/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10013
| * | | | [ticket/10013] Fixed cache test to create intermediate directories.Oleg Pudeyev2011-02-122-2/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-10013
| * | | | [ticket/10013] Changed cache test to use tests/tmp/cache as cache directoryOleg Pudeyev2011-02-123-4/+37
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step of making the test suite use a single directory for writing files to, this directory being tests/tmp. The cache test, instead of tests/cache/tmp, now writes to tests/tmp/cache. Also remove cache directory in setUp method, in case an earlier test run did not complete successfully and the cache directory was not cleaned up. Finally, this change makes the cache test take responsibility over the entire contents of its cache directory. PHPBB3-10013
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-072-0/+59
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| * | | Merge branch 'ticket/nickvergessen/9949' into develop-olympusAndreas Fischer2011-02-072-0/+59
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9949: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| | * | | [ticket/9949] Unit tests for user::lang()Andreas Fischer2011-02-071-0/+58
| | | | | | | | | | | | | | | | | | | | PHPBB3-9949
| | * | | [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment in the code says: "We now get the first number passed and will select the key based upon this number". But the loop over the arguments is not left and therefore it uses the last int-value not the first one. PHPBB3-9949
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-041-6/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| * | | | Merge branch 'ticket/nickvergessen/9966' into develop-olympusAndreas Fischer2011-02-041-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9966: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| | * | | | [ticket/9966] Language download in ACP creates index.html and misses captcha_*Joas Schilling2011-01-291-6/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6. PHPBB3-9966
* | | | | Merge branch 'ticket/nickvergessen/9823' into developAndreas Fischer2011-02-048-541/+1283
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9823: [ticket/9823] Replace 0x80000000 with -2147483648 in tests. [ticket/9823] Move mock file into the mock/ folder. [ticket/9823] Update Unit tests to the new system and correct some minor issues [ticket/9823] Update copyright year and add newline at the end of the file. [ticket/9823] Correct unit-tests to use self:: instead of the class-name. [ticket/9823] Unit tests for validate_config_vars. [ticket/9823] Unit tests for build_cfg_template. [ticket/9823] Unit tests for validate_rang. [ticket/9823] Unit tests for h_radio. [ticket/9823] Moving the functions. Unit tests for build_select. Conflicts: phpBB/adm/index.php
| * | | | | [ticket/9823] Replace 0x80000000 with -2147483648 in tests.Andreas Fischer2011-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 181f2551cfc82e119d73f462268813d18de06097 PHPBB3-9823
| * | | | | [ticket/9823] Move mock file into the mock/ folder.Joas Schilling2011-02-016-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Update Unit tests to the new system and correct some minor issuesJoas Schilling2011-02-016-70/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Update copyright year and add newline at the end of the file.Joas Schilling2011-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Correct unit-tests to use self:: instead of the class-name.Joas Schilling2011-02-012-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Unit tests for validate_config_vars.Joas Schilling2011-02-014-10/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some documentations and use the $max-var instead of the magic-number in validate_config_vars. PHPBB3-9823
| * | | | | [ticket/9823] Unit tests for build_cfg_template.Joas Schilling2011-02-012-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Unit tests for validate_rang.Joas Schilling2011-02-012-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Unit tests for h_radio.Joas Schilling2011-02-013-0/+157
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
| * | | | | [ticket/9823] Moving the functions. Unit tests for build_select.Joas Schilling2011-02-014-537/+644
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9823
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-041-1/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10020] Fix 32-bit php braindamage around INT_MIN. [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
| * | | | | Merge branch 'ticket/p/10020' into develop-olympusAndreas Fischer2011-02-041-1/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/p/10020: [ticket/10020] Fix 32-bit php braindamage around INT_MIN. [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
| | * | | | [ticket/10020] Fix 32-bit php braindamage around INT_MIN.Oleg Pudeyev2011-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 32-bit php, -2147483648, despite fitting in the int type, is for some reason made into a floating-point value. Use an explicit cast to make it an integer. PHPBB3-10020
| | * | | | [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.Oleg Pudeyev2011-02-041-1/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10020
* | | | | Merge branch 'ticket/erikfrerejean/10011' into developAndreas Fischer2011-02-018-16/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/10011: [ticket/10011] Tests can't be ran on PHP < 5.3
| * | | | | [ticket/10011] Tests can't be ran on PHP < 5.3Erik Frèrejean2011-01-318-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the `__DIR__` fix to some remaining Ascraeus tests PHPBB3-10011
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-011-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * develop-olympus: [ticket/10014] Clearly indicate fatal errors in file acm.
| * | | | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10014: [ticket/10014] Clearly indicate fatal errors in file acm.
| | * | | | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If acm_file cannot open the cache file for writing, it prints a message to that effect and calls die(). The message itself does not indicate that it is a fatal error, and someone seeing the message might expect that inability to write to cache is not fatal. Make it clear that the error is fatal by printing the word "Fatal" before the message. PHPBB3-10014
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-3118-35/+35
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10011] Tests don't work on PHP < 5.3 Conflicts: tests/security/redirect_test.php
| * | | | Merge branch 'ticket/erikfrerejean/10011' into develop-olympusAndreas Fischer2011-01-3118-33/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/10011: [ticket/10011] Tests don't work on PHP < 5.3
| | * | | | [ticket/10011] Tests don't work on PHP < 5.3Erik Frèrejean2011-01-3118-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the usage of `__DIR__` for the file includes the tests can't be ran on systems with PHP < 5.3. Replace all occurances of `__DIR__` with `dirname(__FILE__)`. PHPBB3-10011
* | | | | | Merge branch 'ticket/nickvergessen/8065' into developAndreas Fischer2011-01-301-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/8065: [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.
| * | | | | | [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.Joas Schilling2011-01-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8065
* | | | | | | Merge branch 'ticket/nickvergessen/8065' into developAndreas Fischer2011-01-302-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/8065: [ticket/8065] Add an option to lock topics while moving them.
| * | | | | | [ticket/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-302-0/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-8065
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-303-13/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand(). [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| * | | | | Merge branch 'ticket/nickvergessen/9985' into develop-olympusAndreas Fischer2011-01-301-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * ticket/nickvergessen/9985: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().