aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-3027-292/+285
|\ | | | | Ticket/11852 filesystem class must not depend on a web request
| * [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| | | | | | | | PHPBB3-11852
| * [ticket/11852] Move tests to folder with new class nameJoas Schilling2013-09-261-2/+2
| | | | | | | | PHPBB3-11852
| * [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2626-290/+108
| | | | | | | | PHPBB3-11852
* | Merge branch 'develop-olympus' into developNils Adermann2013-09-303-15/+18
|\ \ | | | | | | | | | | | | | | | * develop-olympus: [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml
| * | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| | | | | | | | | | | | PHPBB3-11876
| * | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-15/+18
| | | | | | | | | | | | | | | | | | This also removes paths from the checksum files. PHPBB3-11876
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. Conflicts: build/build.xml
| * | [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.Andreas Fischer2013-09-301-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-283-0/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-283-0/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | * | [prep-release-3.0.12] Update changelog for 3.0.12 release.Andreas Fischer2013-09-281-0/+1
| | | |
| | * | Merge branch 'ticket/11873' into prep-release-3.0.12Andreas Fischer2013-09-282-0/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11873: [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | | * | [ticket/11873] Add unit test for large password input.Joas Schilling2013-09-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The password should be rejected quite fast. PHPBB3-11873
| | | * | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | |/ / | | | | | | | | | | | | PHPBB3-11873
* | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| * | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Fix comments after incorrect merge of previous PR. PHPBB3-11862
* | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| * | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-271-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: build/build.xml phpBB/install/database_update.php
| * | | | [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
| | | | |
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-272-2/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-274-5/+11
| | | | |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-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-olympusAndreas Fischer2013-09-261-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_forumsMarc Alexander2013-09-251-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 developAndreas Fischer2013-09-264-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 testVjacheslav Trushkin2013-09-261-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11868
| * | | | Merge pull request #3 from nickvergessen/ticket/cyberalien/11868Vjacheslav Trushkin2013-09-261-0/+49
| |\ \ \ \ | | | | | | | | | | | | Ticket/cyberalien/11868
| | * | | | [ticket/11868] Add functional test for registrationJoas Schilling2013-09-261-0/+49
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11868
| * | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-263-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11868
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-263-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 templatesNathan Guse2013-09-193-5/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11816
* | | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-258-34/+10
|\ \ \ \ \ | | | | | | | | | | | | Ticket/11866 Fix some more namespace issues
| * | | | | [ticket/11866] Only single backslash in .md filesJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | [ticket/11866] More namespacesJoas Schilling2013-09-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-265-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
* | | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-252-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11865] includes/bbcode.php is missing namespace change
| * | | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11865
| * | | | | | [ticket/11865] Add bbcodes to functional posting testsJoas Schilling2013-09-261-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11865
* | | | | | Merge pull request #1673 from nickvergessen/ticket/11805Nathan Guse2013-09-254-13/+170
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ticket/11805] Allow specifying the page in the route for pagination
| * | | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
| * | | | | [ticket/11805] Rename test to match the function nameJoas Schilling2013-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
| * | | | | [ticket/11805] Add unit tests for paginationJoas Schilling2013-09-252-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
| * | | | | [ticket/11805] Do not generate the same link twiceJoas Schilling2013-09-251-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 routesJoas Schilling2013-09-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
| * | | | | [ticket/11805] Allow specifying the page in the route for paginationJoas Schilling2013-09-251-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/11700Nils Adermann2013-09-25477-2119/+2985
|\ \ \ \ \ | |_|_|_|/ |/| | | | [WIP][ticket/11700] Namespaces
| * | | | [ticket/11700] Undo migrations migration, as not an issue for new installsNils Adermann2013-09-251-55/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700