makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-15 07:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/ucp
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
..
info [feature/delete-auto-logins] User can view/delete auto logins. 2012-05-17 14:02:12 +05:30
ucp_activate.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_attachments.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_confirm.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_groups.php [feature/avatars] Modularized Avatars 2012-03-18 22:19:16 +00:00
ucp_main.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_pm.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_pm_compose.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_pm_options.php Merge branch 'develop-olympus' into develop 2012-06-21 10:31:08 +02:00
ucp_pm_viewfolder.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_pm_viewmessage.php [feature/avatars] Modularized Avatars 2012-03-18 22:19:16 +00:00
ucp_prefs.php Merge branch 'develop-olympus' into develop 2012-04-08 22:04:33 +02:00
ucp_profile.php Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02:00
ucp_register.php Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop 2012-02-03 16:21:51 -05:00
ucp_remind.php [feature/class-prefix] Rename auth => phpbb_auth 2012-03-31 18:14:11 +02:00
ucp_resend.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp_zebra.php [ticket/10328] Renamed the JSON class, also now using autoloading. 2012-03-31 02:09:14 +02:00