mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 20:10:18 +02:00
Code Issues Releases Wiki Activity
30,449 Commits 18 Branches 192 Tags
2c74cb71b51a36dd2e65e3d16ce8db49fba3732c
Commit Graph

3711 Commits

Author SHA1 Message Date
Marc Alexander
4ee05b1c17 [ticket/security-171] Add tests for retrieved remote data in version_helper 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Marc Alexander
34004612ac [ticket/security-171] Sanitize data from composer.json 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Marc Alexander
da1888a7fa [ticket/security-171] Use type cast helper for json data 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Joas Schilling
3c8d11f6cc Merge branch 'develop-ascraeus' into develop 2014-11-21 22:29:08 +01:00
Marc Alexander
352648f173 [ticket/13358] Fix tests and use exceptions instead of user object 
PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Marc Alexander
2793f9c078 [ticket/13358] Add file_downloader to version_helper 
PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Marc Alexander
a080173010 [ticket/13358] Add file_downloader as replacement for get_remote_file 
PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Cesar G
f3373e1e32 [ticket/13316] Ensure Recaptcha image uses https when necessary. 
PHPBB3-13316
 2014-11-21 12:17:04 -08:00
Joas Schilling
b104bf5791 Merge branch 'develop-ascraeus' into develop 2014-11-21 21:05:35 +01:00
Joas Schilling
f719803fdc Merge pull request #3144 from marc1706/ticket/13337 
[ticket/13337] Do not use SQL IN comparison with empty array
 2014-11-21 21:04:11 +01:00
Joas Schilling
95a8f40052 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:41:14 +01:00
Joas Schilling
1689191f29 Merge pull request #3023 from Nicofuma/ticket/13133 
[ticket/13133] Allow @vendor_name for includecss
 2014-11-21 20:36:41 +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
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
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
aa061aa7c9 [ticket/12620] Uses a cache directory per environment 
PHPBB3-12620
 2014-11-20 20:59:34 +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
b697273aaa [ticket/12620] Use PHPBB_ENVIRONMENT 
PHPBB3-12620
 2014-11-20 19:01:23 +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
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
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
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
Cesar G
7c68964153 [ticket/13315] Check for the includes/captcha/plugins/ directory instead. 
PHPBB3-13315
 2014-11-18 00:37:07 -08: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
Marc Alexander
556565d072 [ticket/13337] Allow empty array passed to sql_in_set() 
is_array() will evaluate to true even if the array is just an empty array.
Make sure we also expect an empty array passed to sql_in_set().

PHPBB3-13337
 2014-11-14 11:08:35 +01:00
omniError
0a4ffb7cf8 [ticket/13306] move error_reporting call 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-13 20:55:10 -06: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
omniError
834a93f76c [ticket/13306] allow 0 error types 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-11 20:23:13 -06:00
omniError
efd4b43c1b [ticket/13306] constructor sets error types 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-11 20:20:52 -06:00
Cesar G
d43f196fa6 [ticket/12642] Ensure CPF type specific options are set when editing booleans. 
prepare_hidden_fields is expected to return null if the option is not sent
in the request. The boolean method returns false instead, which results in
the options being set as false in hidden fields when accessing the first edit
step.

When checking the "Default value" option, there is also a failure to check
whether the "Field type" option is set to checkbox, thus resulting in this
option getting lost as well.

PHPBB3-12642
 2014-11-11 16:48:25 -08:00
Cesar G
ec220d6494 [ticket/13209] Gather language field values for boolean CPF's in all steps. 
The user can move back and forth between all three steps and as such the lang
field data should be expected in all steps.

PHPBB3-13209
 2014-11-11 16:32:04 -08:00
Cesar G
3108d0b060 [ticket/13209] Fix expected request value of CPF language fields. 
Multiple languages can be edited, thus the expected value is an array.

PHPBB3-13209
 2014-11-11 16:28:06 -08:00
Marc Alexander
91f7d53d8e [ticket/13332] Remove useless $result assignment 
PHPBB3-13332
 2014-11-11 19:02:20 +01:00