Marc Alexander 8bfbd77828 Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/acp/acp_profile.php

2015-07-22 10:38:35 +02:00

..

info

…

acp_attachments.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

acp_ban.php

…

acp_bbcodes.php

Merge pull request #3618 from marc1706/ticket/13832

2015-06-24 16:36:15 +02:00

acp_board.php

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

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

acp_bots.php

…

acp_captcha.php

…

acp_contact.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

acp_database.php

[ticket/13930] Add missing spaces to code

2015-06-08 13:54:50 +02:00

acp_disallow.php

…

acp_email.php

…

acp_extensions.php

[ticket/13930] Add missing spaces to code

2015-06-08 13:54:50 +02:00

acp_forums.php

Merge branch '3.1.x'

2015-07-22 10:30:58 +02:00

acp_groups.php

…

acp_icons.php

[ticket/11768] This commit integrates s9e\TextFormatter

2015-04-02 19:16:01 +02:00

acp_inactive.php

…

acp_jabber.php

Merge branch '3.1.x'

2015-06-07 14:59:33 +02:00

acp_language.php

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

acp_logs.php

…

acp_main.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

acp_modules.php

[ticket/13777] Reorder get_module_infos() method's arguments

2015-05-31 16:03:11 +02:00

acp_permission_roles.php

…

acp_permissions.php

…

acp_php_info.php

…

acp_profile.php

Merge branch '3.1.x'

2015-07-22 10:38:35 +02:00

acp_prune.php

Merge branch '3.1.x'

2015-06-11 21:00:04 +02:00

acp_ranks.php

…

acp_reasons.php

…

acp_search.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

acp_send_statistics.php

…

acp_styles.php

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

acp_update.php

…

acp_users.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

acp_words.php

[ticket/11768] Re-added the code that got lost in rebase

2015-04-02 19:16:01 +02:00

auth.php

[ticket/6466] Support form reset and do not loose role upon resubmit

2015-05-30 11:24:00 +02:00