Joas Schilling 13eb0ec5b9 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html

2014-03-22 15:13:41 +01:00

..

acp

Merge branch 'develop-olympus' into develop-ascraeus

2014-03-22 15:13:41 +01:00

captcha

[ticket/10763] Fix static calls to non static methods in colour_manager

2014-03-09 21:42:59 +01:00

db

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

diff

…

hooks

…

mcp

[ticket/12247] Makes static usernames work

2014-03-14 00:49:20 +01:00

questionnaire

…

ucp

[ticket/8309] Changing $last_activity to $last_active

2014-03-20 01:48:52 +05:30

utf

…

.htaccess

…

bbcode.php

…

constants.php

[prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev

2014-03-15 17:32:07 +01:00

functions_acp.php

…

functions_admin.php

Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop

2014-03-14 14:04:30 +01:00

functions_compatibility.php

[ticket/12250] Remove deprecated phpbb_clean_path function

2014-03-07 03:44:28 +05:30

functions_compress.php

…

functions_container.php

…

functions_content.php

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

[ticket/12272] Fix hardcoded colons in subforums.

2014-03-15 14:25:11 +01:00

functions_download.php

[ticket/12171] Send correct status 403 when forbidden and 404 when not found

2014-02-10 12:56:45 +01:00

functions_install.php

[ticket/12160] Move phpbb_check_installation_exists() to functions_install.php

2014-02-22 20:22:36 -08:00

functions_jabber.php

…

functions_messenger.php

[ticket/10763] Do not call messenger::error() statically

2014-03-09 22:03:38 +01:00

functions_module.php

Merge pull request #2109 from nickvergessen/ticket/11581

2014-03-13 19:31:22 -05:00

functions_posting.php

Merge pull request #2030 from rxu/ticket/12190

2014-02-19 10:50:21 -06:00

functions_privmsgs.php

[ticket/12226] Split language strings to correctly allow multiple plural rules

2014-02-24 09:46:31 +01:00

functions_transfer.php

[ticket/10763] Do not call non-static transfer() statically

2014-03-09 21:53:21 +01:00

functions_upload.php

…

functions_url_matcher.php

[ticket/12090] Split finding routes and returning routes into 2 methods

2014-03-09 18:38:21 +01:00

functions_user.php

[ticket/12115] Also port user interests to profile fields

2014-02-06 11:32:11 +01:00

functions.php

Merge branch 'develop-olympus' into develop

2014-03-14 13:55:53 +01:00

index.htm

…

message_parser.php

[ticket/11915] Provide the URL to the attachment when it's uploaded.

2014-01-17 19:20:36 -08:00

sphinxapi.php

…

startup.php

…