aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'Elsensee/ticket/8228' into developJoas Schilling2013-07-316-13/+13
|\
| * [ticket/8228] Fix still existing problems with code in firefoxOliver Schramm2013-07-306-14/+13
| * [ticket/8228] Fix whitespaces before code in FirefoxOliver Schramm2013-07-245-8/+9
* | [ticket/11757] Fix typo in signature_module_auth migrationOliver Schramm2013-07-301-1/+1
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into developJoas Schilling2013-07-301-1/+1
|\ \
| * \ Merge pull request #1630 from brunoais/ticket/11638Joas Schilling2013-07-301-1/+1
| |\ \
| | * | [ticket/11638] Variable names goof...Bruno Ais2013-07-301-1/+1
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-0/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-2/+19
| |\ \ \
| | * \ \ Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12Joas Schilling2013-07-301-2/+19
| | |\ \ \
| | | * | | [ticket/11753] Remove ?> from MySQL Upgrader.Andreas Fischer2013-07-301-2/+0
| | | * | | [ticket/11753] Update MySQL upgrader schema data.Andreas Fischer2013-07-301-0/+19
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12Joas Schilling2013-07-301-1/+2
| | |\ \ \ \
| | | * | | | [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"Andreas Fischer2013-07-301-1/+2
| | | |/ / /
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-8/+2
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10917] Variable used only once so delete itOliver Schramm2013-07-281-7/+1
| * | | | [ticket/10917] Revert use of phpbb wrapperOliver Schramm2013-07-271-1/+1
* | | | | Merge pull request #1625 from brunoais/ticket/11640Joas Schilling2013-07-291-1/+1
|\ \ \ \ \
| * | | | | [ticket/11640] removed the space that I wonder what it was doing there.Bruno Ais2013-07-291-1/+1
* | | | | | Merge pull request #1624 from brunoais/ticket/11638Joas Schilling2013-07-291-8/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | [ticket/11638] Changed the layout to match the other similar commitsBruno Ais2013-07-291-8/+3
* | | | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
|\ \ \ \ \ \
| * | | | | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
* | | | | | | Merge pull request #1542 from brunoais/ticket/11638Nathan Guse2013-07-291-46/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | [ticket/11638] Removed the unneeded reset.Bruno Ais2013-07-241-3/+1
| * | | | | | [ticket/11638] Use the $parse_flags like the other commitsBruno Ais2013-07-241-1/+2
| * | | | | | [ticket/11638] Reverted to use the $parse tags way as the other onesBruno Ais2013-07-241-3/+2
| * | | | | | [ticket/11638] Updated: bitwise $parse_flags use optionset()Bruno Ais2013-07-241-2/+3
| * | | | | | [ticket/11638] Fixed not following guidelines for bracketsBruno Ais2013-07-201-1/+2
| * | | | | | [ticket/11638] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| * | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-10/+1
| * | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-10/+2
| * | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-11/+3
| * | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-16/+5
* | | | | | | Merge pull request #1576 from brunoais/ticket/11640Nathan Guse2013-07-291-8/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | [ticket/11640] removed the unsetBruno Ais2013-07-221-1/+0
| * | | | | | [ticket/11640] generate_text_for_display on functions_privmsgs.phpBruno Ais2013-07-161-8/+6
| |/ / / / /
* | | | | | Merge pull request #1586 from brunoais/ticket/11654Nathan Guse2013-07-291-13/+2
|\ \ \ \ \ \
| * | | | | | [ticket/11654] Moved some code to reduce line width.Bruno Ais2013-07-231-1/+2
| * | | | | | [ticket/11654] first parameter failBruno Ais2013-07-201-1/+1
| * | | | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.phpBruno Ais2013-07-181-13/+1
| |/ / / / /
* | | | | | [ticket/11749] Move event after all template data has been definedMatt Friedman2013-07-291-13/+15
* | | | | | [ticket/11749] Template events for topic_list_row_pre/appendMatt Friedman2013-07-275-0/+28
* | | | | | [ticket/11749] PHP Events for viewforum.phpMatt Friedman2013-07-271-0/+21
* | | | | | [ticket/11749] PHP Events for search.phpMatt Friedman2013-07-271-0/+23