aboutsummaryrefslogtreecommitdiffstats
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-23241-5537/+8041
| |\
| * | [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-038-44/+141
|\ \ \ \
| * | | | [ticket/11850] More namespacesNathan Guse2013-09-301-1/+1
| * | | | [ticket/11850] More namespacesNathan Guse2013-09-303-4/+4
| * | | | [ticket/11850] Fix testsNathan Guse2013-09-301-2/+3
| * | | | [ticket/11850] Need symfony request and filesystem setup globally for sessionNathan Guse2013-09-302-0/+4
| * | | | [ticket/11850] Update for namespacesNathan Guse2013-09-303-5/+10
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850Nathan Guse2013-09-30503-2454/+3546
| |\ \ \ \
| * | | | | [ticket/11850] Fix extract current page testNathan Guse2013-09-192-11/+47
| * | | | | [ticket/11850] Add test for outside of the phpBB directoryNathan Guse2013-09-181-0/+16
| * | | | | [ticket/11850] page_name contains controller request rather than query stringNathan Guse2013-09-174-33/+59
| * | | | | [ticket/11850] Fix $user->page on pages through the controllerNathan Guse2013-09-171-5/+14
* | | | | | Merge pull request #1736 from bantu/ticket/11870Nathan Guse2013-10-033-6/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11870] No longer exclude search/fulltext_*.php from code coverage.Andreas Fischer2013-09-263-6/+0
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-024-19/+63
|\ \ \ \ \ \
| * | | | | | [ticket/11691] Fix conversion testJoas Schilling2013-10-011-1/+1
| * | | | | | [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
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-020-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympusAndreas Fischer2013-10-021-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11879] Replace .live() with .on()Vjacheslav Trushkin2013-10-021-1/+1
* | | | | | | | | Merge pull request #1744 from EXreaction/ticket/11878Joas Schilling2013-10-011-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | [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-3027-292/+285
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| * | | | | | | | [ticket/11852] Move tests to folder with new class nameJoas Schilling2013-09-261-2/+2
| * | | | | | | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2626-290/+108
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-09-303-15/+18
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| * | | | | | | | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-15/+18
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-301-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | [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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-283-0/+16
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |