aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-02-203-12/+15
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10049] Mark session init test incomplete for now. [ticket/10049] Mark session continue test incomplete for now. [ticket/10049] Globalize $_SID. [ticket/10049] Chase assertResultEquals rename. [ticket/10049] Fixed requires in session tests and mock. [ticket/10049] Renamed session test files to proper file names.
| * Merge branch 'ticket/p/10049' into develop-olympusAndreas Fischer2011-02-203-12/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10049: [ticket/10049] Mark session init test incomplete for now. [ticket/10049] Mark session continue test incomplete for now. [ticket/10049] Globalize $_SID. [ticket/10049] Chase assertResultEquals rename. [ticket/10049] Fixed requires in session tests and mock. [ticket/10049] Renamed session test files to proper file names.
| | * [ticket/10049] Mark session init test incomplete for now.Oleg Pudeyev2011-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | This test passes by itself but fails when run as part of the compete suite. Mark it incomplete to avoid breaking the suite. PHPBB3-10049
| | * [ticket/10049] Mark session continue test incomplete for now.Oleg Pudeyev2011-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | I am unable to find any code revision in which this test worked. Thus to not break the entire suite I mark it incomplete. PHPBB3-10049
| | * [ticket/10049] Globalize $_SID.Oleg Pudeyev2011-02-191-0/+1
| | | | | | | | | | | | PHPBB3-10049
| | * [ticket/10049] Chase assertResultEquals rename.Oleg Pudeyev2011-02-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 renamed assertResultEquals to assertSqlResultEquals. However, since the session tests were never executed calls in them were never updated. Parameter order also changed; chase that too. PHPBB3-10049
| | * [ticket/10049] Fixed requires in session tests and mock.Oleg Pudeyev2011-02-193-8/+6
| | | | | | | | | | | | PHPBB3-10049
| | * [ticket/10049] Renamed session test files to proper file names.Oleg Pudeyev2011-02-192-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | phpunit.xml.dist specifies that only files ending in _test.php are test files; with the old names session tests were not run as a result. PHPBB3-10049
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-201-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
| * | Merge branch 'ticket/bantu/10047' into develop-olympusOleg Pudeyev2011-02-201-2/+2
| |\ \ | | |/ | |/| | | | | | | * ticket/bantu/10047: [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
| | * [ticket/10047] Do not put session id in URL on posting.php when cookies are on.Andreas Fischer2011-02-191-2/+2
| |/ | | | | | | PHPBB3-10047
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-172-9/+35
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9944] Add empty line before the while() so you can better read the code [ticket/9944] Extension groups naming don't use users' language in ACP Conflicts: phpBB/install/database_update.php
| * Merge branch 'ticket/nickvergessen/9944' into develop-olympusOleg Pudeyev2011-02-172-9/+35
| |\ | | | | | | | | | | | | | | | * ticket/nickvergessen/9944: [ticket/9944] Add empty line before the while() so you can better read the code [ticket/9944] Extension groups naming don't use users' language in ACP
| | * [ticket/9944] Add empty line before the while() so you can better read the codeJoas Schilling2011-02-141-0/+1
| | | | | | | | | | | | PHPBB3-9944
| | * [ticket/9944] Extension groups naming don't use users' language in ACPJoas Schilling2011-01-272-9/+34
| | | | | | | | | | | | | | | | | | Only happens on boards which were installed with 3.0.8 PHPBB3-9944
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-171-44/+77
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10044] Updated invocation documentation. [ticket/10044] Stop when failed to retrieve network/collaborators. [ticket/10044] Added -h to setup_github_network.php. [ticket/10044] Error handling for remote requests in setup_github_network.php [ticket/10044] Made setup_github_network.php runnable as a script
| * | Merge branch 'ticket/p/10044' into develop-olympusAndreas Fischer2011-02-171-44/+77
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10044: [ticket/10044] Updated invocation documentation. [ticket/10044] Stop when failed to retrieve network/collaborators. [ticket/10044] Added -h to setup_github_network.php. [ticket/10044] Error handling for remote requests in setup_github_network.php [ticket/10044] Made setup_github_network.php runnable as a script
| | * | [ticket/10044] Updated invocation documentation.Oleg Pudeyev2011-02-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10044
| | * | [ticket/10044] Stop when failed to retrieve network/collaborators.Oleg Pudeyev2011-02-151-40/+50
| | | | | | | | | | | | | | | | PHPBB3-10044
| | * | [ticket/10044] Added -h to setup_github_network.php.Oleg Pudeyev2011-02-151-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10044
| | * | [ticket/10044] Error handling for remote requests in setup_github_network.phpOleg Pudeyev2011-02-151-1/+22
| | | | | | | | | | | | | | | | PHPBB3-10044
| | * | [ticket/10044] Made setup_github_network.php runnable as a scriptOleg Pudeyev2011-02-151-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10044
* | | | Merge branch 'ticket/nickvergessen/10045' into developIgor Wiedler2011-02-1612-14/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10045: [ticket/10045] Update version in some more files. [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
| * | | | [ticket/10045] Update version in some more files.Joas Schilling2011-02-1611-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...) PHPBB3-10045
| * | | | [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-devJoas Schilling2011-02-161-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10045
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-02-163-273/+359
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [task/refactor-db-testcase] Further improve error messages. [task/refactor-db-testcase] Do not show db password on connect error [task/refactor-db-testcase] Improve error message of db tests [task/refactor-db-testcase] Refactor phpbb_database_test_case
| * | | Merge branch 'task/refactor-db-testcase' into develop-olympusNils Adermann2011-02-163-273/+359
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * task/refactor-db-testcase: [task/refactor-db-testcase] Further improve error messages. [task/refactor-db-testcase] Do not show db password on connect error [task/refactor-db-testcase] Improve error message of db tests [task/refactor-db-testcase] Refactor phpbb_database_test_case
| | * | [task/refactor-db-testcase] Further improve error messages.Oleg Pudeyev2011-02-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10043
| | * | [task/refactor-db-testcase] Do not show db password on connect errorIgor Wiedler2011-02-141-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10043
| | * | [task/refactor-db-testcase] Improve error message of db testsIgor Wiedler2011-02-141-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If database tests cannot be run the error message is ambigous. This commit makes it clearer: - whether the supplied dbms is supported by us - which dbms are supported by us - whether the required PDO extension is loaded PHPBB3-10043
| | * | [task/refactor-db-testcase] Refactor phpbb_database_test_caseIgor Wiedler2011-02-143-273/+349
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Move most of the methods to a separate connection manager class. The test case creates a manager to handle database creation, schema loading and more. Most of the methods could be simplified because they can access shared pdo, config and dbms data. PHPBB3-10043
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/8904] Show default value for numeric custom profile fields when editing
| * | Merge branch 'ticket/hammerhead/8904' into develop-olympusIgor Wiedler2011-02-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/hammerhead/8904: [ticket/8904] Show default value for numeric custom profile fields when editing
| | * | [ticket/8904] Show default value for numeric custom profile fields when editingNiklas Schmidtmer2011-02-131-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When displaying the default value for a numeric custom profile field, only use request_var to obtain the value on creation. When editing, it will always override the actual value with an empty string, as this is request_var's default return value. PHPBB3-8904
* | | Merge branch 'feature/system-cron' into developIgor Wiedler2011-02-1330-270/+1684
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/system-cron: (67 commits) [feature/system-cron] More tests for cron manager. [feature/system-cron] Added documentation for cron manager constructor. [feature/system-cron] Remove an unecessary assignment and an unecessary comment [feature/system-cron] Clarify comments about flush() call in cron. [feature/system-cron] preg_match returns int so cast to bool, fix comment [feature/system-cron] Rename lock() to acquire and unlock() to release. [feature/system-cron] Cache cron's task names. [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir. [feature/system-cron] Add array type hints if appropriate and remove globals. [feature/system-cron] Make use of the new config class in locks. [feature/system-cron] Fix duplicate instantiation of class loader in tests. [feature/system-cron] Abstract the database locking mechanism out of cron. [feature/system-cron] Move tests to phpunit.xml and always load class loader [feature/system-cron] Basic tests for cron manager. [feature/system-cron] Added @param/@return documentation [feature/system-cron] Add phpDoc documentation for everything else. [feature/system-cron] Cast result in cron_manager::is_valid_name() to bool. [feature/system-cron] Add phpDoc documentation for phpbb_cron_manager class. [feature/system-cron] Add phpDoc documentation for phpbb_cron_lock class. [feature/system-cron] Adjust SQL query style to follow coding guidelines. ...
| * | | [feature/system-cron] More tests for cron manager.Oleg Pudeyev2011-02-124-0/+55
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Added documentation for cron manager constructor.Oleg Pudeyev2011-02-121-1/+15
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Remove an unecessary assignment and an unecessary commentNils Adermann2011-02-121-3/+1
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Clarify comments about flush() call in cron.Nils Adermann2011-02-121-1/+3
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] preg_match returns int so cast to bool, fix commentNils Adermann2011-02-122-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Rename lock() to acquire and unlock() to release.Nils Adermann2011-02-123-20/+20
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Cache cron's task names.Nils Adermann2011-02-126-20/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a path relative to phpbb_root_path the path to the task directory is directly passed to the cron manager. Dummy tasks are now in the tests directory directly. PHPBB3-9596
| * | | [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.Nils Adermann2011-02-124-21/+14
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Add array type hints if appropriate and remove globals.Nils Adermann2011-02-122-12/+23
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Make use of the new config class in locks.Nils Adermann2011-02-122-43/+39
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Fix duplicate instantiation of class loader in tests.Nils Adermann2011-02-121-5/+0
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Abstract the database locking mechanism out of cron.Nils Adermann2011-02-125-109/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a number of tests for the locking mechanism which can now lock arbitrary config variables. PHPBB3-9596
| * | | [feature/system-cron] Move tests to phpunit.xml and always load class loaderNils Adermann2011-02-123-59/+12
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Basic tests for cron manager.Oleg Pudeyev2011-02-122-0/+98
| | | | | | | | | | | | | | | | PHPBB3-9596
| * | | [feature/system-cron] Added @param/@return documentationOleg Pudeyev2011-02-1214-11/+98
| | | | | | | | | | | | | | | | | | | | | | | | Also adjusted some function descriptions for greater informativity. PHPBB3-9596