mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-14 18:14:17 +02:00
Code Issues Releases Wiki Activity
24,467 Commits 18 Branches 192 Tags
014eed385bf761d9e3f0992835f44f58bf055afd
Commit Graph

20859 Commits

Author SHA1 Message Date
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
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
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
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
c22562f5cd [ticket/12620] Allow the user to define multiples environments 
PHPBB3-12620
 2014-11-20 19:00:27 +01:00
Tristan Darricau
8be2f119af [ticket/13063] Fix functional tests errors 
PHPBB3-13063
 2014-11-20 18:12:28 +01:00
Tristan Darricau
2573dd18ca [ticket/13063] Fix coding style 
PHPBB3-13063
 2014-11-20 16:47:24 +01:00
Tristan Darricau
fdcd6e81cd [ticket/13063] Fix tests after rebase 
PHPBB3-13063
 2014-11-20 16:37:45 +01:00
Tristan Darricau
dec8b0de47 [ticket/13063] Remove kernel_request_subscriber service definition 
PHPBB3-13063
 2014-11-20 16:09:54 +01:00
Tristan Darricau
f81d8c53fc [ticket/13063] Adds Twig routing extension 
PHPBB3-13063
 2014-11-20 16:09:44 +01:00
Tristan Darricau
a5bfc76a73 [ticket/13063] Introduces a new \phpbb\routing\router class 
PHPBB3-13063
 2014-11-20 16:03:48 +01:00
Tristan Darricau
3b1c611566 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
 2014-11-18 16:29:08 +01:00
Tristan Darricau
acfe6dd37d Merge pull request #3149 from prototech/ticket/13342 
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha

* prototech/ticket/13342:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
 2014-11-18 16:28:59 +01:00
Tristan Darricau
4bfd5e0d9a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13315] Check for the includes/captcha/plugins/ directory instead.
  [ticket/13315] Fix loss of CAPTCHA plugin config value.
 2014-11-18 15:11:14 +01:00
Tristan Darricau
0019039bc1 Merge pull request #3148 from prototech/ticket/13315 
[ticket/13315] Fix loss of CAPTCHA plugin config value.

* prototech/ticket/13315:
  [ticket/13315] Check for the includes/captcha/plugins/ directory instead.
  [ticket/13315] Fix loss of CAPTCHA plugin config value.
 2014-11-18 15:11:07 +01:00
Marc Alexander
1e03dddcfe Merge branch 'develop-ascraeus' into develop 2014-11-18 15:01:02 +01:00
Marc Alexander
ba3e4da853 Merge pull request #3154 from cyberalien/ticket/13349 
[ticket/13349] Fix breadcrumb arrow entity
 2014-11-18 15:00:45 +01:00
cyberalien
795fd75d60 [ticket/13349] Fix breadcrumb arrow entity 
PHPBB3-13349
 2014-11-18 14:13:07 +02:00
Marc Alexander
19a47c7bac Merge branch 'develop-ascraeus' into develop 2014-11-18 13:12:08 +01:00
Marc Alexander
b84d151afa Merge pull request #3151 from nickvergessen/ticket/13298 
[ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
 2014-11-18 13:11:55 +01:00
Marc Alexander
2e467c8569 Merge branch 'develop-ascraeus' into develop 2014-11-18 13:09:19 +01:00
Marc Alexander
17d76de7b8 Merge pull request #3152 from prototech/ticket/13277 
[ticket/13277] Force IE to not cache AJAX requests.
 2014-11-18 13:08:58 +01:00
Cesar G
e1865df7dd Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before

Conflicts:
	phpBB/styles/subsilver2/template/posting_buttons.html
 2014-11-18 01:33:13 -08:00
Cesar G
052fdcc8d9 Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus 
* Nicofuma/ticket/13023:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
 2014-11-18 01:30:06 -08:00
Cesar G
266755bd82 [ticket/13277] Force IE to not cache AJAX requests. 
Caching causes problems, such as the inability to move a forum/CPF/module in the
same direction by more than one row.

PHPBB3-13277
 2014-11-18 00:41:57 -08:00
Cesar G
7c68964153 [ticket/13315] Check for the includes/captcha/plugins/ directory instead. 
PHPBB3-13315
 2014-11-18 00:37:07 -08:00
Joas Schilling
31c59cad83 [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php 
PHPBB3-13298
 2014-11-17 23:56:33 +01:00
Cesar G
7b33018ade [ticket/13315] Fix loss of CAPTCHA plugin config value. 
The plugins were moved to phpbb/captcha/plugins/ after this migration was
created, thus the check is no longer valid and ends up resetting the value
prematurely.

PHPBB3-13315
 2014-11-16 17:01:38 -08:00
Cesar G
fb34cbf7cd [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha. 
The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix
convention as all others. Instead it simply uses phpbb_, hence the check
for its existence under phpbb/captcha/plugins/ fails.

PHPBB3-13342
 2014-11-16 17:01:03 -08:00
Nils Adermann
6104be6b4d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:29 +01:00
Nils Adermann
4ffdb12938 Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascraeus 
* github-nicofuma/ticket/13280:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:15 +01:00
Tristan Darricau
0dfe1d0d8b [ticket/13280] Output escaping for the symfony request object 
PHPBB3-13280
 2014-11-16 16:45:19 +01:00
Tristan Darricau
f1b88706b8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
 2014-11-16 12:23:04 +01:00
Tristan Darricau
e27b69f42a Merge pull request #3136 from marc1706/ticket/13332 
[ticket/13332] Pass user row to passwords manager check method

* marc1706/ticket/13332:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
 2014-11-16 12:22:51 +01:00
Tristan Darricau
074b91497b [ticket/13023] Add template event posting_editor_buttons_custom_tags_before 
PHPBB3-13023
 2014-11-16 11:52:30 +01:00
Marc Alexander
0795766837 Merge branch 'develop-ascraeus' into develop 2014-11-13 01:03:07 +01:00
Marc Alexander
9f9ce10f2f Merge pull request #3125 from lavigor/ticket/13318 
[ticket/13318] login_username needs to have the multibyte parameter set to true
 2014-11-13 01:02:49 +01:00
Marc Alexander
f0bdf02b32 Merge branch 'develop-ascraeus' into develop 2014-11-13 00:16:46 +01:00
Marc Alexander
2f54ab0a24 Merge pull request #3137 from prototech/ticket/13209 
[ticket/13209] Fix loss of CPF language field values when switching steps
 2014-11-13 00:14:54 +01:00
Tristan Darricau
6d533d2f86 [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280" 
This reverts commit a1b58d05d1, reversing
changes made to 0e772afb9d.

PHPBB3-13280
 2014-11-12 15:42:23 +01:00
Marc Alexander
1b439ee2b7 Merge branch 'develop-ascraeus' into develop 2014-11-12 13:05:04 +01:00