Marc Alexander 47b32f1da9 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php

2015-08-08 22:23:03 +02:00

..

parameters.yml

[ticket/12620] Adds a yaml config file

2014-11-20 20:59:48 +01:00

services_auth.yml

[ticket/12620] Fix rebase (move config file to the right directory)

2014-11-20 21:00:01 +01:00

services_avatar.yml

Merge branch '3.1.x'

2015-08-08 22:23:03 +02:00

services_captcha.yml

[ticket/12620] Adds a yaml config file

2014-11-20 20:59:48 +01:00

services_console.yml

Merge remote-tracking branch 'Nicofuma/ticket/12692'

2015-08-07 10:07:45 +02:00

services_content.yml

Merge branch 'develop-ascraeus' into develop

2015-01-10 12:30:06 +01:00

services_cron.yml

Merge branch '3.1.x'

2015-06-22 00:45:42 +02:00

services_db.yml

[ticket/13777] Deduplicate migration service definitions

2015-05-31 13:22:45 +02:00

services_event.yml

[ticket/12620] Fix rebase (move config file to the right directory)

2014-11-20 21:00:01 +01:00

services_feed.yml

[ticket/12620] Adds a yaml config file

2014-11-20 20:59:48 +01:00

services_files.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00

services_help.yml

[ticket/13844] Add events

2015-05-20 20:11:52 +02:00

services_http.yml

[ticket/13740] Fix CS and extend phpbb extensions

2015-07-08 01:28:04 +02:00

services_language.yml

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

services_migrator.yml

[ticket/13777] Deduplicate migration service definitions

2015-05-31 13:22:45 +02:00

services_mimetype_guesser.yml

[ticket/12620] Fix rebase (move config file to the right directory)

2014-11-20 21:00:01 +01:00

services_module.yml

[ticket/13777] Move module management into service

2015-05-31 13:22:44 +02:00

services_notification.yml

[ticket/11444] Update tests

2015-07-13 22:43:58 +02:00

services_password.yml

[ticket/12620] Fix rebase (move config file to the right directory)

2014-11-20 21:00:01 +01:00

services_php.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00

services_profilefield.yml

[ticket/12620] Fix rebase (move config file to the right directory)

2014-11-20 21:00:01 +01:00

services_report.yml

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

services_routing.yml

[ticket/13388] Integrate routing and di parameters resolution

2015-05-29 16:48:51 +02:00

services_text_formatter.yml

[ticket/13935] Allow more admin-configurable schemes in post links

2015-07-15 22:05:06 +02:00

services_text_reparser.yml

[ticket/13803] Added text_reparser_collection service

2015-05-30 17:29:43 +02:00

services_twig.yml

Merge pull request #3591 from Nicofuma/ticket/12632

2015-05-16 00:30:19 +02:00

services_user.yml

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

services.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00

tables.yml

[ticket/13740] Core file workarounds

2015-07-08 01:27:55 +02:00