aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | [ticket/11582] Correctly add all required fixturesJoas Schilling2013-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Fix little typoJoas Schilling2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Test the event and and fix it.Joas Schilling2013-07-144-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Fix extension permission testsJoas Schilling2013-07-142-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Fix missing closing bracketJoas Schilling2013-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Fix missing @params in the doc blocksJoas Schilling2013-07-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Remove useless prefixJoas Schilling2013-07-141-133/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-142-258/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Remove left over calls to lang['acl_*']Joas Schilling2013-07-142-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Use member isntead of a new variable everytimeJoas Schilling2013-07-142-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-145-32/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-144-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-142-42/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Fix event dispatcher class nameJoas Schilling2013-07-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-144-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | | | | | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-144-13/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
* | | | | | | | | Merge pull request #1401 from marc1706/ticket/11531Nathan Guse2013-07-225-0/+353
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/11531] Add basic set of functional tests for new avatar system
| * | | | | | | | | [ticket/11531] Check if uploaded avatar is properly displayed in testsMarc Alexander2013-07-221-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11531
| * | | | | | | | | [ticket/11531] Reduced amount of avatar functional tests to minimumMarc Alexander2013-07-204-349/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were reduced to only test one case that should be correct and one that should fail. Different test cases have been split up over the specific test files for the acp groups, acp users, ucp groups, and ucp users page. PHPBB3-11531
| * | | | | | | | | [ticket/11531] Use abstract class for avatar tests and unify test casesMarc Alexander2013-07-177-385/+686
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11531
| * | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531Marc Alexander2013-07-14510-5963/+12707
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11531] Add changes for supporting modified testing frameworkMarc Alexander2013-06-252-45/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, the groups avatar is deleted after the avatar tests in the ucp groups page in order to prevent issues with other tests that expect that no avatar has been set for the admin group. PHPBB3-11531
| * | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531Marc Alexander2013-06-1870-1699/+3770
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531Marc Alexander2013-06-03182-1217/+3238
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ticket/11531] Remove incomplete flags for tests after merging PR #1404Marc Alexander2013-05-252-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues should be fixed by the now resolved ticket PHPBB3-11535: http://tracker.phpbb.com/browse/PHPBB3-11535 PHPBB3-11531
| * | | | | | | | | | | | [ticket/11531] Use assertContainsLang() where possibleMarc Alexander2013-05-252-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHBB3-11531
| * | | | | | | | | | | | [ticket/11531] Add acp and ucp groups functional tests for avatarsMarc Alexander2013-05-132-1/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test for the acp and ucp groups settings are currently marked as incomplete due to a bug that causes the settings to not show an error when incorrect data is entered. However, the avatar data is not saved. That means that even though the error treatment seems to correctly work, the user is never informed of the issues with the submitted avatar data. PHPBB3-11531
| * | | | | | | | | | | | [ticket/11531] Add basic set of functional tests for new avatar systemMarc Alexander2013-05-121-0/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently includes tests for the gravatar, remote avatar, and upload avatar drivers. The local avatar driver is currently not supported. Two tests currently fail and have been marked as incomplete. One failure is due to an issue with Symfony's DomCrawler that exists in Symfony < 2.2. The other one is caused by a bug in the way remote avatars are treated. According to my tests, this bug also exists in phpBB 3.0.11 and has been reported in the tracker: http://tracker.phpbb.com/browse/PHPBB3-11534 PHPBB3-11531
* | | | | | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/11725' into developAndreas Fischer2013-07-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11725: [ticket/11725] Use new paths for phpbb_class_loader in file.php
| * | | | | | | | | | | | | [ticket/11725] Use new paths for phpbb_class_loader in file.phpMarc Alexander2013-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to "{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed in all files that use it. PHPBB3-11725
* | | | | | | | | | | | | | Merge pull request #1592 from bantu/ticket/11722Nathan Guse2013-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | [ticket/11722] Remove reference assignment for $captcha in report.php
| * | | | | | | | | | | | | [ticket/11722] Remove reference assignment for $captcha in report.phpAndreas Fischer2013-07-221-1/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11722
* | | | | | | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11707' into developAndreas Fischer2013-07-223-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11707: [ticket/11707] Twig DEFINE not working as expected
| * | | | | | | | | | | | | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-193-5/+11
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11707
* | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-222-10/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | / / / / / | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| * | | | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-222-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| | * | | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into ↵Andreas Fischer2013-07-222-10/+18
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * marc1706/ticket/11720-prep-release: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| | | * | | | | | | | | | [ticket/11720] Add functional test for submitting report as userMarc Alexander2013-07-211-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The already existing functional tests were not ran as the filename was missing the appended "_test". PHPBB3-11720
| | | * | | | | | | | | | [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11566 changed big parts of code. Unfortunately, a call to $captcha->validate was added that is being called even if $captcha hasn't been initialized. This change will fix this issue. PHPBB3-11720
* | | | | | | | | | | | | Merge pull request #1584 from marc1706/ticket/11713Nathan Guse2013-07-192-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | [ticket/11713] Do not remove module if it couldn't be deleted
| * | | | | | | | | | | | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-182-2/+5
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to now, the module or module category was always removed with jQuery, even if there was an error. With this change, the modules will not be deleted by jQuery if the return JSON array will have SUCCESS set to false. PHPBB3-11713
* | | | | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11712' into developAndreas Fischer2013-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11712: [ticket/11712] Fixing typo in editor.js
| * | | | | | | | | | | | [ticket/11712] Fixing typo in editor.jsVjacheslav Trushkin2013-07-181-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11712
* | | | | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11708' into developJoas Schilling2013-07-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11708: [ticket/11708] Fix bulletin points in notifications
| * | | | | | | | | | | | [ticket/11708] Fix bulletin points in notificationsVjacheslav Trushkin2013-07-161-0/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11708
* | | | | | | | | | | | Merge pull request #1575 from bantu/ticket/10931Joas Schilling2013-07-161-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | [ticket/10931] Add phpbb_php_ini as a service.
| * | | | | | | | | | | [ticket/10931] Add phpbb_php_ini as a service.Andreas Fischer2013-07-161-0/+3
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | | | | | | | Merge remote-tracking branch 'upstream/pr/1570' into developDavid King2013-07-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/pr/1570: [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar