mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 06:25:04 +02:00
Code Issues Releases Wiki Activity
25,343 Commits 18 Branches 192 Tags
Commit Graph

401 Commits

Author SHA1 Message Date
Joas Schilling
37ae99c75d [ticket/10748] Replace direct creations of tools(); 
PHPBB3-10748
 2015-02-07 14:41:39 +01:00
Gaëtan Muller
a633f3484c [ticket/13496] Update calls to set_config_count() 
PHPBB3-13496
 2015-02-02 21:52:59 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config() 
PHPBB3-13494
 2015-02-02 19:28:23 +01:00
Andreas Fischer
7081b3e382 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12089] Add assert message on HTTP status code check
 2015-01-26 02:47:39 +01:00
Andreas Fischer
ffbe8cdc96 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12089] Add assert message on HTTP status code check
 2015-01-26 02:47:38 +01:00
Joas Schilling
ed2d080551 [ticket/12089] Add assert message on HTTP status code check 
PHPBB3-12089
 2015-01-25 23:06:56 +01:00
Joas Schilling
b566686b51 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php
 2015-01-20 23:32:36 +01:00
Tristan Darricau
dab0728357 [ticket/13489] Fix service configuration 
PHPBB3-13489
 2015-01-20 14:19:55 +01:00
Joas Schilling
ec90f2b380 [ticket/13421] Move tools to subdirectory 
PHPBB3-13421
 2014-12-06 17:10:07 +01:00
Tristan Darricau
91daa73663 [ticket/12620] Fix session tests 
PHPBB3-12620
 2014-11-20 21:09:44 +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
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
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
Andreas Fischer
17928563a2 Merge pull request #3093 from nickvergessen/ticket/13241 
[ticket/13241] Fix pagination of viewforum with global announcements

* nickvergessen/ticket/13241:
  [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:39 +01:00
Andreas Fischer
c755aa91e8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
 2014-10-29 15:09:22 +01:00
Andreas Fischer
932b75c166 Merge pull request #3065 from dhruvgoel92/feature/phantom 
[feature/phantom]

* dhruvgoel92/feature/phantom:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
 2014-10-29 15:09:22 +01:00
Joas Schilling
e42202e794 [ticket/13241] Sleep for 1 second when posting twice in the same second 
PHPBB3-13241
 2014-10-29 13:42:43 +01:00
Nils Adermann
33d0872a18 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:56:26 -07:00
Marc Alexander
0dcb874c09 [ticket/13207] Add notification manager mock to user_add method in tests 
PHPBB3-13207
 2014-10-25 16:16:25 -07:00
Joas Schilling
7c2ed57a99 Merge branch 'develop-ascraeus' into develop 2014-10-20 22:19:43 +02:00
Joas Schilling
dec6c7ea8c [ticket/13138] Type hint the variables for IDE usage 
PHPBB3-13138
 2014-10-17 14:53:56 +02:00
Tristan Darricau
1941328629 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13161] Check whether the schema exists, before deleting it
  [ticket/13161] Avoid problems when running tests with different migrations
 2014-10-10 15:56:31 +02:00
Joas Schilling
1a04d15d4d [ticket/13161] Check whether the schema exists, before deleting it 
PHPBB3-13161
 2014-10-10 15:26:29 +02:00
Joas Schilling
f6fc8c08a4 [ticket/13161] Avoid problems when running tests with different migrations 
PHPBB3-13161
 2014-10-10 15:26:28 +02:00
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +02:00
Joas Schilling
4fe95d6870 [ticket/13137] Generate the schema when the schema.json file is not available 
PHPBB3-13137
 2014-10-07 14:55:08 +02:00
Tristan Darricau
a712d8a3b3 [ticket/13130] Fix tests 
PHPBB3-13130
 2014-10-05 19:18:19 +02:00
Dhruv
77d52982c8 [ticket/12962] Add facebook/webdriver dependency 
Create a new composer.json for tests dir and add
facebook/webdriver dependency

PHPBB3-12962
 2014-09-21 14:24:29 +05:30
Dhruv
a1dff65cd1 [ticket/12962] Fix whitespace characters 
PHPBB3-12962
 2014-09-21 13:53:28 +05:30
Dhruv
20dfb23dd4 [ticket/12962] Force language=en for UI tests installation 
PHPBB3-12962
 2014-09-21 13:53:24 +05:30
Dhruv
c371e86fa1 [ticket/12962] Mark test skipped when phantom server not running 
PHPBB3-12962
 2014-09-21 13:53:19 +05:30
Dhruv
f21ef60175 [ticket/12962] Add quick-links JS test 
PHPBB3-12962
 2014-09-21 13:53:08 +05:30
Dhruv
77f8bb48fe [ticket/12962] Add initial class for ui_testing 
PHPBB3-12962
 2014-09-21 12:07:06 +05:30
Tristan Darricau
7548bc89ea Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12963] Always use core_path and core_directory()
  [ticket/12963] Remove old migration/ folder from tests
  [ticket/12963] Revert back to "migrations" folder name for extensions
 2014-09-18 14:04:22 +02:00
Joas Schilling
1da5c41ab3 [ticket/12963] Always use core_path and core_directory() 
PHPBB3-12963
 2014-09-18 11:21:53 +02:00
Joas Schilling
c220fa89a1 [ticket/12963] Revert back to "migrations" folder name for extensions 
The issues that can be created with the name change are just too much

PHPBB3-12963
 2014-09-18 10:45:08 +02:00
Cesar G
5a46ed398b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12963] Fix the migration's finder for the tests (path, new instance)
 2014-09-17 17:49:12 -07:00
Tristan Darricau
0d1f0c07fe [ticket/12963] Fix the migration's finder for the tests (path, new instance) 
PHPBB3-12963
 2014-09-18 02:04:47 +02:00
Tristan Darricau
92d69255e4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
 2014-09-18 01:32:55 +02:00
Joas Schilling
180f9bf4fa [ticket/12963] Correctly load migration files from migration/ in tests as well 
PHPBB3-12963
 2014-09-17 23:33:26 +02:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
 2014-08-10 15:24:43 +02:00
Joas Schilling
54b0ebc410 Merge pull request #2862 from marc1706/ticket/12932 
[ticket/12932] Add method for allowing override of \phpbb\datetime class

* marc1706/ticket/12932:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding
 2014-08-10 15:23:15 +02:00
Nils Adermann
f067aa92eb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12950] Force the installer to use language=en
 2014-08-10 14:00:09 +02:00
Dhruv
0244a9b6a4 [ticket/12950] Force the installer to use language=en 
PHPBB3-12950
 2014-08-10 13:49:42 +02:00
Marc Alexander
8d99b4afe1 [ticket/12932] Fix tests and calls to create_datetime 
PHPBB3-12932
 2014-08-10 13:43:04 +02:00
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2 
PHPBB3-12958
 2014-08-10 12:17:03 +02:00
Dhruv
dd8adb5d6e [ticket/11528] Revert Mink changes 
PHPBB3-11528
 2014-08-09 17:18:33 +02:00