aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11883' into developDhruv2013-10-043-6/+20
|\ | | | | | | | | | | | | | | # By Nathan (1) and Nathan Guse (1) # Via Nathan Guse * EXreaction/ticket/11883: [ticket/11883] Only output the migration time, not total [ticket/11883] Report completed data step in migration as "Installing Data"
| * [ticket/11883] Only output the migration time, not totalNathan Guse2013-10-041-3/+3
| | | | | | | | PHPBB3-11883
| * [ticket/11883] Report completed data step in migration as "Installing Data"Nathan2013-10-023-6/+20
| | | | | | | | PHPBB3-11883
* | Merge pull request #1739 from nickvergessen/ticket/11871Nathan Guse2013-10-033-11/+29
|\ \ | | | | | | [ticket/11871] Allow backslash in classnames for Modules
| * | [ticket/11871] Fallback to int ID of the module, when creating linksJoas Schilling2013-10-021-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | Firefox is currently unable to correctly copy a urlencoded \ so users will be unable to post links to modules. However we can still fallback to the id instead of the name, so we do that in this case. PHPBB3-11871
| * | [ticket/11871] Allow backslash in classnames for ModulesJoas Schilling2013-09-272-7/+2
| | | | | | | | | | | | PHPBB3-11871
* | | Merge pull request #1704 from dhruvgoel92/ticket/11344Nathan Guse2013-10-031-0/+42
|\ \ \ | | | | | | | | [ticket/11344] Add migration to remove acp_style_components module in 3.1
| * | | [ticket/11344] Upgrade migration to namespacesDhruv2013-10-031-2/+4
| | | | | | | | | | | | | | | | PHPBB3-11344
| * | | [ticket/11344] Fix url of licenseDhruv2013-10-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11344
| * | | [ticket/11344] Add migration to remove acp_style_components module in 3.1Dhruv2013-10-031-0/+40
| | |/ | |/| | | | | | | PHPBB3-11344
* | | Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-037-17/+17
|\ \ \ | | | | | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * | | [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_beforerechosen2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The core.group_delete_user_before event had bad indentation in its PHPDoc. Fixed. PHPBB3-11786
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-23194-5106/+6889
| |\ \ \
| * | | | [ticket/11786] Further improve wording in phpbb/notification/type/quote.phprechosen2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further improve wording in phpbb/notification/type/quote.php per suggestion of imkingdavid. PHPBB3-11786
| * | | | [ticket/11786] s/@return void/@return null in content_visibility.phprechosen2013-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file phpbb/content_visibility.php still contained a few instances of '@return void' in its PHPDoc blocks, fixed. Thanks to JoshyPHP for reporting. PHPBB3-11786
| * | | | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-133-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
| * | | | [ticket/11786] Fix typo and ugly English in the notification system PHPDocrechosen2013-08-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The notification system contained two PHPDoc lines that needed improvement. PHPBB3-11786
* | | | | Merge pull request #1746 from EXreaction/ticket/11882David King2013-10-032-1/+6
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11882] Incorrect dependency in signature module auth migration
| * | | | | [ticket/11882] If dependency is incorrect/unfulfillable, throw an errorNathan2013-10-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11882
| * | | | | [ticket/11882] Incorrect dependency in signature module auth migrationNathan2013-10-021-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-11882
* | | | | Merge pull request #1726 from EXreaction/ticket/11850David King2013-10-033-5/+19
|\ \ \ \ \ | |/ / / / |/| | | | Fix $user->page on pages through the controller
| * | | | [ticket/11850] Need symfony request and filesystem setup globally for sessionNathan Guse2013-09-302-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850Nathan Guse2013-09-30339-1798/+2658
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nils Adermann (68) and others # Via Andreas Fischer (12) and others * 'develop' of github.com:phpbb/phpbb3: (102 commits) [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. [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. [ticket/11862] Correct var names in user_delete() events due to prune-users [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. [ticket/11852] Add class file [ticket/11852] Move tests to folder with new class name [ticket/11852] Split filesystem and path_helper into 2 classes [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references [ticket/11866] Only single backslash in .md files [ticket/11866] Remove outdated and broken develop script [ticket/11866] More namespaces [ticket/11866] Update some occurances of phpbb_db_ to new Namespace [ticket/11865] Convert old class name to namespaced version ... Conflicts: tests/security/extract_current_page_test.php tests/session/testable_facade.php
| * | | | | [ticket/11850] page_name contains controller request rather than query stringNathan Guse2013-09-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing tests PHPBB3-11850
| * | | | | [ticket/11850] Fix $user->page on pages through the controllerNathan Guse2013-09-171-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-023-18/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11691: [ticket/11691] Fix conversion test [ticket/11691] Fix table names and arguments/docs [ticket/11691] Move purge code into new function [ticket/11691] Fix typo in comment [ticket/11691] Add order by to the query [ticket/11691] Fix some minor comments [ticket/11691] Fix some more problems with softdelete update [ticket/11691] Change detection of effectively_installed() [ticket/11691] Stagger user notification reconversion even more [ticket/11691] Stagger the convertion of soft delete updates
| * | | | | | [ticket/11691] Fix table names and arguments/docsJoas Schilling2013-09-261-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
| * | | | | | [ticket/11691] Move purge code into new functionJoas Schilling2013-09-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
| * | | | | | [ticket/11691] Fix typo in commentJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
| * | | | | | [ticket/11691] Add order by to the queryJoas Schilling2013-09-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
| * | | | | | [ticket/11691] Fix some minor commentsJoas Schilling2013-09-261-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
| * | | | | | [ticket/11691] Fix some more problems with softdelete updateJoas Schilling2013-09-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * wrong order of arguments on sql_query_limit * avoid "BIGINT UNSIGNED value is out of range" errors * increase limit for the loop PHPBB3-11691
| * | | | | | [ticket/11691] Change detection of effectively_installed()Joas Schilling2013-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When start is set for a migration, it is not yet effectively installed. So we just continue doing it... PHPBB3-11691
| * | | | | | [ticket/11691] Stagger user notification reconversion even moreJoas Schilling2013-09-261-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
| * | | | | | [ticket/11691] Stagger the convertion of soft delete updatesJoas Schilling2013-09-261-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11691
* | | | | | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modulesNathan Guse2013-10-021-2/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | PHPBB3-11878
* | | | | | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-3014-217/+238
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2613-217/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11852
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-282-0/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-282-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | | | |
| | * | | | | | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11873
| * | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-271-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-273-3/+9
| | | | | | | |
* | | | | | | | [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-261-1/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-17 18:14:13 +0000