1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

16692 Commits

Author SHA1 Message Date
Nils Adermann
a42693e66d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.

Conflicts:
	phpBB/includes/functions.php
2013-05-12 23:09:41 +02:00
Nils Adermann
45e014d35d Merge pull request #1403 from bantu/ticket/11105
[ticket/11105] Add mandatory space to content part of meta http-equiv=re...
2013-05-12 14:05:53 -07:00
gamerchan
d680aac7c5 [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.
There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.

PHPBB3-11105
2013-05-12 22:57:40 +02:00
Marc Alexander
bd6cebfe38 [ticket/11465] Increase count of disabled extensions to 5 in functional test
The ACP function test checks the amount of disabled extensions. Due to
the added disabled extension for the tests of the acp_modules method
get_module_infos(), this needed to be increased from 4 to 5.

PHPBB3-11465
2013-05-12 22:44:59 +02:00
Marc Alexander
7e70eec5a3 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465 2013-05-12 22:41:00 +02:00
Marc Alexander
f90ed6c3cb [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
This will now also enable us to test the $use_all_available parameter of
get_module_infos(), which will not only return the module infos for enabled
extensions but also those from disabled extensions.

PHPBB3-11465
2013-05-12 22:24:50 +02:00
Marc Alexander
7327f9326f [ticket/11465] Add tests for optional arguments of get_module_infos()
The possibilities of the first argument have already been covered
previously. The second argument will be covered with an entry that
should exist, an incorrect entry, and the default false entry that
should use the previously set module class. Unfortunately, the third
argument doesn't have an effect in the tests, as the mocked extension
manager will not properly handle enabled/disabled extensions.

PHPBB3-11465
2013-05-12 16:57:30 +02:00
Nathaniel Guse
fe13b89dd4 Merge remote-tracking branch 'remotes/bantu/ticket/11452' into develop 2013-05-11 20:52:52 -05:00
Nathaniel Guse
393ed4a2d0 Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop 2013-05-11 20:15:53 -05:00
Vjacheslav Trushkin
f17e67364d [ticket/11533] Update unit tests
Update notification settings functional unit test for new layout

PHPBB3-11533
2013-05-11 23:33:40 +03:00
Vjacheslav Trushkin
858f644c38 [ticket/11533] Fix colspan and unnecessary tables
Fix colspan and remove unnecessary tables in notification
settings page in subsilver2.

PHPBB3-11533
2013-05-11 23:32:55 +03:00
Vjacheslav Trushkin
f129fdb559 [ticket/11533] Change list to table for notification settings
PHPBB3-11533
2013-05-11 23:32:23 +03:00
Vjacheslav Trushkin
b40c6fe46a [ticket/11533] Columns counter for notification settings
Add columns counter template variable. It counts number of
notification types + column for name + column for checkbox

PHPBB3-11533
2013-05-11 23:30:44 +03:00
OpenShift guest
48e1be58db [ticket/11458] Update functional test
Show that the phpbb permission lanuage file is being included

PHPBB3-11458
2013-05-11 02:43:02 -04:00
Nathan Guse
f91f8666fd [ticket/11415] Send the extension base the finder rather than the manager
PHPBB3-11415
2013-05-10 14:01:31 -05:00
Nathan Guse
27b2bbb8ff [ticket/11415] Create function in finder find_from_extension
PHPBB3-11415
2013-05-10 13:58:55 -05:00
Nathan Guse
7d66a9ad52 [ticket/11413] Translate the error
PHPBB3-11413
2013-05-10 13:42:54 -05:00
Nathan Guse
c9ff315132 [ticket/11413] Rename file to something more helpful
PHPBB3-11413
2013-05-10 13:40:49 -05:00
OpenShift guest
a50d23078e [ticket/11458] Use finder to get all permission language files
PHPBB3-11458
2013-05-10 10:15:25 -04:00
Marc Alexander
6a1fa3e0f4 [ticket/11465] Add comments explaining the tests
PHPBB3-11465
2013-05-10 13:54:15 +02:00
OpenShift guest
109b1a3a95 [ticket/11458] Use helper to create/move/delete directories/files
PHPBB3-11458
2013-05-09 23:14:09 -04:00
Nils Adermann
c583d9f5e7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
2013-05-09 20:16:32 +02:00
Nils Adermann
b347986923 Merge pull request #1396 from bantu/ticket/11324
[ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
2013-05-09 11:14:52 -07:00
Andreas Fischer
d1415676c5 [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
PHPBB3-11324
2013-05-09 20:10:25 +02:00
Andreas Fischer
e043763905 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11529] Format markdown code correctly
  [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
2013-05-09 20:08:31 +02:00
Andreas Fischer
f9325bfdeb Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympus
* naderman/ticket/11529:
  [ticket/11529] Format markdown code correctly
  [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
2013-05-09 20:08:20 +02:00
Nils Adermann
ab3b0df244 [ticket/11529] Format markdown code correctly
PHPBB3-11529
2013-05-09 20:06:12 +02:00
Nils Adermann
1c9d36615a [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
PHPBB3-11529
2013-05-09 19:59:34 +02:00
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
2013-05-09 19:42:13 +02:00
Nils Adermann
3fb536d7b7 Merge pull request #1387 from bantu/ticket/11513
[ticket/11513] Install PHPUnit via Composer
2013-05-09 10:30:20 -07:00
Andreas Fischer
c31123e8a4 [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Andreas Fischer
b5b1e88915 [ticket/11513] Use PHPUnit from composer in .travis.yml.
PHPBB3-11513
2013-05-09 18:46:29 +02:00
Andreas Fischer
a42514105d [ticket/11513] Update (all) composer dependencies.
PHPBB3-11513
2013-05-09 18:46:29 +02:00
Andreas Fischer
585f0bc827 [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
PHPBB3-11513
2013-05-09 18:42:35 +02:00
Nils Adermann
dbb4a87b79 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11526] Update all dependencies / regenerate composer.lock.
  [ticket/11526] Increase composer minimum stability in olympus to stable.
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
2013-05-09 18:12:54 +02:00
Nils Adermann
4e3c5aefa8 Merge pull request #1393 from bantu/ticket/11526
[ticket/11526] Increase composer minimum-stability from beta to stable
2013-05-09 08:30:16 -07:00
Nils Adermann
176ac6e691 Merge pull request #1392 from bantu/ticket/11527
[ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
2013-05-09 08:28:39 -07:00
Andreas Fischer
5ea75ddf09 [ticket/11526] Update all dependencies / regenerate composer.lock.
PHPBB3-11526
2013-05-09 02:48:38 +02:00
Andreas Fischer
b3d16f21a8 [ticket/11526] Increase composer minimum stability in olympus to stable.
PHPBB3-11526
2013-05-09 02:48:31 +02:00
Andreas Fischer
d26da01fa0 Merge branch 'ticket/11527' into ticket/11526
* ticket/11527:
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
2013-05-09 02:48:11 +02:00
Andreas Fischer
051c2ec251 [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
PHPBB3-11527
2013-05-09 02:38:27 +02:00
Oleg Pudeyev
6821a27ccf Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/10155:
  [ticket/10155] Update copyright in new migration file to 2013
  [ticket/10155] Make effectively installed test more specific
  [ticket/10155] Use more descriptive title for migration file
  [ticket/10155] Use new migration file for jQuery config update
  [ticket/10155] Update jQuery to 1.8.3
2013-05-08 19:35:59 -04:00
Oleg Pudeyev
88d4964f0e Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
  [ticket/10325] move migration into a new file
  [ticket/10325] fix acp language
  [ticket/10325] use assert_response_success parts
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] add assert_response_success in test
  [ticket/10325] functional tests for forgot password functionality
  [ticket/10325] add logout function in functional_test_case
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] improve acp option language
  [ticket/10325] fix language key
  [ticket/10325] fix language variable
  [ticket/10325] change language var
  [ticket/10325] fix language
  [ticket/10325] add new config value to database
  [ticket/10325] trigger error if forgot password option disabled
  [ticket/10325] add allow forgot password option in acp
2013-05-08 08:23:11 -04:00
Oleg Pudeyev
1a062c5064 Merge PR #1308 branch 'nickvergessen/ticket/11450' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11450:
  [ticket/11450] Limit scopes of filters and add better docs
  [ticket/11450] Use helpers to copy/remove files
  [ticket/11450] Move mocked class into mock/metadata_manager.php
  [ticket/11450] Add new line at end of file
  [ticket/11450] Fix tests class name
  [ticket/11450] Require db_tools file to be included
  [ticket/11450] Add test for unexisting composer.json
  [ticket/11450] Test the extensions details page in ACP Customise Tab
  [ticket/11450] Fix all instances of phpbb_extension_metadata_manager
  [ticket/11450] Fix doc blocks and add missing class var $config
  [ticket/11450] Sort parameters alphabetically
  [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()
2013-05-08 08:17:39 -04:00
Dhruv
284011ebf2 [ticket/10325] move migration into a new file
PHPBB3-10325
2013-05-08 17:04:03 +05:30
Joas Schilling
54680b9709 [ticket/11450] Limit scopes of filters and add better docs
PHPBB3-11450
2013-05-08 08:47:28 +02:00
Joas Schilling
4c9c1d8c02 [ticket/11450] Use helpers to copy/remove files
PHPBB3-11450
2013-05-08 08:47:27 +02:00
Joas Schilling
65c407044e [ticket/11450] Move mocked class into mock/metadata_manager.php
PHPBB3-11450
2013-05-08 08:47:26 +02:00
Joas Schilling
d75af4109f [ticket/11450] Add new line at end of file
PHPBB3-11450
2013-05-08 08:47:26 +02:00