aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11763] Add missing variable when reporting a PM to avoid SQL ErrorOliver Schramm2013-08-031-3/+4
| | | | PHPBB3-11763
* Merge branch 'develop-olympus' into developJoas Schilling2013-08-032-2/+40
|\ | | | | | | | | | | | | * develop-olympus: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| * Merge remote-tracking branch 's9e/ticket/11762' into develop-olympusJoas Schilling2013-08-032-2/+40
| |\ | | | | | | | | | | | | | | | | | | * s9e/ticket/11762: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| | * [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| | | | | | | | | | | | | | | | | | Added call to test class's parent::setUp(). Updated copyright year. PHPBB3-11762
| | * [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| | | | | | | | | | | | PHPBB3-11762
| | * [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-032-2/+38
| |/ | | | | | | PHPBB3-11762
* | Merge remote-tracking branch 'rechosen/ticket/9550' into developJoas Schilling2013-08-0233-50/+155
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rechosen/ticket/9550: [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.html [ticket/9550] Improve template event descriptions in phpBB/docs/events.md [ticket/9550] Improve template event descriptions in phpBB/docs/events.md [ticket/9550] Add the new template events to phpBB/docs/events.md [ticket/9550] Add template event memberlist_body_username_prepend [ticket/9550] Add template event memberlist_body_username_append [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_after [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_before [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_after [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_before [ticket/9550] Add template event viewtopic_body_post_buttons_before [ticket/9550] Add template event viewtopic_body_post_buttons_after [ticket/9550] Add template event memberlist_view_user_statistics_after [ticket/9550] Add template event memberlist_view_user_statistics_before [ticket/11759] Change lowercase to uppercase [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.
| * | [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.htmlrechosen2013-08-021-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per request of nickvergessen, break up the long post buttons line in viewtopic_body.html of subsilver2 into nicely indented parent and child elements. Keep the whitespace in such a way that browsers display the buttons pixel-perfectly equal to the old code. In the process, move the viewtopic_body_post_buttons_before event to a more logical (though possibly less intuitive) place (only in subsilver2). PHPBB3-9550
| * | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-8/+8
| | | | | | | | | | | | | | | | | | | | | Update the custom_fields template events descriptions according to nickvergessen's suggestions. PHPBB3-9550
| * | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-4/+2
| | | | | | | | | | | | | | | | | | | | | Per suggestion of nickvergessen, stick to "before" and "after" in the template event descriptions instead of "at the top of" and "at the bottom of". PHPBB3-9550
| * | [ticket/9550] Add the new template events to phpBB/docs/events.mdrechosen2013-08-021-0/+76
| | | | | | | | | | | | | | | | | | | | | The newly added template events weren't listed and described yet in events.md. Fixed now. PHPBB3-9550
| * | [ticket/9550] Add template event memberlist_body_username_prependrechosen2013-08-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the prepend counterpart of a template event required for the karma extension. It allows adding information before every username in the memberlist. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Per suggestion of nickvergessen, add a counterpart for every append or prepend event. PHPBB3-9550
| * | [ticket/9550] Add template event memberlist_body_username_appendrechosen2013-08-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template event required for the karma extension. It allows adding information after every username in the memberlist. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Used by the karma extension to add a karma score indication that allows other users to see how respected every listed user is. PHPBB3-9550
| * | [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_afterrechosen2013-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the append counterpart of a template event required for the karma extension. It allows adding data after the custom fields under the username and avatar next to every private message in prosilver. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Per suggestion of nickvergessen, add a counterpart for every append or prepend event. PHPBB3-9550
| * | [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_beforerechosen2013-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template event required for the karma extension. It allows adding data before the custom fields under the username and avatar next to every private message in prosilver. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Used by the karma extension to add a karma score indication that allows users to see how respected the pm sender is. PHPBB3-9550
| * | [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_afterrechosen2013-08-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the append counterpart of a template event required for the karma extension. It allows adding data after the custom fields under the username and avatar next to every post. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Per suggestion of nickvergessen, add a counterpart for every append or prepend event. PHPBB3-9550
| * | [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_beforerechosen2013-08-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template event required for the karma extension. It allows adding data before the custom fields, under the username and avatar next to every post. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Used by the karma extension to add a karma score indication that allows users to see how respected the post author is. PHPBB3-9550
| * | [ticket/9550] Add template event viewtopic_body_post_buttons_beforerechosen2013-08-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the prepend counterpart of a template event required for the karma extension. It allows adding post buttons to posts (next to the quote and edit buttons). Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Per suggestion of nickvergessen, add a counterpart for every append or prepend event. PHPBB3-9550
| * | [ticket/9550] Add template event viewtopic_body_post_buttons_afterrechosen2013-08-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template event required for the karma extension. It allows adding post buttons to posts (next to the quote and edit buttons). Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Used by the karma extension to add thumbs up/down icons that allow users to give karma on posts. PHPBB3-9550
| * | [ticket/9550] Add template event memberlist_view_user_statistics_afterrechosen2013-08-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the append counterpart of a template event required for the karma extension. It allows adding entries to the user statistics part of any user profile. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Per suggestion of nickvergessen, add a counterpart for every append or prepend event. PHPBB3-9550
| * | [ticket/9550] Add template event memberlist_view_user_statistics_beforerechosen2013-08-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template event required for the karma extension. It allows adding entries to the user statistics part of any user profile. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Used by the karma extension to add a karma score indication that allows other users to see how respected this user is. Prepend because karma score is often a more meaningful statistic than the bottom statistics (like "Most active topic"), and should therefore be more prominent. PHPBB3-9550
| * | Merge remote-tracking branch 'Elsensee/ticket/11759' into developAndreas Fischer2013-08-0224-47/+47
| |\ \ | | | | | | | | | | | | | | | | * Elsensee/ticket/11759: [ticket/11759] Change lowercase to uppercase
| | * | [ticket/11759] Change lowercase to uppercaseOliver Schramm2013-08-0224-47/+47
| |/ / | | | | | | | | | PHPBB3-11759
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-010-0/+0
| |\ \ | | |/ | | | | | | * develop-olympus:
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-010-0/+0
| | |\ | | | | | | | | | | | | * prep-release-3.0.12:
| | | * Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into ↵Andreas Fischer2013-08-012-4/+22
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data. [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'" [ticket/11752] HTTP -> HTTPs in email/installed.txt
| * | | \ Merge branch 'develop-olympus' into developAndreas Fischer2013-08-011-0/+5
| |\ \ \ \ |/ / / / / | | _ / / | | / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: build/build.xml phpBB/install/database_update.php
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-013-2/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | [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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11653: [ticket/11653] Use $parse_flags [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
| * | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | | [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
* | | | | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11655: [ticket/11653] Use $parse_flags [ticket/11653] Missing ";" [ticket/11655] Use $parse_flags [ticket/11655] wrong var names for the uid and for the bitfield [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
| * | | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | | | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | | | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| * | | | | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| * | | | | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-314-12/+42
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| * | | | Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympusJoas Schilling2013-07-314-12/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/10037: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| | * | | | [ticket/10037] Fix table in subsilver2Oliver Schramm2013-07-311-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks, nickvergessen! ;-) PHPBB3-10037
| | * | | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10037
* | | | | | Merge pull request #1563 from cyberalien/ticket/11688Nathan Guse2013-07-311-13/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11688] Purge TWIG cache
| * | | | | | [ticket/11688] Fix docblockVjacheslav Trushkin2013-07-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11688
| * | | | | | [ticket/11688] Rename purge_dir to remove_dirVjacheslav Trushkin2013-07-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11688
| * | | | | | [ticket/11688] tpl_ files are no longer usedVjacheslav Trushkin2013-07-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tpl_ and ctpl_ from cache->purge() because those prefixes are no longer used. PHPBB3-11688
| * | | | | | [ticket/11688] Purge TWIG cacheVjacheslav Trushkin2013-07-141-13/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge directories Replace opendir() with DirectoryIterator PHPBB3-11688
* | | | | | | Merge pull request #1632 from Elsensee/ticket/11464Joas Schilling2013-07-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11464] Add missing and remove unnecessary database entry
| * | | | | | | [ticket/11464] Add missing and remove unnecessary database entryOliver Schramm2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11464