aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into ticket/11620Andy Chase2013-07-225-8/+12
|\
| * Merge remote-tracking branch 'asperous/ticket/11731' into developAndreas Fischer2013-07-232-2/+4
| |\
| | * [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-222-2/+4
| * | Merge remote-tracking branch 'nickvergessen/ticket/11728' into developAndreas Fischer2013-07-221-1/+1
| |\ \
| | * | [ticket/11728] Replace topic_approved with topic_visibilityJoas Schilling2013-07-221-1/+1
| |/ /
| * | Merge pull request #1589 from marc1706/ticket/11717Nathan Guse2013-07-224-5/+9
| |\ \ | | |/ | |/|
| | * [ticket/11717] Add 'has' to boolean variable and reduce line lengthMarc Alexander2013-07-221-4/+5
| | * [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-204-5/+8
* | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
* | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
* | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
* | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-22498-5058/+11718
|\ \ \ | |/ /
| * | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-229-222/+566
| |\ \
| | * | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | * | [ticket/11582] Correctly add all required fixturesJoas Schilling2013-07-171-0/+1
| | * | [ticket/11582] Fix little typoJoas Schilling2013-07-141-1/+1
| | * | [ticket/11582] Test the event and and fix it.Joas Schilling2013-07-144-4/+4
| | * | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-0/+0
| | * | [ticket/11582] Fix extension permission testsJoas Schilling2013-07-142-2/+41
| | * | [ticket/11582] Fix missing closing bracketJoas Schilling2013-07-141-2/+2
| | * | [ticket/11582] Fix missing @params in the doc blocksJoas Schilling2013-07-141-2/+7
| | * | [ticket/11582] Remove useless prefixJoas Schilling2013-07-141-133/+133
| | * | [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
| | * | [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-142-258/+247
| | * | [ticket/11582] Remove left over calls to lang['acl_*']Joas Schilling2013-07-142-14/+6
| | * | [ticket/11582] Use member isntead of a new variable everytimeJoas Schilling2013-07-142-12/+10
| | * | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-145-32/+54
| | * | [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-144-10/+35
| | * | [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-142-42/+62
| | * | [ticket/11582] Fix event dispatcher class nameJoas Schilling2013-07-141-3/+3
| | * | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-144-37/+44
| | * | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-144-13/+280
| * | | Merge pull request #1401 from marc1706/ticket/11531Nathan Guse2013-07-225-0/+353
| |\ \ \
| | * | | [ticket/11531] Check if uploaded avatar is properly displayed in testsMarc Alexander2013-07-221-0/+16
| | * | | [ticket/11531] Reduced amount of avatar functional tests to minimumMarc Alexander2013-07-204-349/+0
| | * | | [ticket/11531] Use abstract class for avatar tests and unify test casesMarc Alexander2013-07-177-385/+686
| | * | | 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
| | * | | | 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
| | * | | | | | [ticket/11531] Use assertContainsLang() where possibleMarc Alexander2013-05-252-41/+41
| | * | | | | | [ticket/11531] Add acp and ucp groups functional tests for avatarsMarc Alexander2013-05-132-1/+192
| | * | | | | | [ticket/11531] Add basic set of functional tests for new avatar systemMarc Alexander2013-05-121-0/+210
| * | | | | | | Merge remote-tracking branch 'marc1706/ticket/11725' into developAndreas Fischer2013-07-221-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11725] Use new paths for phpbb_class_loader in file.phpMarc Alexander2013-07-221-2/+2
| * | | | | | | | Merge pull request #1592 from bantu/ticket/11722Nathan Guse2013-07-221-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | [ticket/11722] Remove reference assignment for $captcha in report.phpAndreas Fischer2013-07-221-1/+1
| |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11707' into developAndreas Fischer2013-07-223-5/+11
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-193-5/+11