aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-291-0/+78
| |\ \ | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| | * \ Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-061-0/+78
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | | * | [ticket/13568] Use correct data provider on windowsMarc Alexander2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | [ticket/13568] Add imagick tests for windowsMarc Alexander2015-02-021-8/+40
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | [ticket/13568] Add more test cases for imagick pathMarc Alexander2015-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | [ticket/13568] Add functional test for imagick path settingMarc Alexander2015-02-021-0/+44
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
* | | | | Merge branch '3.1.x'Andreas Fischer2015-03-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
| * | | | [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7Marc Alexander2015-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13670
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13577] Skip functional tests requiring fileinfo if not enabledMarc Alexander2015-02-041-0/+15
| |/ / / | | | | | | | | | | | | PHPBB3-13577
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-231-0/+71
|\ \ \ \ | |/ / /
| * | | [ticket/13282] Add functional tests for adding profilefieldsMarc Alexander2015-01-221-0/+71
| | | | | | | | | | | | | | | | PHPBB3-13282
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-211-7/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13534] Set imagick path to empty string to prevent failing path check
| * | | [ticket/13534] Set imagick path to empty string to prevent failing path checkMarc Alexander2015-01-211-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imagick path defaults to /usr/bin. If it doesn't exist for some reason, for example on travis, the form won't be submitted and the settings won't be changed. PHPBB3-13534
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13530] Fix undefined variables
| * | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-201-1/+1
| | |/ | |/| | | | | | | PHPBB3-13530
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-262-10/+10
|\ \ \ | |/ /
| * | [ticket/13389] Replace pattern with pathTristan Darricau2014-11-262-10/+10
| | | | | | | | | | | | PHPBB3-13389
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+55
|\ \ \ | |/ /
| * | Merge pull request #2765 from Elsensee/ticket/11863Joas Schilling2014-11-211-0/+55
| |\ \ | | | | | | | | | | | | [ticket/11863] Set require_activation to none if emails are disabled
| | * | [ticket/11863] Add functional testOliver Schramm2014-10-171-0/+55
| | | | | | | | | | | | | | | | PHPBB3-11863
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-178-14/+14
|\ \ \ \ | |/ / /
| * | | [ticket/13338] Do not use the _test.php suffix for abstract test case classes.Andreas Fischer2014-11-178-14/+14
| | | | | | | | | | | | | | | | PHPBB3-13338
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-021-0/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/memberlist_email.html
| * | | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-021-0/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | [ticket/13248] Use functional framework login method in testsMarc Alexander2014-11-011-7/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| | * | | [ticket/13248] Use auth provider collection for getting providerMarc Alexander2014-11-011-0/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-292-15/+278
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13241] Remove sleep() and change flood interval instead [ticket/13241] Remove sleep() since the method takes care of this now [ticket/13241] Sleep for 1 second when posting twice in the same second [ticket/13241] Fix pagination with global announcements [ticket/13241] Correctly ignore announcements from topics list [ticket/13241] Add a functional test for viewforum with global announcement
| * | | | [ticket/13241] Remove sleep() and change flood interval insteadJoas Schilling2014-10-291-3/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-13241
| * | | | [ticket/13241] Remove sleep() since the method takes care of this nowJoas Schilling2014-10-291-12/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13241
| * | | | [ticket/13241] Add a functional test for viewforum with global announcementJoas Schilling2014-10-291-0/+256
| | | | | | | | | | | | | | | | | | | | PHPBB3-13241
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-281-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-2/+2
| |\ \ \ \ | | |/ / /
| | * | | [ticket/13232] Fix spaces vs tabsJoas Schilling2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13232
| | * | | [ticket/13232] Ensure prune cron job always gets run in prune testNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cron scheduler might pick a different task but we don't want to go through them all to find the one we need. So we just make sure cron is run at all and then manually run the one we want. PHPBB3-13232
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-271-0/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
| * | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-271-0/+28
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
| | * | | [ticket/13226] Add functional test for group ranksTristan Darricau2014-10-271-0/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-13226
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Use assert_checkbox_is_checked for registration test
| * | | | [ticket/13207] Use assert_checkbox_is_checked for registration testMarc Alexander2014-10-251-3/+2
| |/ / / | | | | | | | | | | | | PHPBB3-13207
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-2/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
| * | | [ticket/13207] Add default subscription options for newly registered usersMarc Alexander2014-10-251-2/+14
| | | | | | | | | | | | | | | | PHPBB3-13207
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-211-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13189] Do not use confirm box for marking all notifications read
| * | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-2/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-071-0/+85
|\ \ \ | |/ /
| * | Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-071-0/+85
| |\ \ | | | | | | | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| | * | [ticket/12983] Do not test invalid values until Symfony 2.4Joas Schilling2014-09-071-9/+27
| | | | | | | | | | | | | | | | PHPBB3-12983
| | * | [ticket/12983] Add functional test for ucp pref moduleJoas Schilling2014-09-061-0/+67
| | | | | | | | | | | | | | | | PHPBB3-12983
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| * | | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031