aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2115-91/+93
|\
| * Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2115-91/+93
| |\ | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| | * [ticket/12990] Fix unit testsTristan Darricau2014-08-1715-91/+93
| | | | | | | | | | | | PHPBB3-12990
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-191-4/+4
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12996] Fix reliability issue in flock test.
| * | [ticket/12996] Fix reliability issue in flock test.Fred Emmott2014-08-191-4/+4
| |/ | | | | | | | | | | | | | | | | $delta was always an int - so, this test would sometimes fail if you happened to call time() /very/ close to a 1s boundary. Found by HHVM's continuous testing. PHPBB3-12996
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-111-1/+1
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/12822] Correctly call \phpbb\user in avatar manager test
| * [ticket/12822] Correctly call \phpbb\user in avatar manager testMarc Alexander2014-08-111-1/+1
| | | | | | | | PHPBB3-12822
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-117-26/+109
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-117-26/+109
| |\ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * [ticket/12822] Fix test runs of avatar manager_testMarc Alexander2014-08-081-4/+11
| | | | | | | | | | | | PHPBB3-12822
| | * [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-077-14/+100
| | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| | * [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-071-10/+0
| | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-112-2/+18
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | [ticket/11854] Update testsTristan Darricau2014-08-111-1/+3
| | | | | | | | | | | | PHPBB3-11854
| * | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | PHPBB3-11854
| * | [ticket/11854] Update unit testsTristan Darricau2014-08-111-1/+15
| | | | | | | | | | | | PHPBB3-11854
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-1042-62/+62
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding Conflicts: phpBB/config/services.yml
| * | Merge pull request #2862 from marc1706/ticket/12932Joas Schilling2014-08-1042-62/+62
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12932] Add method for allowing override of \phpbb\datetime class * marc1706/ticket/12932: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding
| | * | [ticket/12932] Fix tests and calls to create_datetimeMarc Alexander2014-08-1042-62/+62
| | | | | | | | | | | | | | | | PHPBB3-12932
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-101-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12950] Force the installer to use language=en
| * | | Merge remote-tracking branch 'github-dhruvgoel92/ticket/12950' into ↵Nils Adermann2014-08-101-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | develop-ascraeus * github-dhruvgoel92/ticket/12950: [ticket/12950] Force the installer to use language=en
| | * | [ticket/12950] Force the installer to use language=enDhruv2014-08-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12950
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-11/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12794] Properly validate google+ field against valid character set
| * | | Merge pull request #2836 from marc1706/ticket/12794Joas Schilling2014-08-101-11/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12794] Properly validate google+ field against valid character set * marc1706/ticket/12794: [ticket/12794] Properly validate google+ field against valid character set
| | * | | [ticket/12794] Properly validate google+ field against valid character setMarc Alexander2014-08-081-11/+43
| | | |/ | | |/| | | | | | | | | PHPBB3-12794
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-102-0/+64
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression
| * | | Merge pull request #2837 from Geolim4/ticket/12671Joas Schilling2014-08-102-0/+64
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12671 Possibility to use NOT LIKE expression * Geolim4/ticket/12671: [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression [ticket/12671] Possibility to use NOT LIKE expression
| | * | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-091-11/+17
| | | | | | | | | | | | | | | | PHPBB3-12671
| | * | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-081-13/+25
| | | | | | | | | | | | | | | | PHPBB3-12671
| | * | [ticket/12671] Possibility to use NOT LIKE expressionGeolim42014-08-082-0/+46
| | |/ | | | | | | | | | PHPBB3-12671
* | | Merge remote-tracking branch 'nickvergessen/ticket/12958' into developCesar G2014-08-102-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12958: [ticket/12958] Remove more references of subsilver2 [ticket/12958] Remove subsilver2 for phpBB 3.2
| * | | [ticket/12958] Remove more references of subsilver2Joas Schilling2014-08-102-3/+2
| | | | | | | | | | | | | | | | PHPBB3-12958
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-64/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * develop-ascraeus: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | Merge pull request #2852 from bantu/ticket/12938Joas Schilling2014-08-101-64/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12938] Remove the 'Download all attachments' feature. * bantu/ticket/12938: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| | * | [ticket/12938] Remove functional tests for 'Download all attachments'.Andreas Fischer2014-08-101-64/+0
| | | | | | | | | | | | | | | | PHPBB3-12938
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-107-216/+158
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/11528] Revert Mink changes
| * | | Merge pull request #2691 from dhruvgoel92/ticket/11528Tristan Darricau2014-08-107-216/+158
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11528] Revert all mink changes in functional tests * dhruvgoel92/ticket/11528: [ticket/11528] Revert Mink changes
| | * | | [ticket/11528] Revert Mink changesDhruv2014-08-097-216/+158
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-091-1/+33
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12718] Use a separate variable for sql query [ticket/12718] Fix spacing and type casting [ticket/12718] Fix docblocks [ticket/12718] Add tests to check user_posts on post deletion [ticket/12718] Update docblock [ticket/12718] Use remove_topic_from_statistic() for delete_topic
| * | | | Merge pull request #2624 from dhruvgoel92/ticket/12718Tristan Darricau2014-08-091-1/+33
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12718] Use remove_topic_from_statistic() for delete_topic * dhruvgoel92/ticket/12718: [ticket/12718] Use a separate variable for sql query [ticket/12718] Fix spacing and type casting [ticket/12718] Fix docblocks [ticket/12718] Add tests to check user_posts on post deletion [ticket/12718] Update docblock [ticket/12718] Use remove_topic_from_statistic() for delete_topic
| | * | | [ticket/12718] Use a separate variable for sql queryDhruv2014-08-081-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12718
| | * | | [ticket/12718] Fix spacing and type castingDhruv2014-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12718
| | * | | [ticket/12718] Add tests to check user_posts on post deletionDhruv2014-08-071-2/+33
| | | |/ | | |/| | | | | | | | | PHPBB3-12718
* | | | Merge remote-tracking branch 'github-nicofuma/ticket/11649' into developNils Adermann2014-08-095-16/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * github-nicofuma/ticket/11649: [ticket/11649] Fix coding style [ticket/11649] Expose Twig through the container
| * | | | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-095-16/+112
| |/ / / | | | | | | | | | | | | PHPBB3-11649
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-091-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12710] Fix missing closing bracket [ticket/12710] Prefix column so it does not start with a number [ticket/12710] Pass the original column data to the create function [ticket/12710] Fix foreach generation [ticket/12710] Compare to uppercase version [ticket/12710] Do not try to match the uniqueness in the query [ticket/12710] Remove table_name from index_name before deleting and recreating them [ticket/12710] Can not use upper in oracles where claus [ticket/12710] Correctly select index name and compare to column name [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle [ticket/12710] Fix problems with creating unique indexes on oracle [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL [ticket/12710] Fix changing the column type on oracle [ticket/12710] Prepare get_existing_indexes() for other DBMS
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into ↵Nils Adermann2014-08-091-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12710: [ticket/12710] Fix missing closing bracket [ticket/12710] Prefix column so it does not start with a number [ticket/12710] Pass the original column data to the create function [ticket/12710] Fix foreach generation [ticket/12710] Compare to uppercase version [ticket/12710] Do not try to match the uniqueness in the query [ticket/12710] Remove table_name from index_name before deleting and recreating them [ticket/12710] Can not use upper in oracles where claus [ticket/12710] Correctly select index name and compare to column name [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle [ticket/12710] Fix problems with creating unique indexes on oracle [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL [ticket/12710] Fix changing the column type on oracle [ticket/12710] Prepare get_existing_indexes() for other DBMS
| | * | | [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracleJoas Schilling2014-08-091-6/+6
| | |/ / | | | | | | | | | | | | PHPBB3-12710
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-091-0/+142
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12841] Make config position default to after [ticket/12841] Update comments in tests making after default [ticket/12841] prefix function name with phpbb_ [ticket/12841] Add a tests for the new function [ticket/12841] Fix white space issues reported by sniffer [ticket/12841] Allow extensions to position new config vars
| * | | Merge pull request #2724 from VSEphpbb/ticket/12841Joas Schilling2014-08-091-0/+142
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12841] Allow extensions to position new config vars * VSEphpbb/ticket/12841: [ticket/12841] Make config position default to after [ticket/12841] Update comments in tests making after default [ticket/12841] prefix function name with phpbb_ [ticket/12841] Add a tests for the new function [ticket/12841] Fix white space issues reported by sniffer [ticket/12841] Allow extensions to position new config vars