Joas Schilling
f7051a958c
Merge branch 'develop-ascraeus' into develop
2014-11-21 19:58:49 +01:00
Joas Schilling
d6e8cce44b
Merge pull request #3130 from omniError/ticket/13326
...
[ticket/13326] add viewtopic_url to event
2014-11-21 19:58:43 +01:00
Joas Schilling
ac33ee2290
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/styles/subsilver2/template/index_body.html
2014-11-21 19:54:44 +01:00
Joas Schilling
2d6734cb0a
Merge pull request #3126 from VSEphpbb/ticket/13290
...
[ticket/13290] Add EVENT index_body_forumlist_body_after
2014-11-21 19:53:15 +01:00
Joas Schilling
462664b4b4
Merge branch 'develop-ascraeus' into develop
2014-11-21 19:42:28 +01:00
Joas Schilling
7bc1917908
Merge pull request #3122 from Elsensee/ticket/13309
...
[ticket/13309] Add event acp_email_options_after
2014-11-21 19:42:14 +01:00
Joas Schilling
2ba391d04a
Merge branch 'develop-ascraeus' into develop
2014-11-21 19:32:42 +01:00
Joas Schilling
4bf3dcbebd
Merge pull request #3114 from rxu/ticket/13294
...
[ticket/13294] Add function parse() core event for additional message checks
2014-11-21 19:28:07 +01:00
Joas Schilling
987bd7b3a7
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/styles/subsilver2/template/memberlist_search.html
2014-11-21 19:25:32 +01:00
Joas Schilling
c31b53942d
Merge pull request #3071 from rxu/ticket/13220
...
[ticket/13220] Add template events to memberlist_search.html
2014-11-21 19:23:10 +01:00
Nils Adermann
040d451dcc
Merge pull request #2883 from Nicofuma/ticket/12620
...
[ticket/12620] Allow the user to define multiples environments
2014-11-21 18:20:19 +01:00
Tristan Darricau
54d5299940
[ticket/12620] Fix tests
...
PHPBB3-12620
2014-11-21 17:38:13 +01:00
Tristan Darricau
5e2896bb00
[ticket/12620] Remove the old includes/functions_url_matcher.php file
...
PHPBB3-12620
2014-11-21 16:42:01 +01:00
Tristan Darricau
f5c5f7df75
[ticket/12620] Fix functionnal tests
...
PHPBB3-12620
2014-11-21 08:26:19 +01:00
Tristan Darricau
677b5b2cd4
[ticket/12620] Fix rebase
...
PHPBB3-12620
2014-11-20 23:15:49 +01:00
Tristan Darricau
93f61a4a7d
[ticket/12620] Use the right environment while installing
...
PHPBB3-12620
2014-11-20 21:13:30 +01:00
Tristan Darricau
48950be82b
[ticket/12620] Fix tests
...
PHPBB3-12620
2014-11-20 21:13:26 +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
dd4f2387fd
[ticket/12620] Use the test environment for the tests
...
PHPBB3-12620
2014-11-20 21:12:22 +01:00
Tristan Darricau
91daa73663
[ticket/12620] Fix session tests
...
PHPBB3-12620
2014-11-20 21:09:44 +01:00
Tristan Darricau
6019e51fed
[ticket/12620] Fix coding style
...
PHPBB3-12620
2014-11-20 21:09:40 +01:00
Tristan Darricau
0a1db77ea8
[ticket/12620] Add a test using a custom DI extension in an extension
...
PHPBB3-12620
2014-11-20 21:01:03 +01:00
Tristan Darricau
acc91a2bbf
[ticket/12620] Use the container to get the environment name
...
PHPBB3-12620
2014-11-20 21:01:01 +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
0b61e3540d
[ticket/12620] Fix tests
...
PHPBB3-12620
2014-11-20 20:59:55 +01:00
Tristan Darricau
3a167aa0c3
[ticket/12620] Creates one di extension per phpBB extension
...
PHPBB3-12620
2014-11-20 20:59:51 +01:00
Tristan Darricau
6cbb60d13f
[ticket/12620] Adds a yaml config file
...
PHPBB3-12620
2014-11-20 20:59:48 +01:00
Tristan Darricau
74cd97e75b
[ticket/12620] Updates test environment (production => development)
...
PHPBB3-12620
2014-11-20 20:59:38 +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
998b4baa71
[ticket/12620] Fix download/file.php and app.php outside of the root_path
...
PHPBB3-12620
2014-11-20 20:58:35 +01:00
Tristan Darricau
014eed385b
[ticket/12620] Add support of the environments for the ext routing files
...
PHPBB3-12620
2014-11-20 20:15:45 +01:00
Tristan Darricau
7cd0fd83b8
[ticket/12620] Fix tests
...
PHPBB3-12620
2014-11-20 19:06:52 +01:00
Tristan Darricau
0bf3d2d962
[ticket/12620] Add the support of the environments for the ext services
...
We look for an environment.yml file in the config/PHPBB_ENVIRONMENT/
directory of the extensionss. If the directory does not exist we look
for the environment.yml file in the 'default' environment and finally
for the services.yml file in the config/ directory.
PHPBB3-12620
2014-11-20 19:06:47 +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
b697273aaa
[ticket/12620] Use PHPBB_ENVIRONMENT
...
PHPBB3-12620
2014-11-20 19:01:23 +01:00
Tristan Darricau
143dfa28c6
[ticket/12620] Rebased on develop
...
PHPBB3-12620
2014-11-20 19:01:18 +01:00
Tristan Darricau
3f678af5f3
[ticket/12620] Update tests
...
PHPBB3-12620
2014-11-20 19:01:13 +01:00
Tristan Darricau
d2822af6d7
[ticket/12620] Rebased to the latest develop-ascraeus
...
PHPBB3-12620
2014-11-20 19:01:09 +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
Tristan Darricau
943e27dffa
[ticket/12620] Fix functional tests
...
PHPBB3-12620
2014-11-20 19:00:50 +01:00
Tristan Darricau
7fa3b4c686
[ticket/12620] Rename productive to production
...
PHPBB3-12620
2014-11-20 19:00:46 +01:00
Tristan Darricau
c4842fe119
[ticket/12620] Fix functional tests
...
PHPBB3-12620
2014-11-20 19:00:42 +01:00
Tristan Darricau
733ae584dd
[ticket/12620] Improve error message
...
PHPBB3-12620
2014-11-20 19:00:38 +01:00
Tristan Darricau
70201ee8fa
[ticket/12620] Rename debug to development
...
PHPBB3-12620
2014-11-20 19:00:35 +01:00
Tristan Darricau
873260589e
[ticket/12620] Display error message when the environment isn't available
...
PHPBB3-12620
2014-11-20 19:00:34 +01:00
Tristan Darricau
1a6e1ecf6f
[ticket/12620] Fix tests
...
PHPBB3-12620
2014-11-20 19:00:32 +01:00
Tristan Darricau
c22562f5cd
[ticket/12620] Allow the user to define multiples environments
...
PHPBB3-12620
2014-11-20 19:00:27 +01:00
Nils Adermann
6fa0ca1f96
Merge pull request #2957 from Nicofuma/ticket/13063
...
[ticket/13063] Introduces a new \phpbb\routing\router class
2014-11-20 18:50:32 +01:00
Tristan Darricau
8be2f119af
[ticket/13063] Fix functional tests errors
...
PHPBB3-13063
2014-11-20 18:12:28 +01:00
