makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
Igor Wiedler 1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars 
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-06-27 14:47:13 +02:00
..
acp Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02:00
auth Merge PR #813 branch 'develop-olympus' into develop 2012-05-21 22:35:54 -04:00
avatar [feature/avatars] Fix clean_row regex, thanks to chris 2012-04-08 22:28:40 +02:00
cache [ticket/10743] Changing obtain_cfg_items 2012-06-11 19:56:49 -04: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 [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
db Merge branch 'develop-olympus' into develop 2012-05-31 15:28:08 +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/10735] Changing locator paths structure 2012-03-31 21:20:18 +03: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 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02:00
php [ticket/10931] Apply strtolower() correctly, i.e. not on false. 2012-06-11 15:46:03 +02:00
questionnaire [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00: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 #844 branch 'dhruvgoel92/ticket/10936' into develop 2012-06-19 19:51:39 -04:00
style [ticket/10829] $style_name -> $style_path in style class. 2012-06-11 21:00:22 -04:00
template [ticket/10799] Removing global variable from includejs 2012-05-01 18:25:11 +03:00
ucp Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02: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 [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. 2012-05-31 22:07:34 +02:00
error_collector.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions.php [ticket/10829] Delete T_STYLESHEET_NAME - no longer used. 2012-06-11 21:03:12 -04:00
functions_acp.php Merge branch 'develop-olympus' into develop 2012-04-04 15:33:51 -04:00
functions_admin.php Merge branch 'develop-olympus' into develop 2012-05-31 15:28:08 +02:00
functions_compress.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00: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 Merge branch 'develop-olympus' into develop 2012-01-02 19:54:46 +01:00
functions_display.php Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02:00
functions_download.php Merge branch 'develop-olympus' into develop 2012-02-11 05:58:29 -05:00
functions_install.php Merge PR #808 branch 'develop-olympus' into develop 2012-05-21 22:17:10 -04: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 [ticket/10640] Do not change default value of truncate_string() 2012-06-17 19:07:17 +01:00
functions_privmsgs.php Merge remote-tracking branch 'github-bantu/ticket/10790' into develop 2012-05-31 15:50:32 +02:00
functions_profile_fields.php [feature/class-prefix] Rename user and session to phpbb_* 2012-03-31 18:14:07 +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 Merge branch 'develop-olympus' into develop 2012-05-31 11:55:12 +02:00
functions_user.php Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +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
startup.php [ticket/10893] Update the usage of Composer 2012-05-13 13:05:20 -04:00
user.php [ticket/10743] Renaming user->theme 2012-06-11 19:56:50 -04:00