Andreas Fischer ad90f262ff Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php

2011-06-06 11:06:01 +02:00

..

info

[feature/attachment-management-no-reassignment] Further feature adjustments.

2011-04-11 20:16:59 +08:00

acp_attachments.php

[feature/attachment-management-no-reassignment] Handle privacy and some more.

2011-04-24 23:33:51 +08:00

acp_ban.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_bbcodes.php

Merge branch 'develop-olympus' into develop

2011-02-23 22:03:42 -05:00

acp_board.php

Merge branch 'develop-olympus' into develop

2011-06-06 11:06:01 +02:00

acp_bots.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_captcha.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_database.php

[ticket/9574] Remove conditional PHP<5.2 code

2010-12-28 22:36:25 +01:00

acp_disallow.php

Merge branch 'develop-olympus' into develop

2011-03-23 23:21:36 +01:00

acp_email.php

Merge branch 'develop-olympus' into develop

2011-04-10 14:17:56 -04:00

acp_forums.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_groups.php

[ticket/9549] Throw an error when the given field-name is invalid.

2011-02-16 18:22:30 +01:00

acp_icons.php

Merge branch 'develop-olympus' into develop

2011-04-08 12:24:59 +02:00

acp_inactive.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_jabber.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_language.php

Merge branch 'develop-olympus' into develop

2011-02-04 17:41:39 +01:00

acp_logs.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_main.php

Merge branch 'develop-olympus' into develop

2011-02-24 20:59:19 -05:00

acp_modules.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_permission_roles.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_permissions.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_php_info.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_profile.php

[ticket/8542] Display custom profile fields in private messages

2011-05-20 16:45:29 +02:00

acp_prune.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_ranks.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_reasons.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_search.php

[ticket/9684] Remove code in some more files especially includes/

2011-04-07 13:47:06 +02:00

acp_send_statistics.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_styles.php

[ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.

2011-04-24 01:35:09 -04:00

acp_update.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_users.php

[ticket/9746] Adding some more calls to phpbb_ip_normalise().

2011-01-03 00:09:52 +01:00

acp_words.php

Merge branch 'develop-olympus' into develop

2011-01-07 15:58:10 +01:00

auth.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00