Andreas Fischer c9ad0c6f25 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.

Conflicts:
	phpBB/install/database_update.php
	phpBB/ucp.php

2012-10-29 15:16:59 -04:00

..

info

Merge branch 'develop-olympus' into develop

2012-10-29 15:16:59 -04:00

ucp_activate.php

…

ucp_attachments.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp_confirm.php

…

ucp_groups.php

[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

2012-07-22 14:32:03 -05:00

ucp_main.php

[ticket/10885] Fix UCP Main Error if no forums exist

2012-08-06 16:01:05 -05:00

ucp_pm_compose.php

Merge PR #918 branch 'develop-olympus' into develop

2012-10-17 22:31:35 -04:00

ucp_pm_options.php

Merge branch 'develop-olympus' into develop

2012-06-21 10:31:08 +02:00

ucp_pm_viewfolder.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp_pm_viewmessage.php

Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop

2012-08-26 18:56:09 +02:00

ucp_pm.php

…

ucp_prefs.php

[feature/new-tz-handling] Don't use global user but make it a parameter

2012-07-19 17:41:27 +02:00

ucp_profile.php

[ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.

2012-09-09 21:10:29 +02:00

ucp_register.php

[ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.

2012-09-09 21:10:29 +02:00

ucp_remind.php

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02:00

ucp_resend.php

…

ucp_zebra.php

[feature/php-events] Fix naming and doc of core.ucp_add_zebra

2012-08-04 17:50:16 +02:00