| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | [ticket/13689] Allow modifying the query for postgres native fulltext search | brunoais | 2015-03-12 | 1 | -0/+49 | |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13689 | |||||
| | | * | | | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructors | brunoais | 2015-03-12 | 4 | -4/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685 | |||||
| * | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-09 | 4 | -4/+85 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php | |||||
| | * | | | | | | Merge pull request #3479 from brunoais/ticket/13685 | Marc Alexander | 2015-06-09 | 4 | -4/+85 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search | |||||
| | | * | | | | | | [ticket/13685] phpBB, not PhpBB | brunoais | 2015-06-09 | 4 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685 | |||||
| | | * | | | | | | [ticket/13685] BUMP version to 3.1.5-dev | brunoais | 2015-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685 | |||||
| | | * | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search | brunoais | 2015-06-07 | 1 | -0/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685 | |||||
| | | * | | | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructors | brunoais | 2015-06-07 | 4 | -4/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685 | |||||
| * | | | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-06-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13888] Fix sql_freeresult() error on author searches | |||||
| | * | | | | | | | [ticket/13888] Fix sql_freeresult() error on author searches | CHItA | 2015-06-07 | 1 | -1/+1 | |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | PHPBB3-13888 | |||||
| * | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-07 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_board.php phpBB/includes/acp/acp_jabber.php | |||||
| | * | | | | | | Merge pull request #22 from phpbb/ticket/sec-184 | Marc Alexander | 2015-06-07 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/sec-184] Do not output passwords to HTML | |||||
| | | * | | | | | | [ticket/sec-184] Do not output LDAP password to HTML | Joas Schilling | 2015-06-04 | 1 | -2/+1 | |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | SECURITY-184 | |||||
| * | | | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-06-06 | 1 | -2/+14 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #3680 from marc1706/ticket/13917 | Tristan Darricau | 2015-06-06 | 1 | -2/+14 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13917] Use hash_equals() if possible in password driver helper | |||||
| | | * | | | | | | [ticket/13917] Do not pass non-string variables to hash_equals() | Marc Alexander | 2015-06-04 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13917 | |||||
| | | * | | | | | | [ticket/13917] Use hash_equals() if it's available | Marc Alexander | 2015-06-04 | 1 | -0/+6 | |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13917 | |||||
| * | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-04 | 3 | -5/+12 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #3502 from marc1706/ticket/13564 | Joas Schilling | 2015-06-04 | 3 | -5/+12 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | [ticket/13564] Unlink user accounts upon deleting user | |||||
| | | * | | | | | [ticket/13564] Use user_id from link_data for unlinking account in oauth | Marc Alexander | 2015-03-24 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564 | |||||
| | | * | | | | | [ticket/13564] Allow to specify user id for retrieving auth link data | Marc Alexander | 2015-03-24 | 3 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564 | |||||
| * | | | | | | | [ticket/13777] Remove module_class_not_defined_exception | MateBartus | 2015-05-31 | 2 | -20/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777 | |||||
| * | | | | | | | [ticket/13777] Reorder get_module_infos() method's arguments | MateBartus | 2015-05-31 | 2 | -8/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777 | |||||
| * | | | | | | | [ticket/13777] Use module manager in phpBB core files | MateBartus | 2015-05-31 | 3 | -53/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777 | |||||
| * | | | | | | | [ticket/13777] Move module management into service | MateBartus | 2015-05-31 | 4 | -0/+627 | |
| | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | PHPBB3-13777 | |||||
| * | | | | | | Merge pull request #3592 from Nicofuma/ticket/13388 | Nils Adermann | 2015-05-30 | 1 | -7/+124 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [ticket/13388] Integrate routing and di parameters resolution | |||||
| | * | | | | | | [ticket/13388] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388 | |||||
| | * | | | | | | [ticket/13388] Fix deprecations | Tristan Darricau | 2015-05-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388 | |||||
| | * | | | | | | [ticket/13388] Fix rebase | Tristan Darricau | 2015-05-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388 | |||||
| | * | | | | | | [ticket/13388] Address comments | Tristan Darricau | 2015-05-29 | 1 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388 | |||||
| | * | | | | | | [ticket/13388] Integrate routing and di parameters resolution | Tristan Darricau | 2015-05-29 | 1 | -7/+123 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388 | |||||
| * | | | | | | | [ticket/13896] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13896 | |||||
| * | | | | | | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 16 | -17/+3 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock | |||||
| | * | | | | | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 16 | -17/+3 | |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | [ticket/13790] Update phpcs | |||||
| | | * | | | | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 16 | -17/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13790 | |||||
| * | | | | | | Merge pull request #3561 from s9e/ticket/10922 | Tristan Darricau | 2015-05-29 | 1 | -2/+13 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/10922] Added support for body and subject in email BBCode | |||||
| | * | | | | | | [ticket/10922] Replaced urlencode() with rawurlencode() | JoshyPHP | 2015-04-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922 | |||||
| | * | | | | | | [ticket/10922] Added support for body and subject in email BBCode | JoshyPHP | 2015-04-28 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10922 | |||||
| * | | | | | | | Merge pull request #3613 from nickvergessen/ticket/13844 | Tristan Darricau | 2015-05-29 | 6 | -15/+466 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files | |||||
| | * | | | | | | | [ticket/13844] Add events | Joas Schilling | 2015-05-20 | 2 | -11/+57 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | |||||
| | * | | | | | | | [ticket/13844] Remove hacky code for the help array | Joas Schilling | 2015-05-17 | 2 | -15/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | |||||
| | * | | | | | | | [ticket/13844] FAQ in new controller format | Joas Schilling | 2015-05-16 | 1 | -0/+165 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | |||||
| | * | | | | | | | [ticket/13844] Refactor bbcode help to the new system | Joas Schilling | 2015-05-16 | 3 | -0/+251 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844 | |||||
| * | | | | | | | | Merge pull request #3616 from s9e/ticket/13847 | Tristan Darricau | 2015-05-29 | 2 | -0/+50 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils | |||||
| | * | | | | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortest | JoshyPHP | 2015-05-25 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will enclose attribute values in single- or double- quotes depending on whichever requires the least escaping. Characters that need to be escaped are always escaped regardless. PHPBB3-13847 | |||||
| | * | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils | JoshyPHP | 2015-05-25 | 2 | -0/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847 | |||||
| * | | | | | | | | | Merge pull request #3622 from s9e/ticket/13860 | Tristan Darricau | 2015-05-29 | 1 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13860] Fixed array-to-string conversion | |||||
| | * | | | | | | | | | [ticket/13860] Fixed array-to-string conversion | JoshyPHP | 2015-05-28 | 1 | -1/+7 | |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13860 | |||||
| * | | | | | | | | | Merge pull request #3625 from s9e/ticket/11742 | Tristan Darricau | 2015-05-29 | 1 | -43/+0 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11742] Remove tabs-to-space conversion in [code] | |||||
| | * | | | | | | | | | [ticket/11742] Removed tabs-to-space conversion in [code] | JoshyPHP | 2015-05-23 | 1 | -43/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11742 | |||||
