aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_afterrechosen2013-08-022-0/+2
* [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_beforerechosen2013-08-022-0/+2
* [ticket/9550] Add template event viewtopic_body_post_buttons_beforerechosen2013-08-022-1/+2
* [ticket/9550] Add template event viewtopic_body_post_buttons_afterrechosen2013-08-022-1/+2
* [ticket/9550] Add template event memberlist_view_user_statistics_afterrechosen2013-08-022-0/+2
* [ticket/9550] Add template event memberlist_view_user_statistics_beforerechosen2013-08-022-0/+2
* Merge remote-tracking branch 'Elsensee/ticket/11759' into developAndreas Fischer2013-08-0224-47/+47
|\
| * [ticket/11759] Change lowercase to uppercaseOliver Schramm2013-08-0224-47/+47
|/
* Merge branch 'develop-olympus' into developAndreas Fischer2013-08-010-0/+0
|\
| * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-010-0/+0
| |\
| | * Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into prep...Andreas Fischer2013-08-012-4/+22
| | |\
* | | \ Merge branch 'develop-olympus' into developAndreas Fischer2013-08-011-0/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-013-2/+13
| |\ \ \ | | |/ /
| | * | [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.Andreas Fischer2013-08-011-0/+5
| | * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-014-5/+11
* | | | Merge remote-tracking branch 'brunoais/ticket/11653' into developJoas Schilling2013-08-011-7/+2
|\ \ \ \
| * | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
* | | | | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\ \ \ \ \
| * | | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| * | | | | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| * | | | | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-314-12/+42
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympusJoas Schilling2013-07-314-12/+42
| |\ \ \ \
| | * | | | [ticket/10037] Fix table in subsilver2Oliver Schramm2013-07-311-24/+18
| | * | | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
* | | | | | Merge pull request #1563 from cyberalien/ticket/11688Nathan Guse2013-07-311-13/+57
|\ \ \ \ \ \
| * | | | | | [ticket/11688] Fix docblockVjacheslav Trushkin2013-07-301-0/+5
| * | | | | | [ticket/11688] Rename purge_dir to remove_dirVjacheslav Trushkin2013-07-301-3/+3
| * | | | | | [ticket/11688] tpl_ files are no longer usedVjacheslav Trushkin2013-07-141-3/+1
| * | | | | | [ticket/11688] Purge TWIG cacheVjacheslav Trushkin2013-07-141-13/+54
* | | | | | | Merge pull request #1632 from Elsensee/ticket/11464Joas Schilling2013-07-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11464] Add missing and remove unnecessary database entryOliver Schramm2013-07-311-1/+1
* | | | | | | | 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
* | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11757' into developDhruv2013-07-311-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /