aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-2413-208/+156
* [ticket/11628] Remove style path providerNathaniel Guse2013-07-247-281/+3
* [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-246-563/+3
* [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-23373-2157/+5085
|\
| * Merge pull request #1601 from nickvergessen/ticket/11734Nathan Guse2013-07-231-0/+11
| |\
| | * [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
| * | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-231-4/+5
| |\ \ | | |/ | |/|
| | * [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
| * | Merge remote-tracking branch 'nickvergessen/ticket/11733' into developAndreas Fischer2013-07-231-1/+1
| |\ \
| | * | [ticket/11733] Fix "Illegal offset type" Warning caused by overall feedJoas Schilling2013-07-231-1/+1
| * | | 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
| * | | | [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
| * | | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-226-219/+523
| |\ \ \
| | * | | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | * | | [ticket/11582] Test the event and and fix it.Joas Schilling2013-07-141-1/+1
| | * | | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-0/+0
| | * | | [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 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
| * | | | | [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-221-4/+8
| |\ \ \ \
| | * | | | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-191-4/+8
| | | |_|/ | | |/| |
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-221-3/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-221-3/+6
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-r...Andreas Fischer2013-07-221-3/+6
| | | |\ \ \
| | | | * | | [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
| * | | | | | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-182-2/+5
| | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'cyberalien/ticket/11712' into developAndreas Fischer2013-07-181-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/11712] Fixing typo in editor.jsVjacheslav Trushkin2013-07-181-1/+1
| * | | | | | Merge remote-tracking branch 'cyberalien/ticket/11708' into developJoas Schilling2013-07-171-0/+4
| |\ \ \ \ \ \
| | * | | | | | [ticket/11708] Fix bulletin points in notificationsVjacheslav Trushkin2013-07-161-0/+4
| | |/ / / / /
| * | | | | | [ticket/10931] Add phpbb_php_ini as a service.Andreas Fischer2013-07-161-0/+3
| |/ / / / /
| * | | | | [ticket/11706] Use @ to suppress errors for getimagesize in remote avatarMarc Alexander2013-07-141-1/+1