mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 02:51:35 +02:00
Code Issues Releases Wiki Activity
22,577 Commits 18 Branches 192 Tags
7ad88ba32b50e03a658166bffb628b39784db369
Commit Graph

2492 Commits

Author SHA1 Message Date
Joas Schilling
7ad88ba32b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
 2014-06-29 23:41:28 +02:00
Joas Schilling
5652f33ccc Merge pull request #2669 from Nicofuma/ticket/12777 
[ticket/12777] Rename extension status functions and add is_configured()

* Nicofuma/ticket/12777:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
 2014-06-29 23:33:47 +02:00
Tristan Darricau
daeb635d6c [ticket/12777] Add tests for unavailable extension 
PHPBB3-12777
 2014-06-27 18:35:35 +02:00
Tristan Darricau
e6b8ae6bd5 [ticket/12777] Add tests 
PHPBB3-12777
 2014-06-27 16:53:14 +02:00
Joas Schilling
fb3baba3e0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken
 2014-06-27 16:00:42 +02:00
Joas Schilling
404c2f1144 Merge pull request #2598 from Nicofuma/ticket/12716 
[ticket/12716] Add the missing parameters in the call of clearToken

* Nicofuma/ticket/12716:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken
 2014-06-27 16:00:29 +02:00
Marc Alexander
41d3cb0a18 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test
 2014-06-26 15:07:44 +02:00
Marc Alexander
9b27d00d5f Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeus 
* nickvergessen/ticket/12099:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test
 2014-06-26 15:07:05 +02:00
Joas Schilling
68b5edceab Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12766] Event exporter does not like RCx as version
 2014-06-25 14:07:01 +02:00
PayBas
1b0b4cd5e2 [ticket/12766] Event exporter does not like RCx as version 
PHPBB3-12766
 2014-06-25 13:35:57 +02:00
Andreas Fischer
c01ae175a6 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql
  [ticket/12763] Remove empty schema files
  [ticket/12763] Do not regenerate the *_schema.sql files
 2014-06-24 00:19:30 +02:00
Tristan Darricau
2ebd86611a [ticket/12716] Use a string as session_id 
PHPBB3-12716
 2014-06-23 23:59:45 +02:00
Joas Schilling
3fd7fd435d [ticket/12763] Remove empty schema files 
PHPBB3-12763
 2014-06-23 21:41:04 +02:00
Andreas Fischer
c0699c88f8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
 2014-06-23 20:38:12 +02:00
Andreas Fischer
8332671813 Merge pull request #2587 from dhruvgoel92/ticket/11528 
[ticket/11528] Refactor install_board( ) into a new mink class

* dhruvgoel92/ticket/11528:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
 2014-06-23 20:38:11 +02:00
Dhruv
61fa0908bc [ticket/11528] Change click_submit() to accept id as param 
PHPBB3-11528
 2014-06-23 21:24:29 +05:30
Dhruv
2147a5eba5 [ticket/11528] Handle case when config file cant be written by installer 
PHPBB3-11528
 2014-06-23 21:23:47 +05:30
Cesar G
804ba0145a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
 2014-06-22 15:44:29 -07:00
Cesar G
74a37259f7 Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeus 
* PayBas/ticket/12608:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
 2014-06-22 15:44:06 -07:00
Andreas Fischer
80e0851189 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird
 2014-06-22 23:41:26 +02:00
Andreas Fischer
4f2acbaed2 Merge pull request #2629 from nickvergessen/ticket/12747 
[ticket/12747] Drop support for Firebird

* nickvergessen/ticket/12747:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird

Conflicts:
	phpBB/phpbb/db/driver/firebird.php
 2014-06-22 23:41:14 +02:00
Dhruv
f0e115fdcc [ticket/11528] Change NULL to null 
PHPBB3-11528
 2014-06-23 01:26:22 +05:30
Dhruv
a92c1d1ec0 [ticket/11528] Fix spaces and slashes as per guidelines 
PHPBB3-11528
 2014-06-23 01:26:21 +05:30
Dhruv
f5aa9732d1 [ticket/11528] Add asserts in installation steps 
PHPBB3-11528
 2014-06-23 01:26:19 +05:30
Dhruv
2d1a998003 [ticket/11528] Use 'use' keyword to import classes to current scope 
PHPBB3-11528
 2014-06-23 01:26:18 +05:30
