aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11205] Fix merge conflict in readme.html.Oleg Pudeyev2012-11-151-5/+1
| | | | PHPBB3-11205
* Merge PR #1060 branch 'develop-olympus' into developOleg Pudeyev2012-11-151-6/+0
|\ | | | | | | | | * develop-olympus: [ticket/11186] Database unit tests fail on windows using sqlite2
| * Merge PR #1060 branch 'nickvergessen/ticket/11186' into develop-olympusOleg Pudeyev2012-11-151-6/+0
| |\ | | | | | | | | | | | | * nickvergessen/ticket/11186: [ticket/11186] Database unit tests fail on windows using sqlite2
| | * [ticket/11186] Database unit tests fail on windows using sqlite2Joas Schilling2012-11-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | The problem is, that we try to recreate the db and reconnect to it, while the old connection is still hold. To resolve this, we just drop all tables and recreate the tables instead of the hole db. PHPBB3-11186
* | | Merge remote-tracking branch 'p/ticket/11202' into developAndreas Fischer2012-11-151-0/+2
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/11202: [ticket/11202] Check response success before content assertions.
| * | | [ticket/11202] Check response success before content assertions.Oleg Pudeyev2012-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not change tests that perform requests which are either clearly not supposed to succeed or are a gray area. PHPBB3-11202
* | | | Merge remote-tracking branch 'p/ticket/11204' into developIgor Wiedler2012-11-151-11/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * p/ticket/11204: [ticket/11204] Reindent.
| * | | [ticket/11204] Reindent.Oleg Pudeyev2012-11-151-11/+11
|/ / / | | | | | | | | | PHPBB3-11204
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-152-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11202] Custom message does not make sense here, delete it. [ticket/11202] Check response success before content assertions. [ticket/11202] Add a heuristic function to check for response success. Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | Merge remote-tracking branch 'p/ticket/11202-olympus' into develop-olympusAndreas Fischer2012-11-152-1/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11202-olympus: [ticket/11202] Custom message does not make sense here, delete it. [ticket/11202] Check response success before content assertions. [ticket/11202] Add a heuristic function to check for response success.
| | * | [ticket/11202] Custom message does not make sense here, delete it.Oleg Pudeyev2012-11-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11202
| | * | [ticket/11202] Check response success before content assertions.Oleg Pudeyev2012-11-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not change tests that perform requests which are either clearly not supposed to succeed or are a gray area. PHPBB3-11202
| | * | [ticket/11202] Add a heuristic function to check for response success.Oleg Pudeyev2012-11-151-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | This tries to account for php sending fatal errors with 200 status code. PHPBB3-11202
* | | | Merge PR #1085 branch 'nickvergessen/ticket/11198' into developOleg Pudeyev2012-11-152-35/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11198: [ticket/11198] Remove additional asterix as /** is doc-block only [ticket/11198] Store the swapping partners in vars and simplify the logic [ticket/11198] Correctly set links after an item is moved up/down with AJAX
| * | | | [ticket/11198] Remove additional asterix as /** is doc-block onlyJoas Schilling2012-11-151-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11198
| * | | | [ticket/11198] Store the swapping partners in vars and simplify the logicJoas Schilling2012-11-141-39/+47
| | | | | | | | | | | | | | | | | | | | PHPBB3-11198
| * | | | [ticket/11198] Correctly set links after an item is moved up/down with AJAXJoas Schilling2012-11-142-15/+29
| | | | | | | | | | | | | | | | | | | | PHPBB3-11198
* | | | | Merge PR #1070 branch 'Fyorl/ticket/11190-develop' into developOleg Pudeyev2012-11-151-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11190-develop: [ticket/11190-develop] Functional tests purge cache before running.
| * | | | | [ticket/11190-develop] Functional tests purge cache before running.Fyorl2012-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11190
* | | | | | Merge PR #1069 branch 'develop-olympus' into developOleg Pudeyev2012-11-150-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11190] Functional tests purge cache before running. develop fix needs no code from develop-olympus.
| * | | | | Merge PR #1069 branch 'Fyorl/ticket/11190' into develop-olympusOleg Pudeyev2012-11-151-0/+23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * Fyorl/ticket/11190: [ticket/11190] Functional tests purge cache before running.
| | * | | | [ticket/11190] Functional tests purge cache before running.Fyorl2012-11-111-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functions to get and purge cache to functional framework also. PHPBB3-11190
* | | | | | Merge PR #1088 branch 'igorw/ticket/11199' into developOleg Pudeyev2012-11-153-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11199: [ticket/11199] Match cache purge container files against container_* [ticket/11199] Purge dumped container correctly on cache purge.
| * | | | | | [ticket/11199] Match cache purge container files against container_*Igor Wiedler2012-11-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was matching against only container*, checking for the underscore is consistent with the other checks. PHPBB3-11199
| * | | | | | [ticket/11199] Purge dumped container correctly on cache purge.Igor Wiedler2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the dumped container suffix to a prefix instead which makes the existing code for purging 'cache/container_*' files work as intended. PHPBB3-11199
* | | | | | | Merge PR #1089 branch 'igorw/ticket/11200' into developOleg Pudeyev2012-11-151-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11200: [ticket/11200] Add a reminder comment. [ticket/11200] Make cache available during container construction
| * | | | | | [ticket/11200] Add a reminder comment.Oleg Pudeyev2012-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11200
| * | | | | | [ticket/11200] Make cache available during container constructionIgor Wiedler2012-11-151-1/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes fatal errors in the dbal. PHPBB3-11200
* | | | | | Merge remote-tracking branch 'p/ticket/11199' into developIgor Wiedler2012-11-152-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11199: [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
| * | | | | | [ticket/11199] Revert merge of 'marc1706/ticket/11199' into developOleg Pudeyev2012-11-142-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 303fc646adf9104d7c82cf8bcebbc8fc0d328624, reversing changes made to 9c28470ad7b45c10ce3a32065650e4b17f9f27ea. The correct fix should be to alter the container file name to start with container_ prefix. PHPBB3-11199
* | | | | | Merge remote-tracking branch 'marc1706/ticket/11199' into developDavid King2012-11-142-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/11199: [ticket/11199] Cache purge does not remove dumped container
| * | | | | | [ticket/11199] Cache purge does not remove dumped containerMarc Alexander2012-11-142-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11199
* | | | | | Merge remote-tracking branch 'marc1706/ticket/11197' into developAndreas Fischer2012-11-1319-57/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11197: [ticket/11197] Prefix the css classes for the small arrow with "arrow"
| * | | | | | [ticket/11197] Prefix the css classes for the small arrow with "arrow"Marc Alexander2012-11-1319-57/+57
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not make sense to have classes named "right" and "left" produce a small arrow next to text. It should be made clear that an arrow will appear. PHPBB3-11197
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10879] Remove arrow icon from attachment link in editor
| * | | | | Merge remote-tracking branch 'marc1706/ticket/10879' into develop-olympusAndreas Fischer2012-11-131-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * marc1706/ticket/10879: [ticket/10879] Remove arrow icon from attachment link in editor
| | * | | | [ticket/10879] Remove arrow icon from attachment link in editorMarc Alexander2012-11-131-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you upload a file with a long filename the filename will partially cover the arrow icon background image. Remove the icon as it's not needed anyways. PHPBB3-10879
* | | | | Merge remote-tracking branch 'imkingdavid/ticket/11195' into developIgor Wiedler2012-11-121-5/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/11195: [ticket/11195] Condense logic, remove improperly formatted if()
| * | | | | [ticket/11195] Condense logic, remove improperly formatted if()David King2012-11-121-5/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11195
* | | | | Merge remote-tracking branch 'naderman/ticket/11194' into developDavid King2012-11-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nils Adermann # Via Nils Adermann * naderman/ticket/11194: [ticket/11194] Service tag data is stored in an array so access it correctly
| * | | | | [ticket/11194] Service tag data is stored in an array so access it correctlyNils Adermann2012-11-121-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11194
* | | | | Merge pull request #1076 from naderman/ticket/11193Igor Wiedler2012-11-115-16/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | [ticket/11193] Instantiate a single collection_pass for all collections
| * | | | [ticket/11193] Instantiate a single collection_pass for all collectionsNils Adermann2012-11-115-16/+17
|/ / / / | | | | | | | | | | | | PHPBB3-11193
* | | | Merge pull request #1056 from igorw/feature/compiled-dicNils Adermann2012-11-1127-451/+1464
|\ \ \ \ | | | | | | | | | | [feature/compiled-dic] Compile the DI Container into a cached class
| * | | | [ticket/11152] Basic tests for the container functionsIgor Wiedler2012-11-112-0/+83
| | | | | | | | | | | | | | | | | | | | PHPBB3-11152
| * | | | [ticket/11152] Compile the install containerIgor Wiedler2012-11-111-4/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11152
| * | | | [ticket/11152] Throw error if services.yml is missingIgor Wiedler2012-11-111-5/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11152
| * | | | [ticket/11152] Remove old container processor callsIgor Wiedler2012-11-112-14/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11152
| * | | | [ticket/11152] Use realpath in container extensions consistentlyIgor Wiedler2012-11-112-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB-11152
| * | | | [ticket/11152] Rename collection to collection_passIgor Wiedler2012-11-114-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11152
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-03 15:09:50 +0000