aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into feature/dicIgor Wiedler2012-08-2548-552/+4176
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (259 commits) [prep-release-3.0.11] Bumping version number for 3.0.11 final. [feature/php-events] Fix doc of core.viewonline_overwrite_location [feature/php-events] Fix doc of core.user_set_default_group [feature/php-events] Fix doc of core.generate_smilies_after [feature/php-events] Fix doc of core.delete_user_after [feature/php-events] Fix doc of core.delete_user_before [feature/php-events] Fix doc of core.update_username [feature/php-events] Fix doc of core.memberlist_prepare_profile_data [feature/php-events] Fix doc and position of viewonline_overwrite_location [feature/php-events] Fix doc of core.viewtopic_get_post_data [feature/php-events] Fix doc of core.viewtopic_cache_guest_data [ticket/11061] Add the --dev flag to the composer instructions in README [ticket/11060] Make sure pyrus can install everything on travis [ticket/11059] Use https for the README logo [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum [feature/php-events] Fix core.acp_manage_forums_update_data_after vars [ticket/11032] fix language of error displayed [ticket/11052] update search backend constructor everywhere [ticket/11052] pass parametes to search construct while posting [ticket/11054] Fixed $config var description ... Conflicts: phpBB/includes/cron/task/core/tidy_cache.php phpBB/includes/cron/task/core/tidy_search.php
| * Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-2011-46/+619
| |\
| | * [feature/php-events] Fix doc of core.user_set_default_groupJoas Schilling2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc of core.generate_smilies_afterJoas Schilling2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc of core.delete_user_afterJoas Schilling2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc of core.delete_user_beforeJoas Schilling2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc of core.update_usernameJoas Schilling2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forumJoas Schilling2012-08-181-5/+2
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix core.acp_manage_forums_update_data_after varsJoas Schilling2012-08-181-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add event core.acp_manage_forums_move_contentJoas Schilling2012-08-081-1/+24
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc and naming of core.acp_manage_forums_move_childrenJoas Schilling2012-08-081-4/+21
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc and naming of acp_manage_forums_update_data_afterJoas Schilling2012-08-081-2/+15
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add new event core.acp_manage_forums_update_data_beforeJoas Schilling2012-08-081-1/+19
| | | | | | | | | | | | | | | | | | Allows you to remove data from forum_data_sql before we update/create the forum PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.acp_manage_forums_validate_dataJoas Schilling2012-08-081-1/+10
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.acp_manage_forums_display_formJoas Schilling2012-08-081-2/+21
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of acp_manage_forums_initialise_dataJoas Schilling2012-08-081-6/+21
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix doc and naming of core.acp_forums_request_forum_dataJoas Schilling2012-08-081-1/+9
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Remove double space in commentsJoas Schilling2012-08-051-2/+2
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.validate_config_variableJoas Schilling2012-08-051-3/+15
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.build_config_templateJoas Schilling2012-08-051-4/+18
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add docs for core.adm_page_footerJoas Schilling2012-08-051-2/+10
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add docs for core.adm_page_headerJoas Schilling2012-08-051-0/+10
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add docs for core.garbage_collectionJoas Schilling2012-08-051-0/+6
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add docs for core.page_footerJoas Schilling2012-08-051-2/+10
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add docs for core.page_headerJoas Schilling2012-08-051-0/+14
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add core.acp_users_overview_run_quicktoolJoas Schilling2012-08-051-0/+13
| | | | | | | | | | | | | | | | | | | | | This event was split from core.acp_users_display_overview to make it work as expected. PHPBB3-9550
| | * [feature/php-events] Add core.acp_users_overview_modify_dataJoas Schilling2012-08-051-0/+12
| | | | | | | | | | | | | | | | | | | | | This event was split from core.acp_users_display_overview to make it work as expected. PHPBB3-9550
| | * [feature/php-events] Move and fix event core.acp_users_display_overviewJoas Schilling2012-08-051-9/+17
| | | | | | | | | | | | | | | | | | | | | The event had some invalid variables, so the event was moved to give it some more power. PHPBB3-9550
| | * [feature/php-events] Remove event core.acp_profile_field_editJoas Schilling2012-08-051-4/+0
| | | | | | | | | | | | | | | | | | | | | The currently implemented event is useless and we couldn't find a MOD, which requires editing this file in that position. PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.ucp_add_zebraJoas Schilling2012-08-041-1/+11
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.ucp_remove_zebraJoas Schilling2012-08-041-3/+13
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.ucp_pm_view_messsageJoas Schilling2012-08-041-4/+20
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.mcp_view_forum_modify_topicrowJoas Schilling2012-08-041-2/+10
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix naming and doc of core.generate_smilies_afterJoas Schilling2012-08-041-3/+12
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Add core.user_setup eventJoas Schilling2012-08-011-7/+29
| | | | | | | | | | | | | | | | | | | | | This event can be used to load language files globally so it fixes PHPBB3-8270 PHPBB3-8270 PHPBB3-9550
| | * [feature/php-events] Allow core.user_get_avatar to overwrite all avatarsJoas Schilling2012-08-011-9/+25
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs of core.display_custom_bbcodesJoas Schilling2012-08-011-0/+6
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of display_custom_bbcodes_modify_rowJoas Schilling2012-08-011-1/+11
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of display_forums_modify_template_varsJoas Schilling2012-08-011-2/+12
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Move core.display_forums_modify_forum_rows to better pointJoas Schilling2012-08-011-3/+16
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs of core.display_forums_modify_rowJoas Schilling2012-08-011-2/+12
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.display_forums_modify_sqlJoas Schilling2012-08-011-1/+8
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.user_set_default_groupJoas Schilling2012-08-011-1/+12
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.group_delete_user_beforeJoas Schilling2012-08-011-2/+12
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.delete_group_afterJoas Schilling2012-08-011-3/+11
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.delete_user_beforeJoas Schilling2012-08-011-0/+12
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.delete_user_afterJoas Schilling2012-08-011-1/+10
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Fix docs and naming of core.update_usernameJoas Schilling2012-08-011-1/+9
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Make handling of forumrow consistent with othersJoas Schilling2012-08-011-3/+5
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/php-events] Proper name for request forum data to avoid confusionJoas Schilling2012-08-011-1/+1
| | | | | | | | | | | | PHPBB3-9550