Dhruv
c26fa6a15b [ticket/11528] Move parent::tearDown() to end of tearDown() 
PHPBB3-11528
 2014-06-23 01:26:17 +05:30
Dhruv
019b345171 [ticket/11528] Call parent::tearDown in overrided tearDown method 
PHPBB3-11528
 2014-06-23 01:26:16 +05:30
Dhruv
648cbbd9a0 [ticket/11528] Instantiate $client, $driver from functional test case 
Make mink test case an abstract class, instantiate $driver, $client
from its child class i.e. functional test case.

PHPBB3-11528
 2014-06-23 01:26:14 +05:30
Dhruv
01f350a614 [ticket/11528] Refactor install_board() code into a new class 
PHPBB3-11528
 2014-06-23 01:26:13 +05:30
Joas Schilling
25fd6a0d15 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12730] Update Google+ button class to use proper identification
  [ticket/12730] Update maxlen for type_googleplus to 255
  [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
  [ticket/12730] Update field_length to be 20 by default for Google+
  [ticket/12730] Google+ field_order should be 13
  [ticket/12730] Switch service name to googleplus for type_googleplus
  [ticket/12730] Restore field_length to 10 for type_googleplus
  [ticket/12730] Add functional test for Google+ field
  [ticket/12730] Value shouldn't be escaped for schema_data.sql
  [ticket/12730] Missing newline at type_googleplus_test.php
  [ticket/12730] Set field_active to 1 for Google+ field
  [ticket/12730] Add unit test for type_googleplus
  [ticket/12730] Add missing brackets to type_googleplus.php
  [ticket/12730] Update field_order for Google+ CPF
  [ticket/12730] Use string template for Google+ CPF instead of a new one
  [ticket/12730] Minor formatting fixes
  [ticket/12730] Incorrect indentation for type_googleplus
  [ticket/12730] Spaces in block header
  [ticket/12730] Add a Google+ field by default
  [ticket/12730] Add Google+ profile field type
 2014-06-22 19:56:49 +02:00
Joas Schilling
7afc13b4db Merge pull request #2615 from Dragooon/ticket/12730 
[ticket/12730] Add Google+ profile field

* Dragooon/ticket/12730:
  [ticket/12730] Update Google+ button class to use proper identification
  [ticket/12730] Update maxlen for type_googleplus to 255
  [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
  [ticket/12730] Update field_length to be 20 by default for Google+
  [ticket/12730] Google+ field_order should be 13
  [ticket/12730] Switch service name to googleplus for type_googleplus
  [ticket/12730] Restore field_length to 10 for type_googleplus
  [ticket/12730] Add functional test for Google+ field
  [ticket/12730] Value shouldn't be escaped for schema_data.sql
  [ticket/12730] Missing newline at type_googleplus_test.php
  [ticket/12730] Set field_active to 1 for Google+ field
  [ticket/12730] Add unit test for type_googleplus
  [ticket/12730] Add missing brackets to type_googleplus.php
  [ticket/12730] Update field_order for Google+ CPF
  [ticket/12730] Use string template for Google+ CPF instead of a new one
  [ticket/12730] Minor formatting fixes
  [ticket/12730] Incorrect indentation for type_googleplus
  [ticket/12730] Spaces in block header
  [ticket/12730] Add a Google+ field by default
  [ticket/12730] Add Google+ profile field type
 2014-06-22 19:40:56 +02:00
Joas Schilling
dc7ed58bf5 [ticket/12747] Remove some methods which are not used anymore 
PHPBB3-12747
 2014-06-22 19:31:40 +02:00
Joas Schilling
e21b012bd1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12752] Cron list tests fail on windows with ansi support
 2014-06-21 00:41:40 +02:00
Joas Schilling
40d264654c Merge pull request #2631 from Nicofuma/ticket/12752 
[ticket/12752] Cron list tests fail on windows with ansi support

* Nicofuma/ticket/12752:
  [ticket/12752] Cron list tests fail on windows with ansi support
 2014-06-21 00:40:55 +02:00
Shitiz Garg
ff057dfc8e [ticket/12730] Fix type_googleplus_test to use same validation rule as the field 
PHPBB3-12730
 2014-06-21 03:49:59 +05:30
Shitiz Garg
ea0e073c12 [ticket/12730] Add functional test for Google+ field 
PHPBB3-12730
 2014-06-21 03:35:19 +05:30
Shitiz Garg
b50744ae09 [ticket/12730] Missing newline at type_googleplus_test.php 
PHPBB3-12730
 2014-06-21 03:32:34 +05:30
Shitiz Garg
30cce1ed49 [ticket/12730] Add unit test for type_googleplus 
PHPBB3-12730
 2014-06-21 03:31:45 +05:30
Joas Schilling
9ac237a899 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus: (30 commits)
  [ticket/12732] Update schema.json for Skype
  [ticket/12729] Add functional test for Facebook field
  [ticket/12731] Add functional test for youtube field
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12730] Values needn't be escaped for schema_data.sql
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12729] Set field_active as 1 for Facebook profile field
  [ticket/12729] Add unit test for ALPHA_DOTS validation
  [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS
  [ticket/12729] Convert spaces to tabs
  ...
 2014-06-20 23:43:31 +02:00
Joas Schilling
18bf45ab1b Merge pull request #2628 from Dragooon/ticket/12731 
[ticket/12731] Add YouTube custom profile field

* Dragooon/ticket/12731:
  [ticket/12731] Add functional test for youtube field
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
 2014-06-20 23:42:54 +02:00
Joas Schilling
3c38fcce40 Merge pull request #2621 from Dragooon/ticket/12732 
[ticket/12732] Add Skype custom profile field

* Dragooon/ticket/12732:
  [ticket/12732] Update schema.json for Skype
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12732] Add unit tests for ALPHA_PUNCTUATION
  [ticket/12732] Missing comma after validation definition
  [ticket/12732] Improve ALPHA_PUNCTUATION description
  [ticket/12732] Use user info instead of chat as default Skype action
  [ticket/12732] Add Skype custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
	tests/profilefields/type_string_test.php
 2014-06-20 23:39:54 +02:00
