| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1625 from brunoais/ticket/11640 | Joas Schilling | 2013-07-29 | 1 | -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 Ais | 2013-07-29 | 1 | -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/11723 | Nathan Guse | 2013-07-29 | 1 | -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 leave | Marc Alexander | 2013-07-22 | 1 | -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/11640 | Nathan Guse | 2013-07-29 | 1 | -8/+5 |
| |\ \ \ | | |/ | |/| | [ticket/11640] generate_text_for_display on functions_privmsgs.php | ||||
| | * | | [ticket/11640] removed the unset | Bruno Ais | 2013-07-22 | 1 | -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.php | Bruno Ais | 2013-07-16 | 1 | -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/11654 | Nathan Guse | 2013-07-29 | 1 | -13/+2 |
| |\ \ \ | | | | | | | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.php | ||||
| | * | | | [ticket/11654] Moved some code to reduce line width. | Bruno Ais | 2013-07-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654 | ||||
| | * | | | [ticket/11654] first parameter fail | Bruno Ais | 2013-07-20 | 1 | -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.php | Bruno Ais | 2013-07-18 | 1 | -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 develop | Andreas Fischer | 2013-07-23 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | * asperous/ticket/11731: [ticket/11731] Remove static calls to captcha garbage collector | ||||
| | * | | | [ticket/11731] Remove static calls to captcha garbage collector | Andy Chase | 2013-07-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-11731 | ||||
| * | | | | Merge pull request #1589 from marc1706/ticket/11717 | Nathan Guse | 2013-07-22 | 2 | -2/+6 |
| |\ \ \ \ | |/ / / |/| | | | [ticket/11717] Use topic_posts_approved instead of topic_replies | ||||
| | * | | | [ticket/11717] Add 'has' to boolean variable and reduce line length | Marc Alexander | 2013-07-22 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | PHPBB3-11717 | ||||
| | * | | | [ticket/11717] Use topic_posts_approved instead of topic_replies | Marc Alexander | 2013-07-20 | 2 | -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/11582 | Nathan Guse | 2013-07-22 | 3 | -34/+37 |
| |\ \ \ | |/ / |/| | | Ticket/11582 Split permission logic from translations | ||||
| | * | | [ticket/11582] Move global declaration to beginning of block | Joas Schilling | 2013-07-22 | 1 | -2/+1 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Move file to new directory | Joas Schilling | 2013-07-14 | 1 | -340/+0 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Fix missing closing bracket | Joas Schilling | 2013-07-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Fix missing @params in the doc blocks | Joas Schilling | 2013-07-14 | 1 | -2/+7 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Remove useless prefix | Joas Schilling | 2013-07-14 | 1 | -133/+133 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Split permission language strings from logic | Joas Schilling | 2013-07-14 | 1 | -126/+126 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Remove left over calls to lang['acl_*'] | Joas Schilling | 2013-07-14 | 2 | -14/+6 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Use member isntead of a new variable everytime | Joas Schilling | 2013-07-14 | 2 | -12/+10 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Use new methods and remove duplicated entries | Joas Schilling | 2013-07-14 | 4 | -24/+54 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Add methods to return the language string | Joas Schilling | 2013-07-14 | 4 | -10/+35 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Add event in constructor and add docs | Joas Schilling | 2013-07-14 | 1 | -42/+61 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Fix event dispatcher class name | Joas Schilling | 2013-07-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Use new class for categories | Joas Schilling | 2013-07-14 | 3 | -21/+30 |
| | | | | | | | | | | | | | PHPBB3-11582 | ||||
| | * | | [ticket/11582] Add new service for permissions | Joas Schilling | 2013-07-14 | 2 | -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 deleted | Marc Alexander | 2013-07-18 | 1 | -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 directory | Joas Schilling | 2013-07-14 | 1 | -2486/+0 |
| | | | | | | | | | PHPBB3-11696 | ||||
| * | | [ticket/11696] Rename constructor to __construct() | Joas Schilling | 2013-07-14 | 1 | -1/+1 |
| | | | | | | | | | PHPBB3-11696 | ||||
| * | | [ticket/11696] Rename db_tools.php so it can be autoloaded | Joas Schilling | 2013-07-14 | 4 | -20/+2 |
| | | | | | | | | | PHPBB3-11696 | ||||
| * | | [ticket/11698] Moving all autoloadable files to phpbb/ | Nils Adermann | 2013-07-14 | 247 | -46792/+1 |
| | | | | | | | | | PHPBB3-11698 | ||||
| * | | Merge pull request #1555 from EXreaction/ticket/11692 | Nils Adermann | 2013-07-13 | 1 | -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 appended | Nathaniel Guse | 2013-07-13 | 1 | -1/+4 |
| | | | | | | | | | | | | | PHPBB3-11692 | ||||
| * | | | [ticket/11694] Do not locate assets with root path | Vjacheslav Trushkin | 2013-07-13 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | Do not locate assets that start with ./ PHPBB3-11694 | ||||
| * | | [ticket/11690] Old module class names may get autoloaded by class_exists | Nils Adermann | 2013-07-13 | 1 | -5/+12 |
| | | | | | | | | | PHPBB3-11690 | ||||
| * | | Merge pull request #1550 from nickvergessen/ticket/9649 | Nathan Guse | 2013-07-13 | 1 | -1/+9 |
| |\ \ | | | | | | | [ticket/9649] Display information on index for moderators on unapproved posts | ||||
| | * | | [ticket/9649] Display information on index for moderators on unapproved posts | Joas Schilling | 2013-07-13 | 1 | -1/+9 |
| | | | | | | | | | | | | | PHPBB3-9649 | ||||
| * | | | Merge pull request #1541 from nickvergessen/ticket/11684 | Nathan Guse | 2013-07-13 | 1 | -2/+1 |
| |\ \ \ | | | | | | | | | [ticket/11684] Remove useless confirmation page after login and admin login | ||||
| | * | | | [ticket/11684] Remove useless confirmation page after login and admin login | Joas Schilling | 2013-07-13 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-11684 | ||||
| * | | | | Merge pull request #1543 from nickvergessen/ticket/11685 | Nathan Guse | 2013-07-13 | 1 | -3/+1 |
| |\ \ \ \ | | | | | | | | | | | [ticket/11685] Remove logout confirmation page | ||||
| | * | | | | [ticket/11685] Remove logout confirmation page | Joas Schilling | 2013-07-13 | 1 | -3/+1 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-11685 | ||||
| * | | | | [ticket/10999] Fix assets_version in ACP | Vjacheslav Trushkin | 2013-07-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-10999 | ||||
| * | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 3 | -3/+3 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php | ||||
| | * | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Nils Adermann | 2013-07-13 | 3 | -3/+3 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com | ||||
| | | * | | | [ticket/11112] Use https for user-visible links to phpbb.com | Marc Alexander | 2013-07-12 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112 | ||||
