| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \
| | |
| | |
| | |
| | | |
* p/ticket/11248:
[ticket/11248] Convert line endings to LF - develop edition.
|
| | |
| | |
| | |
| | | |
PHPBB3-11248
|
| | |
| | |
| | |
| | | |
PHPBB3-11015
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* upstream/develop: (666 commits)
[ticket/11077] Remove code from old global announcements system
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
[ticket/11187] Added a blank array to fix errors in functional tests
[ticket/10780] Make L_COLON available in the installer.
[ticket/11183] Remove $load_extensions and weird dl() calls
[ticket/10970] Added extra documentation to parse_dynamic_path.
[ticket/10939] Added documentation for phpbb_request::file
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
...
Conflicts:
phpBB/common.php
phpBB/download/file.php
phpBB/includes/db/dbal.php
phpBB/includes/db/firebird.php
phpBB/includes/db/mssql.php
phpBB/includes/db/mssql_odbc.php
phpBB/includes/db/mssqlnative.php
phpBB/includes/db/mysql.php
phpBB/includes/db/mysqli.php
phpBB/includes/db/oracle.php
phpBB/includes/db/postgres.php
phpBB/includes/db/sqlite.php
phpBB/includes/extension/manager.php
phpBB/install/database_update.php
|
| | |
| | |
| | |
| | | |
PHPBB3-9550
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
PHPBB3-11015
This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
|
| |
| |
| |
| | |
PHPBB3-10973
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/9916] Changing header in non-distributed files
[ticket/9916] Changing coding guidelines license
[ticket/9916] Updating License in the header
Conflicts:
tests/mock/cache.php
|
| |
| |
| |
| | |
PHPBB3-9916
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10483] Fix test suite when running with MySQL strict mode
|
| |
| |
| |
| | |
PHPBB3-10483
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/10321] Add descriptions to the unit tests
[ticket/10321] Do not append the ? if the param-list is empty anyway.
|
| |
| |
| |
| | |
PHPBB3-10321
|
| |
| |
| |
| | |
PHPBB3-10321
|
| |
| |
| |
| | |
PHPBB3-9716
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32).
|
| |
| |
| |
| |
| |
| | |
This fixes session unit tests on PostgreSQL in particular.
PHPBB3-10082
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[task/session-tests] Make result check independent of returned row order.
[task/session-tests] By default the cache check now skips over db server info
[task/session-tests] Correctly display message on session continue test failure
[task/session-tests] Make the session id replacement of dataset values clearer
Conflicts:
tests/mock/cache.php
|
| |
| |
| |
| | |
PHPBB3-9732
|
| |
| |
| |
| | |
PHPBB3-9732
|
| |
| |
| |
| | |
PHPBB3-9732
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/10052] Add comments to the session testable factory.
[ticket/10052] Correct session tests, and separate session factory from tests
|
| |
| |
| |
| | |
PHPBB3-10052
|
|/
|
|
| |
PHPBB3-10052
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
PHPBB3-10049
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
PHPBB3-10049
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
PHPBB3-9732
|
|
Two first simple tests to check functionality of session_begin and
session_create.
Added a mock class for the cache as well as a subclass of session
which has its cookie handling function mocked out to avoid header
sending problems.
PHPBB3-9732
|