aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-2956-752/+871
|\ | | | | | | | | Conflicts: phpBB/config/services.yml
| * Merge remote-tracking branch 'nickvergessen/ticket/11911' into developDhruv2013-12-271-0/+16
| |\ | | | | | | | | | | | | | | | | | | # 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-271-0/+16
| | | | | | | | | | | | PHPBB3-11911
| * | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-2520-291/+86
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Remove pagination functionsJoas Schilling2013-12-181-219/+0
| | | | | | | | | | | | | | | | | | The functions where changed in 3.1 anyway, so we can just delete them PHPBB3-11849
| * | Merge remote-tracking branch 'vsephpbb/ticket/12060' into developJoas Schilling2013-12-203-23/+152
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-162-13/+16
| | | | | | | | | | | | | | | | 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] 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] 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] 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
| | * | [ticket/12060] Add event core.modify_bbcode_initMatt Friedman2013-12-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Use this event to modify the bbcode data for later parsing PHPBB3-12060
| | * | [ticket/12060] Add event core.display_custom_bbcodes_modify_sqlMatt Friedman2013-12-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Modify the SQL statement retrieving the custom bbcodes PHPBB3-12060
| | * | [ticket/12060] Add $phpbb_dispatcher to acp_bbcodes.php for eventsMatt Friedman2013-12-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12060
| | * | [ticket/12060] Add acp event core.acp_bbcodes_display_bbcodesMatt Friedman2013-12-041-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Modify display of bbcodes in the form PHPBB3-12060
| | * | [ticket/12060] Add acp event core.acp_bbcodes_display_formMatt Friedman2013-12-041-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | Modify bbcode template data before we display the form PHPBB3-12060
| | * | [ticket/12060] Add acp event core.acp_bbcodes_modify_createMatt Friedman2013-12-041-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | Modify bbcode data before modify/create PHPBB3-12060
| | * | [ticket/12060] Add acp event core.acp_bbcodes_edit_addMatt Friedman2013-12-041-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Modify bbcode template before we display the add/edit form PHPBB3-12060
| * | | [ticket/12009] Prevent user from enabling invalid extension through direct URLCesar G2013-12-121-0/+10
| | | | | | | | | | | | | | | | PHPBB3-12009
| * | | Merge remote-tracking branch 'imkingdavid/ticket/12069' into developAndreas Fischer2013-12-081-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/12069: [ticket/12069] Globalize in submit_post()
| | * | | [ticket/12069] Globalize in submit_post()David King2013-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12069
| * | | | Merge pull request #1926 from imkingdavid/ticket/12069Nathan Guse2013-12-081-2/+2
| |\ \ \ \ | | |/ / / | | | | | [ticket/12069] Fix event documentation
| | * | | [ticket/12069] Fix event documentationDavid King2013-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12069
| * | | | Merge pull request #1925 from imkingdavid/ticket/12069Nathan Guse2013-12-081-0/+17
| |\ \ \ \ | | |/ / / | | | | | [ticket/12069] Add core.submit_post_end event
| | * | | [ticket/12069] Add core.submit_post_end eventDavid King2013-12-081-0/+17
| | | |/ | | |/| | | | | | | | | PHPBB3-12069
| * | | [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.Cesar G2013-12-061-0/+2
| | |/ | |/| | | | | | | PHPBB3-11241
| * | Merge pull request #1879 from Pico88/ticket/12026Nathan Guse2013-12-041-4/+4
| |\ \ | | | | | | | | [ticket/12026] Correct path for template files
| | * | [ticket/12026] Remove root path, its prepended laterJoas Schilling2013-12-031-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12026