Nils Adermann 0ef95a7009 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php

2013-07-13 13:16:58 -04:00

..

info

[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION

2013-02-23 14:20:56 -05:00

acp_attachments.php

[ticket/11010] validation to match type

2013-05-20 18:42:02 +02:00

acp_ban.php

[ticket/11099] Mark acp_ban::display_ban_options() as static.

2012-10-30 18:43:00 -04:00

acp_bbcodes.php

Merge branch 'ticket/8319' into ticket/8319-develop2

2013-07-10 17:24:49 +02:00

acp_board.php

Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop

2013-07-12 14:59:43 -05:00

acp_bots.php

[ticket/10990] Changes for develop

2012-07-22 14:48:39 -05:00

acp_captcha.php

Merge branch 'develop-olympus' into develop

2013-07-03 04:03:39 +02:00

acp_database.php

Merge branch 'develop-olympus' into develop

2012-05-31 15:34:58 +02:00

acp_disallow.php

…

acp_email.php

[ticket/10990] Do not use comma separator when storing it as a log.

2012-07-22 14:39:10 -05:00

acp_extensions.php

Merge remote-tracking branch 'EXreaction/ticket/11415' into develop

2013-05-18 11:20:47 -04:00

acp_forums.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

2013-03-03 20:06:52 +01:00

acp_groups.php

Merge branch 'develop-olympus' into develop

2013-07-12 20:09:22 +02:00

acp_icons.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

acp_inactive.php

[ticket/11454] Use set_addresses in other applicable areas

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

acp_jabber.php

…

acp_language.php

[ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.

2012-09-08 14:42:38 +02:00

acp_logs.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

acp_main.php

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

acp_modules.php

[ticket/11465] Check if class exists before including info file

2013-04-14 17:25:45 +02:00

acp_permission_roles.php

[ticket/11585] Make $auth_admin class property

2013-07-02 00:10:30 +05:30

acp_permissions.php

[ticket/10758] Extract obtain_user_data for the benefit of tests.

2012-12-19 21:50:35 -05:00

acp_php_info.php

…

acp_profile.php

[feature/php-events] Remove event core.acp_profile_field_edit

2012-08-05 14:50:33 +02:00

acp_prune.php

Merge PR #1371 branch 'EXreaction/ticket/11236' into develop

2013-04-26 22:35:13 -04:00

acp_ranks.php

[ticket/11259] htmlspecialchars($phpbb_admin_path)

2012-12-10 21:16:08 -06:00

acp_reasons.php

[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

2012-07-22 14:32:03 -05:00

acp_search.php

[ticket/11011] pass $auth to search backend constructor

2012-08-08 11:07:47 +05:30

acp_send_statistics.php

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

acp_styles.php

[ticket/11310] Add hashes to action links to prevent CSRF attacks

2013-03-12 17:19:30 +01:00

acp_update.php

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2013-05-20 11:55:33 -05:00

acp_users.php

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

acp_words.php

…

auth.php

[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

2012-07-22 14:32:03 -05:00