makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/ucp
History
Andreas Fischer 26e7dd98b7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).

Conflicts:
	phpBB/install/database_update.php
2012-04-08 22:04:33 +02:00
..
info [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
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 [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +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 [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00: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 [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +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 'imkingdavid/ticket/10535' into develop 2012-02-03 16:21:51 -05: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