Joas Schilling
b9890c6a4c Merge pull request #2612 from Dragooon/ticket/12733 
[ticket/12733] Add Twitter custom profile field

* Dragooon/ticket/12733:
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
 2014-06-20 23:37:51 +02:00
Joas Schilling
8595fee040 Merge pull request #2611 from Dragooon/ticket/12729 
[ticket/12729] Add Facebook custom profile field

* Dragooon/ticket/12729:
  [ticket/12729] Add functional test for Facebook field
  [ticket/12730] Values needn't be escaped for schema_data.sql
  [ticket/12729] Set field_active as 1 for Facebook profile field
  [ticket/12729] Add unit test for ALPHA_DOTS validation
  [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS
  [ticket/12729] Convert spaces to tabs
  [ticket/12729] Fix block header spacing for profilefield_facebook.php
  [ticket/12729] Update schema.json
  [ticket/12729] Unnecessary whitespace in profilefield_facebook.php
  [ticket/12729] Cleanup schema_data.sql for Facebook field
  [ticket/12729] Add Facebook custom profile field
 2014-06-20 23:36:26 +02:00
Tristan Darricau
0404d3b910 [ticket/12752] Cron list tests fail on windows with ansi support 
PHPBB3-12752
 2014-06-20 19:12:58 +02:00
Shitiz Garg
aeeaf2f6ef [ticket/12729] Add functional test for Facebook field 
PHPBB3-12729
 2014-06-20 21:20:04 +05:30
Shitiz Garg
51b4dc7077 [ticket/12731] Add functional test for youtube field 
PHPBB3-12731
 2014-06-20 21:17:23 +05:30
Shitiz Garg
10b466848a [ticket/12732] Add functional test for Skype profile field 
PHPBB3-12732
 2014-06-20 21:13:29 +05:30
Shitiz Garg
cdfcbfc6d0 [ticket/12733] Add functional test for twitter profile field 
PHPBB3-12733
 2014-06-20 21:12:02 +05:30
Joas Schilling
06bb40d2ca Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12746] Init phpbb_dispatcher being used by delete_post()
 2014-06-20 16:02:24 +02:00
Joas Schilling
a5ca7479b2 Merge pull request #2626 from dhruvgoel92/ticket/12746 
[ticket/12746] Init phpbb_dispatcher being used by delete_post()

* dhruvgoel92/ticket/12746:
  [ticket/12746] Init phpbb_dispatcher being used by delete_post()
 2014-06-20 16:02:18 +02:00