aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'brunoais/ticket/11653' into developJoas Schilling2013-08-011-7/+2
|\ | | | | | | | | | | * brunoais/ticket/11653: [ticket/11653] Use $parse_flags [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
| * [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
| | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
* | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11655: [ticket/11653] Use $parse_flags [ticket/11653] Missing ";" [ticket/11655] Use $parse_flags [ticket/11655] wrong var names for the uid and for the bitfield [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
| * | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| * | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| * | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| |/ | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
* | Merge branch 'develop-olympus' into developJoas Schilling2013-07-311-0/+3
|\ \ | | | | | | | | | | | | | | | * develop-olympus: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| * | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-251-0/+3
| | | | | | | | | | | | PHPBB3-10037
* | | 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.
| * | | [ticket/11640] removed the space that I wonder what it was doing there.Bruno Ais2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
* | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
|\ \ \ \ | | | | | | | | | | [ticket/11723] Correctly redirect user to agreement page and let him leave
| * | | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch consists of two changes. The first one will make sure that $agree is correctly reset to 0 and the user redirected back to the agreement page after changing the display language. Secondly, by reseting 'change_lang', the user will be able to agree to the terms on the agreement page again. The changed language will still be kept, as this is correctly saved in the 'lang' field that is passed to the ucp_register page. The variable $agree has also been changed to be boolean. It is not used as an integer anywere in the ucp_register file. PHPBB3-11723
* | | | | Merge pull request #1576 from brunoais/ticket/11640Nathan Guse2013-07-291-8/+5
|\ \ \ \ \ | | |/ / / | |/| | | [ticket/11640] generate_text_for_display on functions_privmsgs.php
| * | | | [ticket/11640] removed the unsetBruno Ais2013-07-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
| * | | | [ticket/11640] generate_text_for_display on functions_privmsgs.phpBruno Ais2013-07-161-8/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
* | | | Merge pull request #1586 from brunoais/ticket/11654Nathan Guse2013-07-291-13/+2
|\ \ \ \ | | | | | | | | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.php
| * | | | [ticket/11654] Moved some code to reduce line width.Bruno Ais2013-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
| * | | | [ticket/11654] first parameter failBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
| * | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.phpBruno Ais2013-07-181-13/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
* | | | Merge remote-tracking branch 'asperous/ticket/11731' into developAndreas Fischer2013-07-231-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11731: [ticket/11731] Remove static calls to captcha garbage collector
| * | | | [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11731
* | | | | Merge pull request #1589 from marc1706/ticket/11717Nathan Guse2013-07-222-2/+6
|\ \ \ \ \ | |/ / / / |/| | | | [ticket/11717] Use topic_posts_approved instead of topic_replies
| * | | | [ticket/11717] Add 'has' to boolean variable and reduce line lengthMarc Alexander2013-07-221-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11717
| * | | | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-202-2/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
* | | | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-223-34/+37
|\ \ \ \ | |/ / / |/| | | Ticket/11582 Split permission logic from translations
| * | | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | | | | | | | | | | | | | | | PHPBB3-11582
| * | | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-340/+0
| | | | | | | | | | | | | | | | 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] Split permission language strings from logicJoas Schilling2013-07-141-126/+126
| | | | | | | | | | | | | | | | 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-144-24/+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-141-42/+61
| | | | | | | | | | | | | | | | 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-143-21/+30
| | | | | | | | | | | | | | | | PHPBB3-11582
| * | | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-142-3/+269
| | | | | | | | | | | | | | | | | | | | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
* | | | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-181-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-2486/+0
| | | | | | | | | | | | PHPBB3-11696
* | | [ticket/11696] Rename constructor to __construct()Joas Schilling2013-07-141-1/+1
| | | | | | | | | | | | PHPBB3-11696
* | | [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-144-20/+2
| | | | | | | | | | | | PHPBB3-11696
* | | [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14247-46792/+1
| | | | | | | | | | | | PHPBB3-11698
* | | 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 appended
| * | | [ticket/11692] Don't update search_type in dev migration if already appendedNathaniel Guse2013-07-131-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11692
* | | | [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
|/ / / | | | | | | | | | | | | | | | Do not locate assets that start with ./ PHPBB3-11694