Marc Alexander 79d6d53296 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/includes/ucp/ucp_pm_compose.php

2016-06-19 17:20:45 +02:00

..

info

[ticket/11444] Moving the in-board notifications to a method class

2015-07-13 22:41:13 +02:00

ucp_activate.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

ucp_attachments.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +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/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

ucp_groups.php

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

ucp_login_link.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp_main.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp_notifications.php

[ticket/14074] Fix mark notifications as read in the ucp

2015-08-07 16:14:40 +02:00

ucp_pm_compose.php

Merge branch '3.1.x' into 3.2.x

2016-06-19 17:20:45 +02:00

ucp_pm_options.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp_pm_viewfolder.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

ucp_pm_viewmessage.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp_pm.php

Merge branch '3.1.x'

2015-10-14 16:25:15 +02:00

ucp_prefs.php

Merge pull request #4058 from marc1706/ticket/13454

2016-01-09 17:53:04 +01:00

ucp_profile.php

[ticket/14649] Add preview variable back to ucp_profile for event

2016-05-26 06:26:14 -04:00

ucp_register.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp_remind.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

ucp_resend.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

ucp_zebra.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00