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

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

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

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

[ticket/11015] Change more docblocks to phpbb_db_driver.

2012-12-13 18:00:12 -05:00

controller

[feature/controller] Allow injecting Symfony Request into controllers

2012-11-17 18:05:32 -05:00

cron

[ticket/11015] Change more docblocks to phpbb_db_driver.

2012-12-13 18:00:12 -05:00

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

[feature/controller] Fix comments, check against more general HttpException

2012-11-19 12:55:15 -05:00

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

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

mcp

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

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

php

[ticket/10931] Apply strtolower() correctly, i.e. not on false.

2012-06-11 15:46:03 +02:00

questionnaire

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

request

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

search

[ticket/11179] remove extra & in function call

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

style

Merge remote-tracking branch 'p/feature/template-events' into develop

2012-12-10 14:27:18 -05:00

template

Merge remote-tracking branch 'p/feature/template-events' into develop

2012-12-10 14:09:10 -05:00

ucp

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

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

utf

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

.htaccess

…

bbcode.php

[feature/template-events] Inject extension manager into template class.

2012-11-17 16:39:54 -05:00

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

[ticket/11159] Static public is the currently approved order.

2012-11-06 16:43:48 -05:00

functions_container.php

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

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

functions_content.php

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05:00

functions_convert.php

[feature/new-tz-handling] Remove appearances of board_dst and user_dst

2012-06-18 15:08:46 +02:00

functions_database_helper.php

[ticket/11162] Chase dbal autoloading changes in develop.

2012-12-13 21:27:30 -05:00

functions_display.php

[ticket/10954] Change behavior of marking topics/forums

2012-12-14 15:46:45 +01:00

functions_download.php

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

functions_install.php

Merge branch 'develop-olympus' into develop

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

functions_jabber.php

[ticket/11100] Mark can_use_ssl() and can_use_tls() as static.

2012-09-08 01:12:34 +02:00

functions_messenger.php

[ticket/11263] Fix PHP Notice: Undefined variable: extension_manager

2012-12-13 13:10:26 -06:00

functions_module.php

[ticket/10601] Comment to help understanding the code

2012-11-28 19:37:16 +00:00

functions_posting.php

Merge branch 'develop-olympus' into develop

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

functions_privmsgs.php

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2012-07-23 23:40:09 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/10763] Use self when calling get_extension() in filespec class

2012-12-17 19:17:32 +01:00

functions_url_matcher.php

[feature/controller] Rename get_paths to import_paths_from_finder

2012-11-16 17:05:46 -05:00

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

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

index.htm

…

json_response.php

…

message_parser.php

[ticket/11250] Move quote special cases from class to unit tests

2012-12-14 12:58:57 +01:00

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

[ticket/11248] Convert line endings to LF - develop edition.

2012-12-07 21:57:33 -05:00

startup.php

[ticket/10893] Update the usage of Composer

2012-05-13 13:05:20 -04:00

update_helpers.php

[feature/migrations] Restore update_helpers.php file

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

user.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00