Joas Schilling 917a5ce0df Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/includes/ucp/ucp_profile.php

2015-02-02 23:23:26 +01:00

..

info

Merge branch 'develop-ascraeus' into develop

2014-05-28 18:19:20 +02:00

ucp_activate.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

ucp_attachments.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_auth_link.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_confirm.php

[ticket/11854] Rename captchas.factory service to captcha.factory

2014-08-11 01:16:22 +02:00

ucp_groups.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

ucp_login_link.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_main.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_notifications.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_pm_compose.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_pm_options.php

[ticket/13052] Fix appearances with multiple parameters

2014-09-09 19:47:00 +02:00

ucp_pm_viewfolder.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_pm_viewmessage.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_pm.php

[ticket/13205] Explicitly cast ids to integers and reformat SQL

2014-10-22 18:35:07 -04:00

ucp_prefs.php

[ticket/13542] Added sentenence of what is changed in the event

2015-01-24 20:26:51 +01:00

ucp_profile.php

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:23:26 +01:00

ucp_register.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_remind.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp_resend.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

ucp_zebra.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00