aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11770] Fix class name for pm listVjacheslav Trushkin2013-08-061-1/+1
* Merge remote-tracking branch 'brunoais/ticket11639' into developJoas Schilling2013-08-041-9/+4
|\
| * [ticket/11639] Changing how censorship is handled.brunoais2013-08-031-4/+2
| * [ticket/11639] Removed a non-needed unsetBruno Ais2013-07-241-2/+0
| * [ticket/11639] Whitespace fixingBruno Ais2013-07-201-1/+1
| * [ticket/11639] Whitespace fixingBruno Ais2013-07-151-2/+2
| * [ticket/11639] Added an useful comment.Bruno Ais2013-07-151-1/+2
| * [ticket/11639] generate_text_for_display on functions_posting.phpBruno Ais2013-07-151-8/+6
* | 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
| |/
* | Merge remote-tracking branch 'Elsensee/ticket/11763' into developJoas Schilling2013-08-031-3/+4
|\ \
| * | [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-032-2/+40
|\ \
| * \ Merge remote-tracking branch 's9e/ticket/11762' into develop-olympusJoas Schilling2013-08-032-2/+40
| |\ \
| | * | [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| | * | [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| | * | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-032-2/+38
| |/ /
* | | Merge remote-tracking branch 'rechosen/ticket/9550' into developJoas Schilling2013-08-0233-50/+155
|\ \ \
| * | | [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
| * | | 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