Marc Alexander 382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords ...

Conflicts:
	phpBB/config/services.yml

2013-12-29 13:46:42 +01:00

..

info

[ticket/12005] Remove PM popup UCP module

2013-11-08 21:57:06 +01:00

ucp_activate.php

[ticket/11746] Delete the notification after user is approved & fix language.

2013-10-26 01:01:08 -07:00

ucp_attachments.php

[ticket/11849] Update rest of the UCP modules

2013-12-18 18:36:08 +01:00

ucp_auth_link.php

[ticket/11700] Correct ucp_auth_link request interface references

2013-09-19 16:19:05 +02:00

ucp_confirm.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

ucp_groups.php

Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop

2013-12-25 00:54:07 +05:30

ucp_login_link.php

[ticket/11868] Replace phpbb_request_interface references

2013-09-26 12:02:17 +03:00

ucp_main.php

[ticket/11849] Update rest of the UCP modules

2013-12-18 18:36:08 +01:00

ucp_notifications.php

[ticket/11849] Update UCP notifications and pm folder

2013-12-18 18:35:59 +01:00

ucp_pm_compose.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +02:00

ucp_pm_options.php

Merge branch 'develop-olympus' into develop

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

ucp_pm_viewfolder.php

[ticket/11849] Update UCP notifications and pm folder

2013-12-18 18:35:59 +01:00

ucp_pm_viewmessage.php

[ticket/11786] Fix PHPDoc documentation of a few events

2013-08-13 16:23:54 +02:00

ucp_pm.php

[ticket/12005] Remove PM popup UCP module

2013-11-08 21:57:06 +01:00

ucp_prefs.php

[ticket/11747] ucp_prefs_post core events

2013-07-26 18:33:27 -07:00

ucp_profile.php

Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

2013-12-29 13:46:42 +01:00

ucp_register.php

Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

2013-12-29 13:46:42 +01:00

ucp_remind.php

[feature/passwords] Use passwords manager service instead of functions

2013-10-13 16:32:37 +02:00

ucp_resend.php

[ticket/11454] Use set_addresses in other applicable areas

2013-04-24 15:34:12 -05:00

ucp_zebra.php

[ticket/11924] Fix some minor issues with the php event docs

2013-10-16 16:32:40 +02:00