Joas Schilling 77ed437b79 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html

2014-09-24 14:49:50 +02:00

..

info

Merge branch 'develop-ascraeus' into develop

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

ucp_activate.php

[ticket/12990] Use the full services name for the notification's types

2014-08-16 21:46:03 +02:00

ucp_attachments.php

[ticket/12976] Correctly use plurals for attachment count in UCP navigation

2014-09-09 21:31:34 +02:00

ucp_auth_link.php

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

2014-05-27 20:51:13 +02: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/12822] Add method for deleting avatars and use confirm_box

2014-08-07 17:29:33 +02:00

ucp_login_link.php

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

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

ucp_main.php

[ticket/12966] Sort by post_time and post_id where applicable

2014-08-23 16:36:39 +02:00

ucp_notifications.php

[ticket/12990] Use protected instead of private

2014-08-17 23:03:44 +02:00

ucp_pm_compose.php

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

2014-05-27 20:51:13 +02: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/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

ucp_pm_viewmessage.php

[ticket/12938] Remove the 'Download all attachments' feature.

2014-08-09 16:33:59 +02:00

ucp_pm.php

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

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

ucp_prefs.php

[ticket/12858] Directly return and use timezone selects

2014-09-17 19:07:24 +02:00

ucp_profile.php

Merge branch 'develop-ascraeus' into develop

2014-08-11 17:38:29 +02:00

ucp_register.php

[ticket/12858] Generate timezone selects with template loop

2014-09-17 14:22:08 +02:00

ucp_remind.php

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

2014-05-27 20:51:13 +02: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