Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 | Marc Alexander | 2013-07-14 | 510 | -5963/+12707 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/pr/1570' into develop | David King | 2013-07-14 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | * upstream/pr/1570: [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar | ||||
| | * | [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar | Marc Alexander | 2013-07-14 | 1 | -1/+1 |
| |/ | | | | | | | PHPBB3-11706 | ||||
| * | Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop | Nils Adermann | 2013-07-14 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | * github-phpbb/develop-olympus: [ticket/11704] Use the correct directory for dependency checking. [ticket/11704] Correctly escape " | ||||
| | * | Merge pull request #1567 from bantu/ticket/11704 | Nils Adermann | 2013-07-14 | 1 | -2/+2 |
| | |\ | | | | | | | | | [ticket/11704] phing build script does not include vendor folder, even if there are dependencies | ||||
| | | * | [ticket/11704] Use the correct directory for dependency checking. | Andreas Fischer | 2013-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11704 | ||||
| | | * | [ticket/11704] Correctly escape " | Andreas Fischer | 2013-07-14 | 1 | -1/+1 |
| | |/ | | | | | | | | | | PHPBB3-11704 | ||||
| * | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into develop | Andreas Fischer | 2013-07-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | * galaxyAbstractor/ticket/11697: [ticket/11697] author_search() used incorrect parameter | ||||
| | * | | [ticket/11697] author_search() used incorrect parameter | Victor Nagy | 2013-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The author_search() function in fulltext_mysql.php had an argument $m_approve_fid_ary parameter but it was changed in the Docblock and code to $post_visibility. This change renames that argument according to the docblock, the code and to mirror the other classes. PHPBB3-11697 | ||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11702' into develop | Andreas Fischer | 2013-07-14 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11702: [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php | ||||
| | * | | | [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php | Joas Schilling | 2013-07-14 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | PHPBB3-11702 | ||||
| * | | | Merge pull request #1558 from nickvergessen/ticket/11696 | Nils Adermann | 2013-07-14 | 14 | -40/+3 |
| |\ \ \ | | | | | | | | | | | [ticket/11696] Rename db_tools.php so it can be autoloaded | ||||
| | * | | | [ticket/11696] Move file to new directory | Joas Schilling | 2013-07-14 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11696 | ||||
| | * | | | [ticket/11696] Rename constructor to __construct() | Joas Schilling | 2013-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11696 | ||||
| | * | | | [ticket/11696] Remove manual loading of db_tools in extension controller test | Joas Schilling | 2013-07-14 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember to store the file, before commiting it... PHPBB3-11696 | ||||
| | * | | | [ticket/11696] Rename db_tools.php so it can be autoloaded | Joas Schilling | 2013-07-14 | 13 | -37/+2 |
| |/ / / | | | | | | | | | | | | | PHPBB3-11696 | ||||
| * | | | Merge pull request #1559 from naderman/ticket/11698 | Nathan Guse | 2013-07-13 | 273 | -52/+37 |
| |\ \ \ | | | | | | | | | | | [WIP][ticket/11698] Moving all autoloadable files to phpbb/ | ||||
| | * | | | [ticket/11698] Moving all autoloadable files to phpbb/ | Nils Adermann | 2013-07-14 | 273 | -52/+37 |
| |/ / / | | | | | | | | | | | | | 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 | ||||
| * | | | | Merge remote-tracking branch 'cyberalien/ticket/11694' into develop | David King | 2013-07-13 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11694: [ticket/11694] Do not locate assets with root path | ||||
| | * | | | | [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 | ||||
| * | | | | Merge pull request #1554 from EXreaction/ticket/11675 | Nils Adermann | 2013-07-13 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | [ticket/11675] Fix template loop | ||||
| | * | | | [ticket/11675] Fix template loop | Nathaniel Guse | 2013-07-13 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | PHPBB3-11675 | ||||
| * | | | Merge pull request #1429 from cyberalien/ticket/11553 | Nathan Guse | 2013-07-13 | 6 | -29/+85 |
| |\ \ \ | | |/ / | |/| | | Move bulletin points for linklist lists to pseudo classes | ||||
| | * | | [ticket/11553] Typo | Vjacheslav Trushkin | 2013-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11553 | ||||
| | * | | [ticket/11553] Replace bullet with unicode | Vjacheslav Trushkin | 2013-07-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-11553 | ||||
| | * | | [ticket/11553] Move bulletin points to pseudo class | Vjacheslav Trushkin | 2013-07-11 | 6 | -29/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move bulletin points for .linklist lists to pseudo class Group pseudo classes for .linklist.bulletin and .icon-notification PHPBB3-11553 | ||||
| * | | | Merge pull request #1553 from naderman/ticket/11690 | Nathan Guse | 2013-07-13 | 1 | -5/+12 |
| |\ \ \ | | | | | | | | | | | [ticket/11690] Old module class names may get autoloaded by class_exists | ||||
| | * | | | [ticket/11690] Old module class names may get autoloaded by class_exists | Nils Adermann | 2013-07-13 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11690 | ||||
| * | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | * develop-olympus: [ticket/11686] Not checking for phpBB Debug errors on functional tests | ||||
| | * | | Merge remote-tracking branch 'github-exreaction/ticket/11686' into ↵ | Nils Adermann | 2013-07-13 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/11686: [ticket/11686] Not checking for phpBB Debug errors on functional tests | ||||
| | | * | | [ticket/11686] Not checking for phpBB Debug errors on functional tests | Nathaniel Guse | 2013-07-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11686 | ||||
| * | | | | Merge pull request #1473 from marc1706/ticket/11600 | Nathan Guse | 2013-07-13 | 1 | -22/+108 |
| |\ \ \ \ | | | | | | | | | | | | | [ticket/11600] Increase code test coverage of avatar manager | ||||
| | * | | | | [ticket/11600] Remove duplicate test case | Marc Alexander | 2013-07-04 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600 | ||||
| | * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600 | Marc Alexander | 2013-07-04 | 83 | -1542/+3338 |
| | |\ \ \ \ | |||||
| | * | | | | | [ticket/11600] Use lowercase null and remove duplicate test cases | Marc Alexander | 2013-06-25 | 1 | -11/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600 | ||||
| | * | | | | | [ticket/11600] Use local variable for $user in test_localize_errors | Marc Alexander | 2013-06-25 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600 | ||||
| | * | | | | | [ŧicket/11600] Split get driver tests into tests for all and only enabled ones | Marc Alexander | 2013-06-25 | 1 | -10/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600 | ||||
| | * | | | | | [ticket/11600] Increase code test coverage of avatar manager | Marc Alexander | 2013-06-10 | 1 | -22/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, not all methods and their possible behaviors are tested with unit tests. Add them for better code coverage. PHPBB3-11600 | ||||
| * | | | | | | Merge pull request #1550 from nickvergessen/ticket/9649 | Nathan Guse | 2013-07-13 | 3 | -3/+22 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | [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 | 3 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9649 | ||||
| * | | | | | | | Merge pull request #1436 from cyberalien/ticket/11563 | Nathan Guse | 2013-07-13 | 5 | -50/+50 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix subPanels() in forum_fn.js | ||||
| | * | | | | | | | [ticket/11563] Remove duplicate code | Vjacheslav Trushkin | 2013-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11563 | ||||
| | * | | | | | | | [ticket/11563] Dynamically generate panels list | Vjacheslav Trushkin | 2013-07-11 | 3 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11563 | ||||
| | * | | | | | | | [ticket/11563] Remove unused JS variables | Vjacheslav Trushkin | 2013-07-11 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused JS variables from posting_buttons PHPBB3-11563 | ||||
| | * | | | | | | | [ticket/11563] Fix subPanels() | Vjacheslav Trushkin | 2013-07-11 | 4 | -47/+47 |
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix subPanels() code Modernize subPanels() with jQuery Use HTML5 data attributes instead of including JS PHPBB3-11563 | ||||
| * | | | | | | | Merge pull request #1541 from nickvergessen/ticket/11684 | Nathan Guse | 2013-07-13 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [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 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11684 | ||||
| * | | | | | | | | Merge pull request #1543 from nickvergessen/ticket/11685 | Nathan Guse | 2013-07-13 | 4 | -12/+8 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/11685] Remove logout confirmation page |