Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-26 | 1 | -1/+0 |
|\ | | | | | | | | | * develop-olympus: [ticket/11864] Do not call exit after display_progress_bar in acp_forums | ||||
| * | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympus | Andreas Fischer | 2013-09-26 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | * marc1706/ticket/11864: [ticket/11864] Do not call exit after display_progress_bar in acp_forums | ||||
| | * | [ticket/11864] Do not call exit after display_progress_bar in acp_forums | Marc Alexander | 2013-09-25 | 1 | -1/+0 |
| |/ | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864 | ||||
* | | Merge remote-tracking branch 'cyberalien/ticket/11868' into develop | Andreas Fischer | 2013-09-26 | 4 | -7/+59 |
|\ \ | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11868: [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references | ||||
| * | | [ticket/11868] Add @depends to test | Vjacheslav Trushkin | 2013-09-26 | 1 | -0/+3 |
| | | | | | | | | | | | | PHPBB3-11868 | ||||
| * | | Merge pull request #3 from nickvergessen/ticket/cyberalien/11868 | Vjacheslav Trushkin | 2013-09-26 | 1 | -0/+49 |
| |\ \ | | | | | | | | | Ticket/cyberalien/11868 | ||||
| | * | | [ticket/11868] Add functional test for registration | Joas Schilling | 2013-09-26 | 1 | -0/+49 |
| |/ / | | | | | | | | | | PHPBB3-11868 | ||||
| * | | [ticket/11868] Replace phpbb_request_interface references | Vjacheslav Trushkin | 2013-09-26 | 3 | -7/+7 |
| | | | | | | | | | | | | PHPBB3-11868 | ||||
* | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into develop | Joas Schilling | 2013-09-26 | 3 | -5/+8 |
|\ \ \ | |/ / |/| | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates | ||||
| * | | [ticket/11816] Fix multiple parenthesis as well before $VARs in templates | Nathan Guse | 2013-09-19 | 3 | -5/+8 |
| | | | | | | | | | | | | PHPBB3-11816 | ||||
* | | | Merge pull request #1733 from nickvergessen/ticket/11866 | David King | 2013-09-25 | 8 | -34/+10 |
|\ \ \ | | | | | | | | | Ticket/11866 Fix some more namespace issues | ||||
| * | | | [ticket/11866] Only single backslash in .md files | Joas Schilling | 2013-09-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11866 | ||||
| * | | | [ticket/11866] Remove outdated and broken develop script | Joas Schilling | 2013-09-26 | 1 | -24/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-11866 | ||||
| * | | | [ticket/11866] More namespaces | Joas Schilling | 2013-09-26 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-11866 | ||||
| * | | | [ticket/11866] Update some occurances of phpbb_db_ to new Namespace | Joas Schilling | 2013-09-26 | 5 | -5/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-11866 | ||||
* | | | | Merge pull request #1732 from nickvergessen/ticket/11865 | David King | 2013-09-25 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | [ticket/11865] includes/bbcode.php is missing namespace change | ||||
| * | | | | [ticket/11865] Convert old class name to namespaced version | Joas Schilling | 2013-09-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11865 | ||||
| * | | | | [ticket/11865] Add bbcodes to functional posting tests | Joas Schilling | 2013-09-26 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | PHPBB3-11865 | ||||
* | | | | Merge pull request #1673 from nickvergessen/ticket/11805 | Nathan Guse | 2013-09-25 | 4 | -13/+170 |
|\ \ \ \ | |/ / / |/| | | | [ticket/11805] Allow specifying the page in the route for pagination | ||||
| * | | | [ticket/11805] Move page-url generating code into a new function | Joas Schilling | 2013-09-25 | 1 | -28/+29 |
| | | | | | | | | | | | | | | | | PHPBB3-11805 | ||||
| * | | | [ticket/11805] Rename test to match the function name | Joas Schilling | 2013-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11805 | ||||
| * | | | [ticket/11805] Add unit tests for pagination | Joas Schilling | 2013-09-25 | 2 | -0/+123 |
| | | | | | | | | | | | | | | | | PHPBB3-11805 | ||||
| * | | | [ticket/11805] Do not generate the same link twice | Joas Schilling | 2013-09-25 | 1 | -20/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | There is no need to generate the prev/next links twice PHPBB3-11805 | ||||
| * | | | [ticket/11805] Fix "jump to page" feature for pagination in routes | Joas Schilling | 2013-09-25 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | PHPBB3-11805 | ||||
| * | | | [ticket/11805] Allow specifying the page in the route for pagination | Joas Schilling | 2013-09-25 | 1 | -6/+45 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of "app.php?controller=news&start=10" authors might prefer having the pagination in the route. So the sample link from above would be the same as "app.php?controller=news/page/2". With this patch that is easily possible. What you do is, you specify the $base_url and $start_name as follows: $base_url = $controller_helper->url('news/page/%d'); $start_name = '/page/%d'; // Part of the url that will be removed // for page 1 Now this will generate: "news" for start = 0 "news/page/1" will work aswell, but will not be created "news/page/2" for start = 10 PHPBB3-11805 | ||||
* | | | Merge pull request #1565 from naderman/ticket/11700 | Nils Adermann | 2013-09-25 | 477 | -2119/+2985 |
|\ \ \ | | | | | | | | | [WIP][ticket/11700] Namespaces | ||||
| * | | | [ticket/11700] Undo migrations migration, as not an issue for new installs | Nils Adermann | 2013-09-25 | 1 | -55/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Update migrations table for namespaces | Nils Adermann | 2013-09-25 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Only replace phpbb_search in strings that match | Nils Adermann | 2013-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Use spaces, not tabs | Nils Adermann | 2013-09-25 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Return class names with leading backslash in finder | Nils Adermann | 2013-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | Merge pull request #3 from nickvergessen/ticket/naderman/11700 | Nils Adermann | 2013-09-25 | 2 | -2/+7 |
| |\ \ \ | | | | | | | | | | | Ticket/naderman/11700 | ||||
| | * | | | [ticket/11700] Escape Backslashes from schema_data.sql for MySQLi | Joas Schilling | 2013-09-25 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| | * | | | [ticket/11700] Fix unresolvable condition in migration | Joas Schilling | 2013-09-25 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] No need to escape \ in SQL string | Nils Adermann | 2013-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Correctly load templates for extensions | Nils Adermann | 2013-09-19 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Get unit tests to run again with namespaces | Nils Adermann | 2013-09-19 | 4 | -5/+9 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Fix extension loading with namespaces | Nils Adermann | 2013-09-19 | 23 | -46/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | class loader now expects all classes to be prefixed with a backslash when resolving paths PHPBB3-11700 | ||||
| * | | | [ticket/11700] Change search backend db entry to namespaces | Nils Adermann | 2013-09-19 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Fix redirection in common.php until fs dependency on request ↵ | Nils Adermann | 2013-09-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | is removed PHPBB3-11700 | ||||
| * | | | [ticket/11700] Correctly load avatar templates for namespaced drivers | Nils Adermann | 2013-09-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Correct ucp_auth_link request interface references | Nils Adermann | 2013-09-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Correctly handle avatar drivers with namespaces | Nils Adermann | 2013-09-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Fix some more incorrectly changed comments | Nils Adermann | 2013-09-19 | 14 | -15/+15 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Add file headers to develop scripts for namespace | Nils Adermann | 2013-09-19 | 2 | -0/+30 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Replace some leftover phpbb_filesystem uses | Nils Adermann | 2013-09-17 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Namespacif skipped filesystem instantiation in test | Nils Adermann | 2013-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Namespace needed for mock object in web path test | Nils Adermann | 2013-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Get functional tests running after develop merge | Nils Adermann | 2013-09-17 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 | ||||
| * | | | [ticket/11700] Fix unit tests after develop merge | Nils Adermann | 2013-09-17 | 16 | -32/+34 |
| | | | | | | | | | | | | | | | | PHPBB3-11700 |