mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
16,470 Commits 17 Branches 190 Tags
Commit Graph

16470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
30f7c52dbb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
 2013-05-16 17:46:19 +02:00
Andreas Fischer
8e3c2ebf8e Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympus 
* nickvergessen/ticket/11545:
  [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
 2013-05-16 17:44:20 +02:00
Joas Schilling
38dbfc17a7 [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute 
The given path is an absolute path in general, just not on our current system.

PHPBB3-11545
 2013-05-16 17:30:23 +02:00
Andreas Fischer
fad37dd383 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11541] Add unit tests for style_select()
 2013-05-15 14:30:40 +02:00
Andreas Fischer
c6de880cdb Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympus 
* nickvergessen/ticket/11541:
  [ticket/11541] Add unit tests for style_select()
 2013-05-15 14:28:16 +02:00
Andreas Fischer
44c4c3ed98 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
 2013-05-15 14:10:51 +02:00
Andreas Fischer
5c23ed57fe Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympus 
* nickvergessen/ticket/11546:
  [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
 2013-05-15 14:10:40 +02:00
Joas Schilling
06edf15ac3 [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string 
PHPBB3-11546
 2013-05-15 14:05:56 +02:00
Andreas Fischer
c9b2b7cc32 Merge remote-tracking branch 'bantu/ticket/11540' into develop 
* bantu/ticket/11540:
  [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus.
 2013-05-15 13:52:48 +02:00
Andreas Fischer
fd3b257468 [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus. 
PHPBB3-11540
 2013-05-15 13:52:02 +02:00
Andreas Fischer
f7fa95f6fa Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11540] Add unit tests for is_absolute()
 2013-05-15 13:50:54 +02:00
Andreas Fischer
f2bc62ba75 Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympus 
* nickvergessen/ticket/11540:
  [ticket/11540] Add unit tests for is_absolute()
 2013-05-15 13:48:21 +02:00
Joas Schilling
25be16748d [ticket/11541] Add unit tests for style_select() 
PHPBB3-11541
 2013-05-14 20:29:38 +02:00
Joas Schilling
3f75534258 [ticket/11540] Add unit tests for is_absolute() 
PHPBB3-11540
 2013-05-14 18:27:09 +02:00
Nathan Guse
bcf7ea3310 Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
  [ticket/11533] Update unit tests
  [ticket/11533] Fix colspan and unnecessary tables
  [ticket/11533] Change list to table for notification settings
  [ticket/11533] Columns counter for notification settings
 2013-05-12 18:56:34 -05:00
Nathan Guse
f93a750f28 Merge remote-tracking branch 'remotes/Marc/ticket/11465' into develop 
# By Marc Alexander (8) and Joas Schilling (3)
# Via Marc Alexander
* remotes/Marc/ticket/11465:
  [ticket/11465] Increase count of disabled extensions to 5 in functional test
  [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
  [ticket/11465] Add tests for optional arguments of get_module_infos()
  [ticket/11465] Add comments explaining the tests
  [ticket/11465] Check if class exists before including info file
  [ticket/11465] Correctly set the root path for the test
  [ticket/11465] The info file does not have _info suffix
  [ticket/11465] Add phpBB module to test
  [ticket/11465] Move require_once() in unit test to the top of the file
  [ticket/11465] Add unit tests for acp_modules::get_module_infos()
  [ticket/11465] Use extension finder when adding extensions' acp modules
 2013-05-12 18:49:23 -05:00
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
Marc Alexander
6a1fa3e0f4 [ticket/11465] Add comments explaining the tests 
PHPBB3-11465
 2013-05-10 13:54:15 +02: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