aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-29619-6001/+13397
|\ | | | | | | | | Conflicts: phpBB/config/services.yml
| * Merge remote-tracking branch 'nickvergessen/ticket/11911' into developDhruv2013-12-273-0/+23
| |\ | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11911: [ticket/11911] Warn admins when there is no search index for the selected engine
| | * [ticket/11911] Warn admins when there is no search index for the selected engineJoas Schilling2013-12-273-0/+23
| | | | | | | | | | | | PHPBB3-11911
| * | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-2530-449/+680
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Joas Schilling # Via Joas Schilling * nickvergessen/feature/pagination-class: [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class
| | * | [ticket/11849] Fix more function callsJoas Schilling2013-12-186-16/+25
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update more MCP calls to pagination classJoas Schilling2013-12-185-17/+17
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update some ACP modules with new paginationJoas Schilling2013-12-183-20/+16
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update rest of the UCP modulesJoas Schilling2013-12-183-8/+16
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update UCP notifications and pm folderJoas Schilling2013-12-182-11/+12
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update search and memberlistJoas Schilling2013-12-182-13/+10
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update pagination in viewonline.phpJoas Schilling2013-12-181-2/+5
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Remove old pagination testJoas Schilling2013-12-181-111/+0
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Update pagination code in viewtopic.phpJoas Schilling2013-12-182-15/+11
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Replace pagination in viewforum.php with classJoas Schilling2013-12-183-21/+105
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Add service definitionJoas Schilling2013-12-181-0/+6
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Remove pagination functionsJoas Schilling2013-12-181-219/+0
| | | | | | | | | | | | | | | | | | | | | | | | The functions where changed in 3.1 anyway, so we can just delete them PHPBB3-11849
| | * | [ticket/11849] Test validate_start and on_pageJoas Schilling2013-12-182-11/+86
| | | | | | | | | | | | | | | | PHPBB3-11849
| | * | [ticket/11849] Move pagination code to classJoas Schilling2013-12-182-0/+386
| | | | | | | | | | | | | | | | PHPBB3-11849
| * | | Merge pull request #1940 from prototech/ticket/12079Andreas Fischer2013-12-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12079] Add default value to $multibyte in request.untrimmed_varible(). * prototech/ticket/12079: [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
| | * | | [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().Cesar G2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12079
| * | | | Merge pull request #1932 from ptarjan/patch-1Nils Adermann2013-12-201-0/+5
| |\ \ \ \ | | |_|_|/ | |/| | | Try running unit tests on HHVM
| | * | | HHVM is failing for nowPaul Tarjan2013-12-131-0/+4
| | | | | | | | | | | | | | | Lets at least keep running it so we remember to fix it
| | * | | 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
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12060: (37 commits) [ticket/12060] A little less verbose cleanup of event docblocks [ticket/12060] Further clarifying new event docblocks as much as possible [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event [ticket/12060] Remove whitespaces [ticket/12060] Fix docblock for acp_bbcodes_modify_create event [ticket/12060] Rename event in message parser to modify_format_display_text_after [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block [ticket/12060] Use separate template event for acp user signature posting buttons [ticket/12060] Rename event from append to after in acp_bbcodes.html [ticket/12060] Correctly label alpha versions in event docblocks [ticket/12060] Fix u_action comments in docblocks [ticket/12060] Change @since in event docblocks [ticket/12060] Update the docblock comments in acp core events [ticket/12060] Refactor u_action in the events that use it [ticket/12060] Use $sql_ary instead of $sql [ticket/12060] Update docblock for core event due to addition of another var [ticket/12060] Remove re-tabbing of html from subsilver2 files [ticket/12060] Add $update_this_message var to the core event [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis ...
| | * | | [ticket/12060] A little less verbose cleanup of event docblocksMatt Friedman2013-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Further clarifying new event docblocks as much as possibleMatt Friedman2013-12-163-14/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create eventMatt Friedman2013-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Remove whitespacesMatt Friedman2013-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Fix docblock for acp_bbcodes_modify_create eventMatt Friedman2013-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Rename event in message parser to ↵Matt Friedman2013-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify_format_display_text_after PHPBB3-12060
| | * | | [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sqlMatt Friedman2013-12-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event PHPBB3-12060
| | * | | [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event ↵Matt Friedman2013-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc block PHPBB3-12060
| | * | | [ticket/12060] Use separate template event for acp user signature posting ↵Matt Friedman2013-12-132-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buttons PHPBB3-12060
| | * | | [ticket/12060] Rename event from append to after in acp_bbcodes.htmlMatt Friedman2013-12-132-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Correctly label alpha versions in event docblocksMatt Friedman2013-12-133-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Fix u_action comments in docblocksMatt Friedman2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Change @since in event docblocksMatt Friedman2013-12-123-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Update the docblock comments in acp core eventsMatt Friedman2013-12-121-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Refactor u_action in the events that use itMatt Friedman2013-12-121-9/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Use $sql_ary instead of $sqlMatt Friedman2013-12-122-16/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Update docblock for core event due to addition of another varMatt Friedman2013-12-121-5/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Remove re-tabbing of html from subsilver2 filesMatt Friedman2013-12-121-38/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Add $update_this_message var to the core eventMatt Friedman2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Adjust last item in array to use a comma instead of closing ↵Matt Friedman2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parenthesis PHPBB3-12060
| | * | | [ticket/12060] Copy this_u_action back to original this->u_action varMatt Friedman2013-12-121-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Fix typo in core.acp_bbcodes_edit_add doc blockMatt Friedman2013-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Add bbcode tokens array to core.acp_bbcodes_edit_addMatt Friedman2013-12-051-5/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Use actions class for BBCodes list in ACPMatt Friedman2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Fix a core typo in display_custom_bbcodes doc blockMatt Friedman2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| | * | | [ticket/12060] Add event core.modify_text_for_format_display_afterMatt Friedman2013-12-041-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this event to modify the text after it is parsed PHPBB3-12060