makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
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
..
acp Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
auth Merge PR #813 branch 'develop-olympus' into develop 2012-05-21 22:35:54 -04:00
cache Merge remote-tracking branch 'upstream/develop' into feature/dic 2012-08-25 17:00:40 +02:00
captcha [ticket/10575] Adding public visibility to the methods. 2012-04-05 14:16:56 +01:00
config [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
cron Merge remote-tracking branch 'upstream/develop' into feature/dic 2012-08-25 17:00:40 +02:00
db [ticket/10875] Return $query_id from sql_save 2012-08-06 16:26:55 -05:00
di/processor [feature/dic] Coding style: Braces 2012-08-25 16:43:41 +02:00
diff [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
event [feature/event-dispatcher] Fix copyright years 2012-03-30 14:22:20 +02:00
extension [ticket/11054] Fixed $config var description 2012-08-15 09:15:18 -04:00
hooks [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
lock [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
php [ticket/10931] Apply strtolower() correctly, i.e. not on false. 2012-06-11 15:46:03 +02:00
questionnaire [feature/new-tz-handling] Remove appearances of board_dst and user_dst 2012-06-18 15:08:46 +02:00
request [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop 2012-02-04 00:57:39 +01:00
search Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop 2012-08-18 22:26:58 -04:00
style [ticket/11012] Normalize $phpEx member vars to $php_ext 2012-07-21 16:19:01 +02:00
template [ticket/11043] Allow call_hook() to be called from more than one location. 2012-08-03 05:56:49 -05:00
ucp Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
utf [ticket/10847] fixing all misspelled "dependant" to "dependent" 2012-04-30 21:55:24 +02:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
bbcode.php [ticket/10743] Renaming user->theme 2012-06-11 19:56:50 -04:00
class_loader.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
constants.php [feature/sphinx-fulltext-search] add sphinx_table constant to constants.php 2012-07-12 17:32:01 +05:30
datetime.php [feature/new-tz-handling] Rename $user->tz back to $user->timezone 2012-07-18 16:52:52 +02:00
error_collector.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions.php [feature/php-events] Remove double space in comments 2012-08-05 23:11:36 +02:00
functions_acp.php [feature/php-events] Fix docs and naming of core.validate_config_variable 2012-08-05 23:09:44 +02:00
functions_admin.php [ticket/11052] update search backend constructor everywhere 2012-08-15 22:05:26 +05:30
functions_compress.php [ticket/11044] Added comment explaining filename splitting 2012-08-06 08:32:12 +08:00
functions_content.php [ticket/10640] Do not change default value of truncate_string() 2012-06-17 19:07:17 +01:00
functions_convert.php [feature/new-tz-handling] Remove appearances of board_dst and user_dst 2012-06-18 15:08:46 +02:00
functions_display.php Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
functions_download.php Merge branch 'develop-olympus' into develop 2012-02-11 05:58:29 -05:00
functions_install.php [feature/dic] Generate full cache driver class name on fresh install 2012-07-26 17:02:07 +02:00
functions_jabber.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_messenger.php [ticket/10756] Renaming phpbb_style_template to phpbb_template 2012-04-19 04:25:25 +02:00
functions_module.php Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop 2012-03-22 10:59:41 +01:00
functions_posting.php Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
functions_privmsgs.php Merge pull request #914 from EXreaction/ticket/10990 2012-07-22 16:25:17 -07:00
functions_profile_fields.php Merge branch 'develop-olympus' into develop 2012-07-23 23:40:09 +02:00
functions_transfer.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_upload.php [ticket/10944] strpos now stricter and removed superfluous ternary 2012-07-17 17:39:19 +01:00
functions_user.php [feature/php-events] Fix doc of core.user_set_default_group 2012-08-20 10:11:52 +02:00
group_positions.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00
json_response.php [ticket/10328] Fixed the header of json_response.php. 2012-03-31 02:09:21 +02:00
message_parser.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
session.php Merge branch 'develop-olympus' into develop 2012-05-29 20:36:52 -04:00
sphinxapi.php [feature/sphinx-fulltext-search] add sphinxapi.php file 2012-07-27 11:27:25 +05:30
startup.php [ticket/10893] Update the usage of Composer 2012-05-13 13:05:20 -04:00
update_helpers.php [ticket/11002] Use translating option to rename the Etc/GMT options 2012-07-21 15:18:16 +02:00
user.php [feature/php-events] Add core.user_setup event 2012-08-01 11:07:34 +02:00