aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'brunoais/ticket/11642' into developJoas Schilling2013-08-031-11/+2
|\
| * [ticket/11642] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * [ticket/11642] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| * [ticket/11642] generate_text_for_display on mcp/mcp_post.phpBruno Ais2013-07-161-11/+1
* | Merge remote-tracking branch 'brunoais/ticket/11643' into developJoas Schilling2013-08-031-11/+2
|\ \
| * | [ticket/11643] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | [ticket/11643] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| * | [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| |/
* | Merge remote-tracking branch 'brunoais/ticket/11641' into developJoas Schilling2013-08-031-10/+2
|\ \
| * | [ticket/11641] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.phpBruno Ais2013-07-161-10/+1
| |/
* | [ticket/11763] Add missing variable when reporting a PM to avoid SQL ErrorOliver Schramm2013-08-031-3/+4
* | Merge branch 'develop-olympus' into developJoas Schilling2013-08-031-2/+2
|\ \
| * | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-2/+2
* | | [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.htmlrechosen2013-08-021-1/+15
* | | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-8/+8
* | | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-4/+2
* | | [ticket/9550] Add the new template events to phpBB/docs/events.mdrechosen2013-08-021-0/+76
* | | [ticket/9550] Add template event memberlist_body_username_prependrechosen2013-08-022-2/+2
* | | [ticket/9550] Add template event memberlist_body_username_appendrechosen2013-08-022-2/+2
* | | [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_afterrechosen2013-08-021-0/+1
* | | [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_beforerechosen2013-08-021-0/+1
* | | [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
* | | [ticket/11759] Change lowercase to uppercaseOliver Schramm2013-08-0224-47/+47
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-011-0/+5
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-012-0/+11
| |\ \
| | * | [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-013-3/+9
* | | | 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