Nils Adermann b964d17564 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.

Conflicts:
	phpBB/includes/acp/acp_groups.php

2013-02-24 18:07:29 +01:00

..

acp

Merge branch 'develop-olympus' into develop

2013-02-24 18:07:29 +01:00

auth

…

cache

[ticket/11305] Extract hook finder from cache service.

2013-01-02 01:29:32 -05:00

captcha

Merge PR #1182 branch 'develop-olympus' into develop

2013-01-09 01:25:54 -05:00

config

…

controller

…

cron

…

db

[feature/migrations] getLocalisedMessage function for migration exception

2013-02-15 22:19:24 -06:00

di

Merge PR #1130 branch 'EXreaction/ticket/11259' into develop

2012-12-29 13:45:40 -05:00

diff

…

event

…

extension

[feature/migrations] Call revert correctly when purging an extension

2013-02-09 20:05:39 -06:00

hook

[ticket/11305] Extract hook finder from cache service.

2013-01-02 01:29:32 -05:00

hooks

…

lock

…

mcp

Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop

2013-01-14 12:16:59 -06:00

php

…

questionnaire

…

request

…

search

[ticket/11179] remove extra & in function call

2013-02-19 00:52:56 +05:30

style

…

template

…

ucp

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

[feature/migrations] Basic migrations with schema and data changes

2013-01-09 16:39:59 -06:00

datetime.php

Merge branch 'develop-olympus' into develop

2013-02-24 17:58:27 +01:00

error_collector.php

…

functions_acp.php

[ticket/10896] Add missing email validation lost in develop merge

2013-02-24 17:42:53 +01:00

functions_admin.php

[ticket/10758] Add return to the other compat function.

2012-12-24 15:12:57 -05:00

functions_compress.php

…

functions_container.php

[ticket/11306] Add docblocks to all container related functions

2013-01-02 06:41:40 +01:00

functions_content.php

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

…

functions_download.php

…

functions_install.php

Merge branch 'develop-olympus' into develop

2012-12-31 00:54:31 +01:00

functions_jabber.php

…

functions_messenger.php

…

functions_module.php

…

functions_posting.php

Merge branch 'develop-olympus' into develop

2012-12-20 14:28:01 +01:00

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

…

functions_user.php

[ticket/9492] Fix typo in SQL query

2013-01-20 20:58:46 +01:00

functions.php

Merge branch 'develop-olympus' into develop

2013-02-24 17:33:41 +01:00

group_positions.php

…

index.htm

…

json_response.php

…

message_parser.php

…

session.php

[ticket/11361] Make sure that array passed to strtr() has the proper format.

2013-02-23 11:06:48 +01:00

sphinxapi.php

…

startup.php

…

update_helpers.php

[feature/migrations] Restore update_helpers.php file

2013-01-09 16:44:08 -06:00

user.php

…