aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'brunoais/ticket/11653' into developJoas Schilling2013-08-011-7/+2
|\
| * [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
* | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\ \
| * | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| * | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| * | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| |/
* | Merge branch 'develop-olympus' into developJoas Schilling2013-07-311-0/+3
|\ \
| * | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-251-0/+3
* | | Merge pull request #1625 from brunoais/ticket/11640Joas Schilling2013-07-291-1/+1
|\ \ \
| * | | [ticket/11640] removed the space that I wonder what it was doing there.Bruno Ais2013-07-291-1/+1
* | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
|\ \ \ \
| * | | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
* | | | | 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
| |/ / /
* | | | Merge remote-tracking branch 'asperous/ticket/11731' into developAndreas Fischer2013-07-231-1/+2
|\ \ \ \
| * | | | [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-221-1/+2
* | | | | Merge pull request #1589 from marc1706/ticket/11717Nathan Guse2013-07-222-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [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-202-2/+5
| | |/ / | |/| |
* | | | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-223-34/+37
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| * | | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-340/+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] Split permission language strings from logicJoas Schilling2013-07-141-126/+126
| * | | [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-144-24/+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-141-42/+61
| * | | [ticket/11582] Fix event dispatcher class nameJoas Schilling2013-07-141-3/+3
| * | | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-143-21/+30
| * | | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-142-3/+269
* | | | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-181-0/+1
|/ / /
* | | [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-2486/+0
* | | [ticket/11696] Rename constructor to __construct()Joas Schilling2013-07-141-1/+1
* | | [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-144-20/+2
* | | [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14247-46792/+1
* | | Merge pull request #1555 from EXreaction/ticket/11692Nils Adermann2013-07-131-1/+4
|\ \ \
| * | | [ticket/11692] Don't update search_type in dev migration if already appendedNathaniel Guse2013-07-131-1/+4
* | | | [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
|/ / /