Igor Wiedler ae85d43757 Merge remote-tracking branch 'upstream/develop' into feature/dic ... * 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		2012-08-25 17:00:40 +02:00
..
adm	Merge branch 'develop-olympus' into develop	2012-07-23 15:50:54 +02:00
assets/javascript	[ticket/11004] Always update suggestion button in timezone_preselect_select	2012-07-24 17:09:26 +02:00
cache	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
config	Merge remote-tracking branch 'upstream/develop' into feature/dic	2012-08-25 17:00:40 +02:00
develop	[ticket/11052] update search backend constructor everywhere	2012-08-15 22:05:26 +05:30
docs	Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into develop	2012-07-27 22:27:26 -04:00
download	[feature/dic] Coding style: Braces	2012-08-25 16:43:41 +02:00
files	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
images	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
includes	Merge remote-tracking branch 'upstream/develop' into feature/dic	2012-08-25 17:00:40 +02:00
install	Merge remote-tracking branch 'upstream/develop' into feature/dic	2012-08-25 17:00:40 +02:00
language	[ticket/11032] fix language of error displayed	2012-08-15 22:57:02 +05:30
store	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
styles	[ticket/10943] displays searched query in search result	2012-08-11 02:26:46 +05:30
.htaccess	[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http	2010-01-19 19:08:51 +00:00
common.php	Merge remote-tracking branch 'upstream/develop' into feature/dic	2012-08-25 17:00:40 +02:00
composer.json	[feature/dic] Remove duplicate event-dispatcher dependency	2012-07-29 17:30:06 +02:00
composer.lock	[feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file	2012-07-26 15:58:19 +02:00
cron.php	[feature/dic] Rename occurances of $container to $phpbb_container	2012-04-09 14:37:04 +02:00
faq.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
feed.php	Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling	2012-06-04 18:09:35 +02:00
index.php	Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop	2012-08-20 09:09:53 -04:00
mcp.php	[feature/php-events] Readd comment from d06adb06e9	2012-08-11 11:49:48 +02:00
memberlist.php	[feature/php-events] Fix doc of core.memberlist_prepare_profile_data	2012-08-20 10:07:05 +02:00
posting.php	[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate	2012-07-22 14:32:03 -05:00
report.php	[feature/save-post-on-report] Changed the name of the column	2012-03-19 08:27:32 -04:00
search.php	[ticket/10943] displays searched query in search result	2012-08-11 02:26:46 +05:30
ucp.php	[feature/php-events] Fix naming and doc of core.ucp_display_module_before	2012-08-03 23:41:00 +02:00
viewforum.php	Merge remote-tracking branch 'upstream/develop' into feature/dic	2012-08-25 17:00:40 +02:00
viewonline.php	[feature/php-events] Fix doc of core.viewonline_overwrite_location	2012-08-20 10:15:04 +02:00
viewtopic.php	Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop	2012-08-20 09:09:53 -04:00
web.config	[ticket/10219] Remove invalid and invisible character from web.config.	2011-06-14 23:18:33 +02:00