aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1542 from brunoais/ticket/11638Nathan Guse2013-07-291-46/+10
|\
| * [ticket/11638] Removed the unneeded reset.Bruno Ais2013-07-241-3/+1
| * [ticket/11638] Use the $parse_flags like the other commitsBruno Ais2013-07-241-1/+2
| * [ticket/11638] Reverted to use the $parse tags way as the other onesBruno Ais2013-07-241-3/+2
| * [ticket/11638] Updated: bitwise $parse_flags use optionset()Bruno Ais2013-07-241-2/+3
| * [ticket/11638] Fixed not following guidelines for bracketsBruno Ais2013-07-201-1/+2
| * [ticket/11638] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| * [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-10/+1
| * [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-10/+2
| * [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-11/+3
| * [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-16/+5
* | Merge pull request #1576 from brunoais/ticket/11640Nathan Guse2013-07-291-8/+5
|\ \
| * | [ticket/11640] removed the unsetBruno Ais2013-07-221-1/+0
| * | [ticket/11640] generate_text_for_display on functions_privmsgs.phpBruno Ais2013-07-161-8/+6
| |/
* | Merge pull request #1586 from brunoais/ticket/11654Nathan Guse2013-07-291-13/+2
|\ \
| * | [ticket/11654] Moved some code to reduce line width.Bruno Ais2013-07-231-1/+2
| * | [ticket/11654] first parameter failBruno Ais2013-07-201-1/+1
| * | [ticket/11654] generate_text_for_display on mcp/mcp_warn.phpBruno Ais2013-07-181-13/+1
| |/
* | [ticket/11749] Move event after all template data has been definedMatt Friedman2013-07-291-13/+15
* | [ticket/11749] Template events for topic_list_row_pre/appendMatt Friedman2013-07-275-0/+28
* | [ticket/11749] PHP Events for viewforum.phpMatt Friedman2013-07-271-0/+21
* | [ticket/11749] PHP Events for search.phpMatt Friedman2013-07-271-0/+23
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+1
|\ \
| * \ Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-oly...Nathaniel Guse2013-07-251-1/+1
| |\ \
| | * | [ticket/10917] Using phpbb wrapperOliver Schramm2013-07-241-1/+1
| | * | [ticket/10917] Fixed notice that files are out of date when updating to an un...Oliver Schramm2013-07-241-1/+1
* | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+8
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-oly...Nathaniel Guse2013-07-251-1/+8
| |\ \ \
| | * | | [ticket/11062] If user's language is english there is no further work neededOliver Schramm2013-07-251-1/+1
| | * | | [ticket/11062] Load new strings from user's language file if providedOliver Schramm2013-07-251-0/+7
| | |/ /
* | | | Merge remote-tracking branch 'Elsensee/ticket/11741' into developAndreas Fischer2013-07-251-2/+2
|\ \ \ \
| * | | | [ticket/11741] Fix empty brackets and remove bulletOliver Schramm2013-07-241-2/+2
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-251-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
* | | | | Merge remote-tracking branch 'brunoais/ticket/11656' into developJoas Schilling2013-07-241-11/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/11656] Made the check for the bitfield just like other PR'sBruno Ais2013-07-241-1/+2
| * | | | [ticket/11656] Wrong bitwise ORBruno Ais2013-07-131-1/+1
| * | | | [ticket/11656] Remove line break in function callBruno Ais2013-07-131-2/+1
| * | | | [ticket/11656] generate_text_for_display on memberlist.phpBruno Ais2013-07-131-11/+2
| | |_|/ | |/| |
* | | | [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