1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00

2863 Commits

Author SHA1 Message Date
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
Joas Schilling
a191708601 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:20:45 +01:00
Joas Schilling
973c2a9a3a Merge pull request #2765 from Elsensee/ticket/11863
[ticket/11863] Set require_activation to none if emails are disabled
2014-11-21 20:18:15 +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
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
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
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
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
b697273aaa [ticket/12620] Use PHPBB_ENVIRONMENT
PHPBB3-12620
2014-11-20 19:01:23 +01:00
Tristan Darricau
3f678af5f3 [ticket/12620] Update tests
PHPBB3-12620
2014-11-20 19:01:13 +01:00
Tristan Darricau
943e27dffa [ticket/12620] Fix functional tests
PHPBB3-12620
2014-11-20 19:00:50 +01:00
Tristan Darricau
1a6e1ecf6f [ticket/12620] Fix tests
PHPBB3-12620
2014-11-20 19:00:32 +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
Joas Schilling
cddb768772 Merge branch 'develop-ascraeus' into develop 2014-11-17 23:33:04 +01:00
Andreas Fischer
21c8985fe8 [ticket/13338] Add include statements for dependencies.
PHPBB3-13338
2014-11-17 21:54:02 +01:00
Andreas Fischer
765d72d194 [ticket/13338] Do not use the _test.php suffix for abstract test case classes.
PHPBB3-13338
2014-11-17 21:53:27 +01:00
Andreas Fischer
a918abe113 [ticket/13338] Move insert_config_array_test to functions_acp, add deps.
PHPBB3-13338
2014-11-17 21:53:27 +01: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
1f2ec038fb Merge branch 'develop-ascraeus' into develop 2014-11-13 17:12:09 +01:00
Andreas Fischer
1e4ff6105a [ticket/13325] Make installing composer dependencies in tests folder optional.
Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19
here. Remove __init__ include. Composer classmap autoloading ensures classes
can be loaded.

PHPBB3-13325
2014-11-12 20:34:36 +01:00
Andreas Fischer
8df63a4499 [ticket/13325] Remove whitespace at end of line.
PHPBB3-13325
2014-11-12 20:32:36 +01:00
Andreas Fischer
e1bf699ad4 [ticket/13325] Update / Fix composer.lock hash.
PHPBB3-13325
2014-11-12 20:31:41 +01:00
Tristan Darricau
526a97db7c [ticket/13280] Add new tests
PHPBB3-13280
2014-11-12 15:43:20 +01:00
Tristan Darricau
f142ed28e4 [ticket/13280] Make the tests failing
PHPBB3-13280
2014-11-12 15:43:12 +01:00
Tristan Darricau
6d533d2f86 [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing
changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb.

PHPBB3-13280
2014-11-12 15:42:23 +01:00
Marc Alexander
63022f3c59 [ticket/13332] Fix auth provider tests
PHPBB3-13332
2014-11-12 11:42:08 +01:00
Nicolas Grekas
5a7caf6508 [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback 2014-11-08 11:36:13 +01:00
Tristan Darricau
122c1c6e05 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13280] Remove unneeded str_replace in build_url()
  [ticket/13280] Only run sanitizer for server superglobal and modify tests
  [ticket/13280] Seperate server sanitizer call and add comment
  [ticket/13280] Add additional sanitizer for ampersands in server superglobal
  [ticket/13280] Correctly format user page for build_url()
  [ticket/13280] Properly format the current page and add sanitizer to tests
2014-11-07 11:10:26 +01:00
Marc Alexander
32881dbe31 [ticket/13280] Only run sanitizer for server superglobal and modify tests
PHPBB3-13280
2014-11-04 16:54:45 +01:00
Marc Alexander
13b59af1ff [ticket/13280] Add additional sanitizer for ampersands in server superglobal
PHPBB3-13280
2014-11-03 17:27:01 +01:00
Marc Alexander
6fd092b5df [ticket/13280] Correctly format user page for build_url()
PHPBB3-13280
2014-11-03 16:24:09 +01:00
Marc Alexander
6cc7da0c9c [ticket/13280] Properly format the current page and add sanitizer to tests
PHPBB3-13280
2014-11-03 16:07:32 +01:00
Nils Adermann
29d2a7bc9f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13271] Disable CC sender feature for anonymous users
  [prep-release-3.1.1] Add 3.1.1 CHANGELOG
  [prep-release-3.1.1] Add 3.1.1 migration file
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
  [ticket/13248] Use functional framework login method in tests
  [ticket/13248] Correctly pass provider name
  [ticket/13248] Always use provider collection for getting provider
  [ticket/13248] Allow specifying different auth provider in provider collection
  [ticket/13248] Use auth provider collection for getting provider
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  [ticket/13267] Update Automatic Update instructions to include vendor directory
  [ticket/13268] Properly append ternary result in get_existing_indexes()
  [prep-release-3.1.1] Update version number to 3.1.1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/memberlist_email.html
2014-11-02 01:29:04 +01:00
Nils Adermann
0e772afb9d Merge branch 'prep-release-3.1.1' into develop-ascraeus
* prep-release-3.1.1:
  [ticket/13271] Disable CC sender feature for anonymous users
  [prep-release-3.1.1] Add 3.1.1 CHANGELOG
  [prep-release-3.1.1] Add 3.1.1 migration file
  [ticket/13263] Make sure default style exists and clean up code
  [ticket/13263] Only install/set prosilver if no style available
  [ticket/13263] Use prosilver as default style if user's style doesn't exist
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
  [ticket/13248] Use functional framework login method in tests
  [ticket/13248] Correctly pass provider name
  [ticket/13248] Always use provider collection for getting provider
  [ticket/13248] Allow specifying different auth provider in provider collection
  [ticket/13248] Use auth provider collection for getting provider
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  [ticket/13267] Update Automatic Update instructions to include vendor directory
  [ticket/13268] Properly append ternary result in get_existing_indexes()
  [prep-release-3.1.1] Update version number to 3.1.1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2014-11-02 01:25:51 +01:00
Marc Alexander
8aec6b58e0 [ticket/13248] Use functional framework login method in tests
PHPBB3-13248
2014-11-01 21:54:34 +01:00
Marc Alexander
6b057e026c [ticket/13248] Use auth provider collection for getting provider
PHPBB3-13248
2014-11-01 21:54:06 +01:00
Andreas Fischer
57afbbb48a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13241] Remove sleep() and change flood interval instead
  [ticket/13241] Remove sleep() since the method takes care of this now
  [ticket/13241] Sleep for 1 second when posting twice in the same second
  [ticket/13241] Fix pagination with global announcements
  [ticket/13241] Correctly ignore announcements from topics list
  [ticket/13241] Add a functional test for viewforum with global announcement
2014-10-29 15:10:40 +01:00