Marc Alexander b13393078c Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/acp/acp_users.php

2015-10-07 16:55:57 +02:00

..

info

Merge branch 'develop-ascraeus' into develop

2014-10-01 10:34:42 +02:00

acp_attachments.php

[ticket/12505] Remove outdated media handling from acp

2015-08-24 00:40:38 +03:00

acp_ban.php

[ticket/13119] Remove unused globals and use the request class

2014-09-30 18:22:06 +02:00

acp_bbcodes.php

Merge pull request #3618 from marc1706/ticket/13832

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

acp_board.php

[ticket/10165] Add a "Send test email" feature

2015-09-09 17:51:14 +02:00

acp_bots.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_captcha.php

[ticket/13455] Update calls to request_var()

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

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

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_email.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_extensions.php

Merge branch '3.1.x'

2015-09-16 11:58:53 +02:00

acp_forums.php

Merge branch '3.1.x'

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

acp_groups.php

[ticket/12143] Replace group name output

2015-08-05 17:50:24 +02:00

acp_icons.php

[ticket/11768] This commit integrates s9e\TextFormatter

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

acp_inactive.php

Merge branch '3.1.x'

2015-10-07 16:55:57 +02:00

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

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_main.php

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +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

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_permissions.php

[ticket/12143] Oops, fixed array index

2015-08-05 17:50:25 +02:00

acp_php_info.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-06-09 13:23:49 +05:30

acp_profile.php

Merge branch '3.1.x'

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

acp_prune.php

[ticket/12143] Replace group name output

2015-08-05 17:50:24 +02:00

acp_ranks.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_reasons.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

acp_search.php

Merge branch '3.1.x'

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

acp_send_statistics.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_styles.php

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

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

acp_update.php

[ticket/13527] Apply htmlspecialchars() to data from version server.

2015-01-20 22:40:39 +01:00

acp_users.php

Merge branch '3.1.x'

2015-10-07 16:55:57 +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

Merge branch '3.1.x'

2015-09-01 21:47:19 +02:00