aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1932 from ptarjan/patch-1Nils Adermann2013-12-201-0/+5
|\
| * HHVM is failing for nowPaul Tarjan2013-12-131-0/+4
| * Try running unit tests on HHVMPaul Tarjan2013-12-131-0/+1
* | Merge remote-tracking branch 'vsephpbb/ticket/12060' into developJoas Schilling2013-12-208-24/+213
|\ \
| * | [ticket/12060] A little less verbose cleanup of event docblocksMatt Friedman2013-12-171-4/+4
| * | [ticket/12060] Further clarifying new event docblocks as much as possibleMatt Friedman2013-12-163-14/+17
| * | [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create eventMatt Friedman2013-12-161-3/+3
| * | [ticket/12060] Remove whitespacesMatt Friedman2013-12-161-1/+1
| * | [ticket/12060] Fix docblock for acp_bbcodes_modify_create eventMatt Friedman2013-12-161-3/+3
| * | [ticket/12060] Rename event in message parser to modify_format_display_text_a...Matt Friedman2013-12-131-2/+2
| * | [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sqlMatt Friedman2013-12-131-2/+4
| * | [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event d...Matt Friedman2013-12-131-1/+1
| * | [ticket/12060] Use separate template event for acp user signature posting but...Matt Friedman2013-12-132-4/+16
| * | [ticket/12060] Rename event from append to after in acp_bbcodes.htmlMatt Friedman2013-12-132-2/+2
| * | [ticket/12060] Correctly label alpha versions in event docblocksMatt Friedman2013-12-133-7/+7
| * | [ticket/12060] Fix u_action comments in docblocksMatt Friedman2013-12-121-2/+2
| * | [ticket/12060] Change @since in event docblocksMatt Friedman2013-12-123-7/+7
| * | [ticket/12060] Update the docblock comments in acp core eventsMatt Friedman2013-12-121-4/+4
| * | [ticket/12060] Refactor u_action in the events that use itMatt Friedman2013-12-121-9/+7
| * | [ticket/12060] Use $sql_ary instead of $sqlMatt Friedman2013-12-122-16/+20
| * | [ticket/12060] Update docblock for core event due to addition of another varMatt Friedman2013-12-121-5/+6
| * | [ticket/12060] Remove re-tabbing of html from subsilver2 filesMatt Friedman2013-12-121-38/+38
| * | [ticket/12060] Add $update_this_message var to the core eventMatt Friedman2013-12-121-1/+1
| * | [ticket/12060] Adjust last item in array to use a comma instead of closing pa...Matt Friedman2013-12-121-2/+2
| * | [ticket/12060] Copy this_u_action back to original this->u_action varMatt Friedman2013-12-121-0/+2
| * | [ticket/12060] Fix typo in core.acp_bbcodes_edit_add doc blockMatt Friedman2013-12-051-1/+1
| * | [ticket/12060] Add bbcode tokens array to core.acp_bbcodes_edit_addMatt Friedman2013-12-051-5/+7
| * | [ticket/12060] Use actions class for BBCodes list in ACPMatt Friedman2013-12-041-1/+1
| * | [ticket/12060] Fix a core typo in display_custom_bbcodes doc blockMatt Friedman2013-12-041-1/+1
| * | [ticket/12060] Add event core.modify_text_for_format_display_afterMatt Friedman2013-12-041-0/+22
| * | [ticket/12060] Add event core.modify_bbcode_initMatt Friedman2013-12-041-0/+17
| * | [ticket/12060] Add event core.display_custom_bbcodes_modify_sqlMatt Friedman2013-12-041-0/+11
| * | [ticket/12060] Add $phpbb_dispatcher to acp_bbcodes.php for eventsMatt Friedman2013-12-041-1/+1
| * | [ticket/12060] Add acp event core.acp_bbcodes_display_bbcodesMatt Friedman2013-12-041-2/+17
| * | [ticket/12060] Add acp event core.acp_bbcodes_display_formMatt Friedman2013-12-041-2/+20
| * | [ticket/12060] Add acp event core.acp_bbcodes_modify_createMatt Friedman2013-12-041-4/+24
| * | [ticket/12060] Add acp event core.acp_bbcodes_edit_addMatt Friedman2013-12-041-2/+16
| * | [ticket/12060] Wrap subsilver2 posting buttons in div with id tagsMatt Friedman2013-12-041-32/+36
| * | [ticket/12060] Add template events posting_editor_buttons_before/afterMatt Friedman2013-12-044-0/+24
| * | [ticket/12060] Add template event acp_bbcodes_actions_prepend/appendMatt Friedman2013-12-042-1/+13
| * | [ticket/12060] Add template event acp_bbcodes_edit_form_appendMatt Friedman2013-12-042-0/+8
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-12-162-2/+2
|\ \ \
| * \ \ Merge remote-tracking branch 'Elsensee/ticket/10023' into develop-olympusJoas Schilling2013-12-162-4/+4
| |\ \ \
| | * | | [ticket/10023] Make password change notification more noticeableOliver Schramm2013-12-122-4/+4
| |/ / /
* | | | Merge remote-tracking branch 'prototech/ticket/12009' into developJoas Schilling2013-12-1634-116/+234
|\ \ \ \
| * | | | [ticket/12009] Prevent user from enabling invalid extension through direct URLCesar G2013-12-126-3/+50
| * | | | [ticket/12009] Update functional test to check for invalid extensions.Cesar G2013-12-121-0/+6
| * | | | [ticket/12009] Fix functional tests.Cesar G2013-12-121-16/+18
| * | | | [ticket/12009] Move valid extensions in tests to correct dir structure.Cesar G2013-12-1227-97/+145
| * | | | [ticket/12009] Do not allow incorrectly structured extensions to be installed.Cesar G2013-12-111-0/+15