Marc Alexander
|
bcf13551be
|
Merge pull request #3275 from nickvergessen/ticket/13487
[ticket/13487] Add factory for db tool class
|
2015-01-22 18:16:30 +01:00 |
|
Joas Schilling
|
b566686b51
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
phpBB/phpbb/db/migration/profilefield_base_migration.php
phpBB/phpbb/db/migrator.php
|
2015-01-20 23:32:36 +01:00 |
|
Joas Schilling
|
853733a0eb
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-13 23:31:37 +01:00 |
|
Joas Schilling
|
11b6bc5722
|
[ticket/13487] Add factory for db tool class
This allows us to split up the large file one by one easily.
PHPBB3-13487
|
2015-01-10 16:25:24 +01:00 |
|
Joas Schilling
|
56eae4660c
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-10 12:30:06 +01:00 |
|
Joas Schilling
|
0fe30e8a96
|
Merge pull request #3170 from Nicofuma/ticket/13266-develop
[ticket/13266-develop] Enable twig dump function
|
2014-12-27 13:31:16 +01:00 |
|
Joas Schilling
|
ec90f2b380
|
[ticket/13421] Move tools to subdirectory
PHPBB3-13421
|
2014-12-06 17:10:07 +01:00 |
|
Marc Alexander
|
4c88c579b8
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-26 13:30:24 +01:00 |
|
Joas Schilling
|
11c9d11482
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 15:43:33 +01:00 |
|
Tristan Darricau
|
6850169095
|
[ticket/13266] Enable the debug extension in the development environment
PHPBB3-13266
|
2014-11-22 12:33:45 +01:00 |
|
Tristan Darricau
|
677b5b2cd4
|
[ticket/12620] Fix rebase
PHPBB3-12620
|
2014-11-20 23:15:49 +01:00 |
|
Tristan Darricau
|
ac0ff219c6
|
[ticket/12620] Move the routing.yml file to routing/environment.yml
PHPBB3-12620
|
2014-11-20 21:13:21 +01:00 |
|
Tristan Darricau
|
c98efc53a8
|
[ticket/12620] Fix rebase (move config file to the right directory)
PHPBB3-12620
|
2014-11-20 21:00:01 +01:00 |
|
Tristan Darricau
|
6cbb60d13f
|
[ticket/12620] Adds a yaml config file
PHPBB3-12620
|
2014-11-20 20:59:48 +01:00 |
|
Tristan Darricau
|
aa061aa7c9
|
[ticket/12620] Uses a cache directory per environment
PHPBB3-12620
|
2014-11-20 20:59:34 +01:00 |
|
Tristan Darricau
|
0306fefe04
|
[ticket/12620] Move the routing file to the environments
PHPBB3-12620
|
2014-11-20 19:06:40 +01:00 |
|
Tristan Darricau
|
143dfa28c6
|
[ticket/12620] Rebased on develop
PHPBB3-12620
|
2014-11-20 19:01:18 +01:00 |
|
Tristan Darricau
|
42c9fd5c76
|
[ticket/12620] Add inheritance between environments
PHPBB3-12620
|
2014-11-20 19:01:03 +01:00 |
|
Tristan Darricau
|
8664d3229a
|
[ticket/12620] Split the environments into differents folders
PHPBB3-12620
|
2014-11-20 19:00:59 +01:00 |
|