aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-037-17/+17
|\
| * [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_beforerechosen2013-09-231-2/+2
| * 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
| * | [ticket/11786] s/@return void/@return null in content_visibility.phprechosen2013-08-131-3/+3
| * | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-133-10/+10
| * | [ticket/11786] Fix typo and ugly English in the notification system PHPDocrechosen2013-08-132-2/+2
* | | Merge pull request #1746 from EXreaction/ticket/11882David King2013-10-032-1/+6
|\ \ \
| * | | [ticket/11882] If dependency is incorrect/unfulfillable, throw an errorNathan2013-10-021-0/+5
| * | | [ticket/11882] Incorrect dependency in signature module auth migrationNathan2013-10-021-1/+1
* | | | Merge pull request #1726 from EXreaction/ticket/11850David King2013-10-033-5/+19
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11850] Need symfony request and filesystem setup globally for sessionNathan Guse2013-09-302-0/+4
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850Nathan Guse2013-09-30339-1798/+2658
| |\ \ \
| * | | | [ticket/11850] page_name contains controller request rather than query stringNathan Guse2013-09-171-5/+6
| * | | | [ticket/11850] Fix $user->page on pages through the controllerNathan Guse2013-09-171-5/+14
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-023-18/+62
|\ \ \ \ \
| * | | | | [ticket/11691] Fix table names and arguments/docsJoas Schilling2013-09-261-8/+8
| * | | | | [ticket/11691] Move purge code into new functionJoas Schilling2013-09-261-7/+7
| * | | | | [ticket/11691] Fix typo in commentJoas Schilling2013-09-261-1/+1
| * | | | | [ticket/11691] Add order by to the queryJoas Schilling2013-09-261-1/+2
| * | | | | [ticket/11691] Fix some minor commentsJoas Schilling2013-09-261-4/+3
| * | | | | [ticket/11691] Fix some more problems with softdelete updateJoas Schilling2013-09-261-4/+9
| * | | | | [ticket/11691] Change detection of effectively_installed()Joas Schilling2013-09-261-1/+3
| * | | | | [ticket/11691] Stagger user notification reconversion even moreJoas Schilling2013-09-261-7/+24
| * | | | | [ticket/11691] Stagger the convertion of soft delete updatesJoas Schilling2013-09-261-3/+23
* | | | | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modulesNathan Guse2013-10-021-2/+2
| |_|/ / / |/| | | |
* | | | | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-3014-217/+238
|\ \ \ \ \
| * | | | | [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| * | | | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2613-217/+63
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-282-0/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-282-0/+8
| |\ \ \ \ \ \
| | * | | | | | [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
| * | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-271-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | [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
* | | | | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
* | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11868' into developAndreas Fischer2013-09-262-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-257-33/+9
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| * | | | | | | [ticket/11866] More namespacesJoas Schilling2013-09-262-5/+5
| * | | | | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-264-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| |/ / / / / /