phpbb/phpBB/includes/mcp
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
..
info [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_ban.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_forum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_front.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_logs.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_main.php [ticket/10637] Leftovers from implementation of extensions in mcp_main 2012-02-09 22:13:13 +02:00
mcp_notes.php [feature/avatars] Modularized Avatars 2012-03-18 22:19:16 +00:00
mcp_pm_reports.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_post.php [ticket/10637] Leftovers from implementation of extensions in mcp_post 2012-02-09 22:17:33 +02:00
mcp_queue.php [ticket/10871] Delete the unwanted implode 2012-05-04 20:08:42 +01:00
mcp_reports.php [feature/save-post-on-report] bbcode_nl2br missing. 2012-03-19 08:27:32 -04:00
mcp_topic.php Merge branch 'develop-olympus' into develop 2012-03-16 06:18:35 -04:00
mcp_warn.php Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02:00